Merge pull request #513 from angelleye/OFW-302

OFW-302 - Resolved the percentage calculation error and frontend price check issue

Author: deepakmaurya

public/assets/js/public.js

@@ -324,25 +324,25 @@ document.addEventListener("DOMContentLoaded", function (event) {
                     } else if (productType === 'simple') {
                         if( undefined !== priceField && null !== priceField ) {
                             offerProductPrice = priceField.querySelector('.amount').textContent;
-                        } else if( undefined !== priceBlockField ) {
+                        } else if( undefined !== priceBlockField  && null !== priceBlockField) {
                             offerProductPrice = priceBlockField.querySelector('.amount').textContent;
                         }
                     } else if (productType === 'sale_product') {
                         if( undefined !== priceField && null !== priceField) {
                             offerProductPrice = priceField.querySelector('ins').textContent;
-                        } else if( undefined !== priceBlockField ) {
+                        } else if( undefined !== priceBlockField && null !== priceBlockField ) {
                             offerProductPrice = priceBlockField.querySelector('ins').textContent;
                         }
                     } else if (productType === 'grouped') {
                         if( undefined !== priceField && null !== priceField ) {
                             offerProductPrice = priceField.querySelector('.amount').textContent;
-                        } else if( undefined !== priceBlockField ) {
+                        } else if( undefined !== priceBlockField && null !== priceBlockField) {
                             offerProductPrice = priceBlockField.querySelector('.amount').textContent;
                         }
                     } else if (productType === 'external') {
                         if( undefined !== priceField && null !== priceField ) {
                             offerProductPrice = priceField.querySelector('.amount').textContent;
-                        } else if( undefined !== priceBlockField ) {
+                        } else if( undefined !== priceBlockField && null !== priceBlockField ) {
                             offerProductPrice = priceBlockField.querySelector('.amount').textContent;
                         }
                     } else {

public/class-offers-for-woocommerce.php

@@ -96,7 +96,7 @@ private function __construct() {
              */
             add_action('wp_ajax_new_offer_form_submit', array($this, 'new_offer_form_submit'));
             add_action('wp_ajax_nopriv_new_offer_form_submit', array($this, 'new_offer_form_submit'));
-            
+
             /* Add "Make Offer" button code parts - Before add to cart */
             add_action('woocommerce_before_add_to_cart_button', array($this, 'angelleye_ofwc_before_add_to_cart_button'));
             add_action('woocommerce_after_add_to_cart_form', array($this, 'angelleye_ofwc_after_add_to_cart_form'));
@@ -3400,10 +3400,13 @@ public function ofwc_get_product_detail($offer_id, $product_id, $variant_id) {
 
         $product_price = (isset($actual_sales_price) && !empty($actual_sales_price)) ? $actual_sales_price : $actual_regular_price;
         $productData['offer_price'] = $offer_price = get_post_meta($offer_id, 'offer_price_per', true);
-        $productData['user_offer_percentage'] = $user_offer_percentage = $this->ofwc_get_percentage($offer_price, $product_price);
+        $productData['user_offer_percentage'] = 0;
+        if ($product_price > 0) {
+            $productData['user_offer_percentage'] = $this->ofwc_get_percentage($offer_price, $product_price);
+        }
         $product = ( $variant_id ) ? wc_get_product($variant_id) : wc_get_product($product_id);
-        $productData['product_url'] = $product_url = $product->get_permalink();
-        $productData['offer_uid'] = $offer_uid = get_post_meta($offer_id, 'offer_uid', true);
+        $productData['product_url'] = $product->get_permalink();
+        $productData['offer_uid'] = get_post_meta($offer_id, 'offer_uid', true);
 
         return $productData;
     }