Send empty description if no description is set, fix error in cms pag…

…e sync
clerkio · Jun 7, 2018 · 7827b29 · m-overlund · Jun 7, 2018 · 7827b29
1 parent 35fdc24
commit 7827b29
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/code/Model/Catalog/Product.php b/code/Model/Catalog/Product.php
@@ -26,7 +26,7 @@ public function getClerkExportData()
 
         $data->setAge((int) $this->getAge());
         $data->setCategories(array_map('intval', $this->getCategoryIds()));
-        $data->setDescription($this->getDescription());
+        $data->setDescription($this->getDescription() ? $this->getDescription() : '');
         $data->setHasTierprice($this->hasTierPrice());
         $data->setId((int) $this->getId());
         $data->setImage($this->getClerkImageUrl());

diff --git a/code/controllers/ApiController.php b/code/controllers/ApiController.php
@@ -118,9 +118,9 @@ public function categoryAction()
 
         if (Mage::getStoreConfigFlag('clerk/general/sync_cms_pages')) {
             $pages = Mage::getModel('cms/page')
-                ->getCollection()
                 ->addFieldToFilter('is_active', '1')
-                ->addStoreFilter(Mage::app()->getStore()->getId());
+                ->addStoreFilter(Mage::app()->getStore()->getId())
+                ->getCollection();
 
             foreach ($pages as $page) {
                 $data = array(

diff --git a/code/etc/config.xml b/code/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Clerk_Clerk>
-            <version>3.4.1</version>
+            <version>3.4.2</version>
         </Clerk_Clerk>
     </modules>
     <global>