Merge pull request #18 from magmodules/1.6.8

1.6.8
magmodules · Sep 20, 2018 · c11f481 · c11f481
2 parents dcd473c + 9642b17
commit c11f481
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/app/code/community/Magmodules/Channable/Helper/Data.php b/app/code/community/Magmodules/Channable/Helper/Data.php
@@ -619,7 +619,7 @@ public function getProductPrice($product, $config)
             case 'bundle':
                 if ($product->getPriceType() == '1') {
                     $price = $this->processPrice($product, $product->getPrice(), $config);
-                    $finalPrice = $this->processPrice($product, $product->getFinalPrice(), $config);;
+                    $finalPrice = $this->processPrice($product, $product->getFinalPrice(), $config);
                     $minPrice = $this->processPrice($product, $product->getData('min_price'), $config);
                     $maxPrice = $this->processPrice($product, $product->getData('max_price'), $config);
 
@@ -652,13 +652,23 @@ public function getProductPrice($product, $config)
                 break;
             default:
                 $price = $this->processPrice($product, $product->getPrice(), $config);
-                $finalPrice = $this->processPrice($product, $product->getFinalPrice(), $config);;
+                $finalPrice = $this->processPrice($product, $product->getFinalPrice(), $config);
+                $specialPrice = $this->processPrice($product, $product->getSpecialPrice(), $config);
                 $minPrice = $this->processPrice($product, $product->getData('min_price'), $config);
                 $maxPrice = $this->processPrice($product, $product->getData('max_price'), $config);
 
+                if ($specialPrice > 0 && $specialPrice < $finalPrice) {
+                    $finalPrice = $specialPrice;
+                }
+
+                if ($finalPrice < $minPrice) {
+                    $minPrice = $finalPrice;
+                }
+
                 if ((floatval($price) == 0) && (floatval($minPrice) !== 0)) {
                     $price = $minPrice;
                 }
+
                 break;
         }
 
@@ -689,6 +699,7 @@ public function getProductPrice($product, $config)
                 }
             }
 
+            $priceData['final_price_clean'] = $finalPrice;
             $priceData['sales_price'] = $this->formatPrice($finalPrice, $config);
         }
 

diff --git a/app/code/community/Magmodules/Channable/etc/config.xml b/app/code/community/Magmodules/Channable/etc/config.xml
@@ -21,7 +21,7 @@
 <config>
     <modules>
         <Magmodules_Channable>
-            <version>1.6.7</version>
+            <version>1.6.8</version>
         </Magmodules_Channable>
     </modules>
     <global>

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "magmodules/magento1-channable",
   "type": "magento-module",
   "description": "Magento 1 Channable integration",
-  "version": "v1.6.7",
+  "version": "v1.6.8",
   "keywords": [
     "magento"
   ],