Merge branch 'release/1.0.1'

meanbee · Oct 1, 2015 · 99d90fc · 99d90fc
2 parents a23037e + 3328c6a
commit 99d90fc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/src/app/code/community/Meanbee/AutoCategories/Model/Auto/Category/Abstract.php b/src/app/code/community/Meanbee/AutoCategories/Model/Auto/Category/Abstract.php
@@ -63,7 +63,7 @@ public function getCategory() {
     public function getProductCollection() {
         $collection = $this->getData('product_collection');
         if (is_null($collection)) {
-            $collection = Mage::getModel('catalog/product')->getCollection();
+            $collection = Mage::getResourceModel('catalog/product_collection');
 
             $this->applyFilter($collection);
 
@@ -90,6 +90,9 @@ public function maintain($products = array()) {
             return;
         }
 
+        $originalStore = Mage::app()->getStore();
+        Mage::app()->setCurrentStore(Mage_Core_Model_App::ADMIN_STORE_ID);
+
         $collection = clone $this->getProductCollection();
 
         // Remove products not matching the filter anymore
@@ -122,6 +125,8 @@ public function maintain($products = array()) {
         $insert = $select->insertIgnoreFromSelect($this->getCategoryProductTable(), array('category_id', 'product_id', 'position'));
 
         $this->getConnection()->query($insert);
+
+        Mage::app()->setCurrentStore($originalStore);
     }
 
     /**

diff --git a/src/app/code/community/Meanbee/AutoCategories/etc/config.xml b/src/app/code/community/Meanbee/AutoCategories/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Meanbee_AutoCategories>
-            <version>1.0.0</version>
+            <version>1.0.1</version>
         </Meanbee_AutoCategories>
     </modules>
     <global>

diff --git a/src/app/code/community/Meanbee/SaleCategory/Model/Auto/Category/Sale.php b/src/app/code/community/Meanbee/SaleCategory/Model/Auto/Category/Sale.php
@@ -14,7 +14,9 @@ protected function applyFilter($collection) {
         $now = $this->getCurrentDate()->toString('YYYY-MM-dd HH:mm:ss');
 
         $collection
+            ->addAttributeToFilter("price", array("notnull" => true))
             ->addAttributeToFilter("special_price", array("notnull" => true))
+            ->addAttributeToFilter("special_price", array("lt" => new Zend_Db_Expr("at_price.value")))
             ->addAttributeToFilter("special_from_date", array(
                 array("null" => true),
                 array("lteq" => $now)

diff --git a/src/app/code/community/Meanbee/SaleCategory/etc/config.xml b/src/app/code/community/Meanbee/SaleCategory/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Meanbee_SaleCategory>
-            <version>1.0.0</version>
+            <version>1.0.1</version>
         </Meanbee_SaleCategory>
     </modules>
     <global>