Merge pull request #26 from magmodules/1.6.12

1.6.12
magmodules · Jun 26, 2019 · 90b9a2d · 90b9a2d
2 parents b16a28c + b0ccf16
commit 90b9a2d
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 16 deletions.
diff --git a/app/code/community/Magmodules/Channable/Block/Adminhtml/System/Config/Form/Field/Feeds.php b/app/code/community/Magmodules/Channable/Block/Adminhtml/System/Config/Form/Field/Feeds.php
@@ -48,7 +48,7 @@ public function render(Varien_Data_Form_Element_Abstract $element)
                 );
 
                 $sHtml .= sprintf(
-                    '<tr><td>%s</td><td>%s</td><td><a href="%s">%s</a></td><td><a href="%s" target="_blank">%s</a></td></tr>',
+                    '<tr><td>%s</td><td>%s</td><td><a href="%s" target="_blank">%s</a></td><td><a href="%s" target="_blank">%s</a></td></tr>',
                     $store->getWebsite()->getName(),
                     $store->getName(),
                     $baseUrl . 'channable/feed/get/code/' . $token . '/store/' . $storeId . '/array/1',
@@ -85,4 +85,4 @@ public function render(Varien_Data_Form_Element_Abstract $element)
         );
     }
 
-}
+}
diff --git a/app/code/community/Magmodules/Channable/Helper/Data.php b/app/code/community/Magmodules/Channable/Helper/Data.php
@@ -887,7 +887,7 @@ public function getProductData($product, $data, $config = array())
                 break;
             case 'select':
                 if (!empty($source)) {
-                    $value = $product->getAttributeText($source);
+                    $value = (string)$product->getAttributeText($source);
                 }
                 break;
             case 'multiselect':
@@ -1045,8 +1045,9 @@ public function getProductCategories($product, $config)
      */
     public function getSortedArray($data, $sort)
     {
-        $code = "return strnatcmp(\$a['$sort'], \$b['$sort']);";
-        usort($data, create_function('$a,$b', $code));
+        usort($data, function ($a, $b) use ($sort) {
+            return strnatcmp($a[$sort], $b[$sort]);
+        });
 
         return array_reverse($data);
     }
@@ -1513,8 +1514,8 @@ public function getTypePrices($config, $products)
                             }
                         }
 
-                        $typePrices[$parentId . '_' . $sProduct->getEntityId()] = $this->formatPrice(($totalPrice * $config['markup']), $config);
-                        $typePrices[$parentId . '_' . $sProduct->getEntityId() . '_reg'] = $this->formatPrice(($totalPriceReg * $config['markup']), $config);
+                        $typePrices[$parentId . '_' . $sProduct->getEntityId()] = $totalPrice * $config['markup'];
+                        $typePrices[$parentId . '_' . $sProduct->getEntityId() . '_reg'] = $totalPriceReg * $config['markup'];
                     }
                 }
             }

diff --git a/...ode/community/Magmodules/Channable/Model/Adminhtml/System/Config/Backend/Design/Extra.php b/...ode/community/Magmodules/Channable/Model/Adminhtml/System/Config/Backend/Design/Extra.php
@@ -64,8 +64,9 @@ protected function _beforeSave()
      */
     function orderData($data, $sort)
     {
-        $code = "return strnatcmp(\$a['$sort'], \$b['$sort']);";
-        usort($data, create_function('$a,$b', $code));
+        usort($data, function ($a, $b) use ($sort) {
+            return strnatcmp($a[$sort], $b[$sort]);
+        });
 
         return $data;
     }

diff --git a/...de/community/Magmodules/Channable/Model/Adminhtml/System/Config/Backend/Design/Filter.php b/...de/community/Magmodules/Channable/Model/Adminhtml/System/Config/Backend/Design/Filter.php
@@ -68,8 +68,9 @@ protected function _beforeSave()
      */
     function orderData($data, $sort)
     {
-        $code = "return strnatcmp(\$a['$sort'], \$b['$sort']);";
-        usort($data, create_function('$a,$b', $code));
+        usort($data, function ($a, $b) use ($sort) {
+            return strnatcmp($a[$sort], $b[$sort]);
+        });
 
         return $data;
     }

diff --git a/.../community/Magmodules/Channable/Model/Adminhtml/System/Config/Backend/Design/Shipping.php b/.../community/Magmodules/Channable/Model/Adminhtml/System/Config/Backend/Design/Shipping.php
@@ -76,8 +76,9 @@ protected function _beforeSave()
      */
     function orderData($data, $sort)
     {
-        $code = "return strnatcmp(\$a['$sort'], \$b['$sort']);";
-        usort($data, create_function('$a,$b', $code));
+        usort($data, function ($a, $b) use ($sort) {
+            return strnatcmp($a[$sort], $b[$sort]);
+        });
 
         return $data;
     }

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.11</version>
+            <version>1.6.12</version>
         </Magmodules_Channable>
     </modules>
     <global>

diff --git a/composer.json b/composer.json
@@ -2,9 +2,10 @@
   "name": "magmodules/magento1-channable",
   "type": "magento-module",
   "description": "Magento 1 Channable integration",
-  "version": "v1.6.11",
+  "version": "v1.6.12",
   "keywords": [
-    "magento"
+    "magento",
+    "channable"
   ],
   "homepage": "https://github.com/magmodules/magento1-channable",
   "license": "MIT",