Merge pull request #21 from magmodules/1.6.10

1.6.10
magmodules · Dec 2, 2018 · 9e6e8e4 · 9e6e8e4
2 parents 3607ae9 + 9c38c16
commit 9e6e8e4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/app/code/community/Magmodules/Channable/Helper/Data.php b/app/code/community/Magmodules/Channable/Helper/Data.php
@@ -653,14 +653,9 @@ public function getProductPrice($product, $config)
             default:
                 $price = $this->processPrice($product, $product->getPrice(), $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;
                 }

diff --git a/...ommunity/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Attribute/Abstract.php b/...ommunity/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Attribute/Abstract.php
@@ -198,7 +198,7 @@ public function getExludeAttributes()
      */
     public function getBackendTypes()
     {
-        return array('text', 'select', 'textarea', 'date', 'int', 'boolean', 'static', 'varchar', 'decimal');
+        return array('text', 'select', 'textarea', 'date', 'datetime', 'int', 'boolean', 'static', 'varchar', 'decimal');
     }
 
     /**

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.9</version>
+            <version>1.6.10</version>
         </Magmodules_Channable>
     </modules>
     <global>
-Original file line number
+Diff line change
@@ Expand Up / @@ -198,7 +198,7 @@ public function getExludeAttributes() @@
          */
         public function getBackendTypes()
         {
-            return array('text', 'select', 'textarea', 'date', 'int', 'boolean', 'static', 'varchar', 'decimal');
+            return array('text', 'select', 'textarea', 'date', 'datetime', 'int', 'boolean', 'static', 'varchar', 'decimal');
         }
         /**
@@ Expand Down @@