Merge pull request #13 from magmodules/1.6.2

1.6.2
magmodules · May 1, 2018 · 614250e · 614250e
2 parents dc265d5 + 63bb30e
commit 614250e
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,19 @@
+language: php
+
+php:
+- 5.6
+- 7.0
+- 7.1
+
+sudo: false
+
+cache:
+  directories:
+    - $HOME/.composer/cache
+
+install:
+- travis_retry composer install --no-interaction
+
+script:
+- composer validate
+- find . -name '*.php' | xargs -n 1 -P4 php -l
diff --git a/app/code/community/Magmodules/Channable/Helper/Data.php b/app/code/community/Magmodules/Channable/Helper/Data.php
@@ -167,6 +167,10 @@ public function getAttributeValue($field, $product, $config, $actions = '', $par
             }
         }
 
+        if (!empty($data['source']) && ($data['source'] == 'attribute_set_name')) {
+            $field = 'attribute_set_name';
+        }
+
         switch ($field) {
             case 'product_url':
                 $value = $this->getProductUrl($product, $config, $parent, $parentAttributes);
@@ -195,7 +199,7 @@ public function getAttributeValue($field, $product, $config, $actions = '', $par
             case 'parent_id':
                 $value = $this->getProductData($parent, $data);
                 break;
-            case 'attribute_set_id':
+            case 'attribute_set_name':
                 $value = $this->getAttributeSetName($productData);
                 break;
             case 'stock':

diff --git a/app/code/community/Magmodules/Channable/Helper/Selftest.php b/app/code/community/Magmodules/Channable/Helper/Selftest.php
@@ -35,6 +35,12 @@ public function runTests()
         /** @var Magmodules_Channable_Model_Channable $model */
         $model = Mage::getModel("channable/channable");
 
+        if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
+            $result[] = $this->getPass('Compatible PHP version: ' . PHP_VERSION);
+        } else {
+            $result[] = $this->getFail('Module requires PHP version >= 5.4, current version: ' . PHP_VERSION);
+        }
+
         $enabled = Mage::getStoreConfig('channable/connect/enabled');
         if ($enabled) {
             $result[] = $this->getPass('Module Enabled');

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
@@ -99,6 +99,10 @@ public function getExtraFields()
             'label' => Mage::helper('channable')->__('Attribute Set ID'),
             'value' => 'attribute_set_id'
         );
+        $optionArray[] = array(
+            'label' => Mage::helper('channable')->__('Attribute Set Name'),
+            'value' => 'attribute_set_name'
+        );
         $optionArray[] = array(
             'label' => Mage::helper('channable')->__('Minumun Sales Quantity'),
             'value' => 'min_sale_qty'

diff --git a/app/code/community/Magmodules/Channable/controllers/Adminhtml/ChannableController.php b/app/code/community/Magmodules/Channable/controllers/Adminhtml/ChannableController.php
@@ -108,7 +108,7 @@ public function createTokenAction()
      */
     protected function _isAllowed()
     {
-        return Mage::getSingleton('admin/session')->isAllowed('admin/channable/channable');
+        return Mage::getSingleton('admin/session')->isAllowed('admin/system/config/channable');
     }
 
 }
diff --git a/app/code/community/Magmodules/Channable/controllers/Adminhtml/SelftestController.php b/app/code/community/Magmodules/Channable/controllers/Adminhtml/SelftestController.php
@@ -50,6 +50,6 @@ public function runAction()
      */
     protected function _isAllowed()
     {
-        return Mage::getSingleton('admin/session')->isAllowed('admin/channable/channable');
+        return Mage::getSingleton('admin/session')->isAllowed('admin/system/config/channable');
     }
 }
diff --git a/app/code/community/Magmodules/Channable/etc/adminhtml.xml b/app/code/community/Magmodules/Channable/etc/adminhtml.xml
@@ -34,17 +34,6 @@
                             </config>
                         </children>
                     </system>
-                    <channable module="channable">
-                        <title>Channable</title>
-                        <sort_order>200</sort_order>
-                        <children>
-                            <channable module="channable">
-                                <title>Channable</title>
-                                <sort_order>100</sort_order>
-                                <action>adminhtml/channable/</action>
-                            </channable>
-                        </children>
-                    </channable>
                 </children>
             </admin>
         </resources>

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.1</version>
+            <version>1.6.2</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.1",
+  "version": "v1.6.2",
   "keywords": [
     "magento"
   ],
@@ -14,6 +14,6 @@
     }
   ],
   "require": {
-    "php": ">5.6.0"
+    "php": ">=5.6.0"
   }
 }