Merge pull request #10 from magmodules/1.2.1

1.2.1
magmodules · Feb 1, 2018 · f0583b8 · f0583b8
2 parents aa40b5d + 93b608c
commit f0583b8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/app/code/community/Magmodules/Channableapi/Model/Items.php b/app/code/community/Magmodules/Channableapi/Model/Items.php
@@ -153,7 +153,7 @@ public function runUpdate($storeId, $items = '')
                 ->load();
         }
 
-        if (!empty($items)) {
+        if ($items->count()) {
             $postData = $this->getProductData($items, $storeId, $config);
             $postResult = $this->postData($postData, $config);
             $this->updateData($postResult);
@@ -210,9 +210,12 @@ public function getProductData($items, $storeId, $config = array())
             $config = $this->getConfig($storeId);
         }
 
-        try {
-            $productIds = $this->getProductIds($items);
+        $productIds = $this->getProductIds($items);
+        if (empty($productIds)) {
+            return $productData;
+        }
 
+        try {
             /** @var Mage_Core_Model_App_Emulation $appEmulation */
             $appEmulation = Mage::getSingleton('core/app_emulation');
             $initialEnvironmentInfo = $appEmulation->startEnvironmentEmulation($storeId);

diff --git a/app/code/community/Magmodules/Channableapi/etc/config.xml b/app/code/community/Magmodules/Channableapi/etc/config.xml
@@ -20,7 +20,7 @@
 <config>
     <modules>
         <Magmodules_Channableapi>
-            <version>1.2.0</version>
+            <version>1.2.1</version>
         </Magmodules_Channableapi>
     </modules>
     <global>

diff --git a/app/code/community/Magmodules/Channableapi/etc/system.xml b/app/code/community/Magmodules/Channableapi/etc/system.xml
@@ -272,7 +272,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>0</show_in_website>
                             <show_in_store>0</show_in_store>
-                            <tooltip>Set a limit on the number of products for each update.</tooltip>
+                            <tooltip>Set a limit on the number of products for each update. The maximum allowed by Channable: 50</tooltip>
                         </limit>
                     </fields>
                 </crons>