Merge pull request #19 from magmodules/1.6.9

1.6.9

.travis.yml

@@ -4,6 +4,7 @@ php:
 - 5.6
 - 7.0
 - 7.1
+- 7.2
 
 sudo: false
 

app/code/community/Magmodules/Channable/Helper/Data.php

@@ -1088,8 +1088,10 @@ public function getProductRelations($product, $type)
         }
 
         $skus = array();
+        /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Product $resource */
+        $resource = Mage::getSingleton('catalog/product')->getResource();
         foreach ($products as $product) {
-            $skus[] = $product->getSku();
+            $skus[] = $resource->getAttributeRawValue($product->getId(),'sku',0);
         }
 
         return implode(',', $skus);

app/code/community/Magmodules/Channable/Helper/Selftest.php

@@ -1,4 +1,4 @@
-<?php
+runTests<?php
 /**
  * Magmodules.eu - http://www.magmodules.eu
  *
@@ -65,7 +65,7 @@ public function runTests()
                 $result[] = $this->getPass('Catalog Product Flat is enabled');
 
                 $storeId = $this->getStoreIdConfig();
-                $nonFlatAttributes = $this->checkFlatCatalog($model->getFeedAttributes('', $storeId));
+                $nonFlatAttributes = $this->checkFlatCatalog($model->getFeedAttributes($storeId, 'selftest'));
 
                 if (!empty($nonFlatAttributes)) {
                     $atts = '<i>' . implode($nonFlatAttributes, ', ') . '</i>';

app/code/community/Magmodules/Channable/Model/Channable.php

@@ -319,7 +319,7 @@ public function getFeedAttributes($storeId = 0, $type = 'xml', $config = '')
             }
         }
 
-        if ($extraFields = @unserialize($this->helper->getConfigData('advanced/extra', $storeId))) {
+        if ($extraFields = $this->helper->getSerializedConfigData('advanced/extra', $storeId)) {
             $i = 1;
             foreach ($extraFields as $extraField) {
                 $attributes['extra-' . $i] = array(
@@ -331,6 +331,20 @@ public function getFeedAttributes($storeId = 0, $type = 'xml', $config = '')
             }
         }
 
+        if ($type == 'selftest') {
+            if($filters = $this->helper->getSerializedConfigData('filter/advanced', $storeId)) {
+                $i = 1;
+                foreach ($filters as $filter) {
+                    $attributes['filter-' . $i] = array(
+                        'label'  => $filter['attribute'],
+                        'source' => $filter['attribute'],
+                        'action' => ''
+                    );
+                    $i++;
+                }
+            }
+        }
+
         if ($type != 'config') {
             $attributes = $this->helper->addAttributeData($attributes, $config);
         }

app/code/community/Magmodules/Channable/Model/Common.php

@@ -354,11 +354,13 @@ public function getParentAttributeSelection($atts)
 
         return $attributes;
     }
+
     /**
      * @param array $parentRelations
      * @param array $config
      *
      * @return Mage_Catalog_Model_Resource_Product_Collection
+     * @throws Mage_Core_Exception
      */
     public function getParents($parentRelations, $config)
     {

app/code/community/Magmodules/Channable/etc/config.xml

@@ -21,7 +21,7 @@
 <config>
     <modules>
         <Magmodules_Channable>
-            <version>1.6.8</version>
+            <version>1.6.9</version>
         </Magmodules_Channable>
     </modules>
     <global>

composer.json

@@ -2,7 +2,7 @@
   "name": "magmodules/magento1-channable",
   "type": "magento-module",
   "description": "Magento 1 Channable integration",
-  "version": "v1.6.8",
+  "version": "v1.6.9",
   "keywords": [
     "magento"
   ],