Merge pull request #314 from algolia/develop

1.5.3 release

Author: maxiloc

Algolia_Algoliasearch.xml

@@ -4,7 +4,7 @@
         <Algolia_Algoliasearch>
             <active>true</active>
             <codePool>community</codePool>
-            <version>1.5.2</version>
+            <version>1.5.3</version>
         </Algolia_Algoliasearch>
     </modules>
 </config>

CHANGELOG.md

@@ -1,5 +1,15 @@
 ## Change Log
 
+### 1.5.3
+
+- UPDATED: added a config to disable logging
+- UPDATED: better instant search UI
+- FIX: various design improvements
+- FIX: take into account "Include in Navigation" for categories
+- FIX: sorting in instant search page
+- FIX: wrong price for configurable products
+- FIX: mass action delete
+
 ### 1.5.2
 
 ==== BREAKING CHANGES ====

README.md

@@ -7,7 +7,7 @@ This extension replaces the default search of Magento with a typo-tolerant, fast
 
 See features and benefits of [Algolia Search Extension for Magento](https://community.algolia.com/magento).
 
-![Latest version](https://img.shields.io/badge/latest-1.5.2-green.svg)
+![Latest version](https://img.shields.io/badge/latest-1.5.3-green.svg)
 ![Magento 1.6.2](https://img.shields.io/badge/magento-1.6.2-blue.svg)
 ![Magento 1.7.1](https://img.shields.io/badge/magento-1.7.1-blue.svg)
 ![Magento 1.8.1](https://img.shields.io/badge/magento-1.8.1-blue.svg)

code/Helper/Algoliahelper.php

@@ -12,7 +12,7 @@
 class Algolia_Algoliasearch_Helper_Algoliahelper extends Mage_Core_Helper_Abstract
 {
     protected $client;
-    private $config;
+    protected $config;
 
     public function __construct()
     {

code/Helper/Config.php

@@ -56,7 +56,7 @@ class Algolia_Algoliasearch_Helper_Config extends Mage_Core_Helper_Abstract
     const AUTOCOMPLETE_SELECTOR                = 'algoliasearch/advanced/autocomplete_selector';
 
     const SHOW_OUT_OF_STOCK                    = 'cataloginventory/options/show_out_of_stock';
-    const LOGGING_ENABLED                      = 'dev/log/active';
+    const LOGGING_ENABLED                      = 'algoliasearch/credentials/debug';
 
     protected $_productTypeMap = array();
 

code/Helper/Data.php

@@ -25,7 +25,7 @@ class Algolia_Algoliasearch_Helper_Data extends Mage_Core_Helper_Abstract
 
     public function __construct()
     {
-        \AlgoliaSearch\Version::$custom_value = " Magento (1.5.2)";
+        \AlgoliaSearch\Version::$custom_value = " Magento (1.5.3)";
 
         $this->algolia_helper               = Mage::helper('algoliasearch/algoliahelper');
 
@@ -427,7 +427,7 @@ public function rebuildStoreCategoryIndexPage($storeId, $collectionDefault, $pag
             $this->stopEmulation($emulationInfoPage);
     }
 
-    private function getProductsRecords($storeId, $collection)
+    protected function getProductsRecords($storeId, $collection)
     {
         $indexData = array();
 

code/Helper/Entity/Categoryhelper.php

@@ -57,8 +57,6 @@ public function getCategoryCollectionQuery($storeId, $categoryIds = null)
     {
         $storeRootCategoryPath = sprintf('%d/%d', $this->getRootCategoryId(), Mage::app()->getStore($storeId)->getRootCategoryId());
 
-        $index_name = $this->getIndexName($storeId);
-
         $categories = Mage::getResourceModel('catalog/category_collection'); /** @var $categories Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection */
 
         $unserializedCategorysAttrs = $this->config->getCategoryAdditionalAttributes($storeId);
@@ -74,6 +72,7 @@ public function getCategoryCollectionQuery($storeId, $categoryIds = null)
             ->addUrlRewriteToResult()
             ->addIsActiveFilter()
             ->setStoreId($storeId)
+            ->addAttributeToFilter('include_in_menu', '1')
             ->addAttributeToSelect(array_merge(array('name'), $additionalAttr))
             ->addFieldToFilter('level', array('gt' => 1));
 

code/Helper/Entity/Producthelper.php

@@ -234,7 +234,7 @@ public function setSettings($storeId)
 
                             $suffix_index_name = 'group_' . $group_id;
 
-                            $sort_attribute = strpos($values['attribute'], 'price') !== false ? $values['attribute'].'.'.$suffix_index_name : $values['attribute'];
+                            $sort_attribute = strpos($values['attribute'], 'price') !== false ? $values['attribute'].'.'.$currencies[0].'.'.$suffix_index_name : $values['attribute'];
 
                             $mergeSettings['ranking'] = array($values['sort'].'('.$sort_attribute.')', 'typo', 'geo', 'words', 'proximity', 'attribute', 'exact', 'custom');
 
@@ -244,7 +244,7 @@ public function setSettings($storeId)
                 }
                 else
                 {
-                    $sort_attribute = strpos($values['attribute'], 'price') !== false ? $values['attribute'].'.'.'default' : $values['attribute'];
+                    $sort_attribute = strpos($values['attribute'], 'price') !== false ? $values['attribute'].'.'.$currencies[0].'.'.'default' : $values['attribute'];
 
                     $mergeSettings['ranking'] = array($values['sort'].'('.$sort_attribute.')', 'typo', 'geo', 'words', 'proximity', 'attribute', 'exact', 'custom');
 
@@ -258,7 +258,7 @@ public function setSettings($storeId)
         }
     }
 
-    private function getFields($store)
+    protected function getFields($store)
     {
         $tax_helper = Mage::helper('tax');
 
@@ -271,7 +271,7 @@ private function getFields($store)
         return array('price' => false, 'price_with_tax' => true);
     }
 
-    private function formatPrice($price, $includeContainer, $currency_code)
+    protected function formatPrice($price, $includeContainer, $currency_code)
     {
         if (!isset(static::$_currencies[$currency_code]))
         {
@@ -286,7 +286,7 @@ private function formatPrice($price, $includeContainer, $currency_code)
         return $price;
     }
 
-    private function handlePrice(&$product, $sub_products, &$customData)
+    protected function handlePrice(&$product, $sub_products, &$customData)
     {
         $fields                     = $this->getFields($product->getStore());
         $customer_groups_enabled    = $this->config->isCustomerGroupsEnabled($product->getStoreId());
@@ -371,7 +371,7 @@ private function handlePrice(&$product, $sub_products, &$customData)
                     }
                 }
 
-                if ($type == 'configurable' || $type == 'grouped' || $type == 'bundle')
+                if ($type == 'grouped' || $type == 'bundle')
                 {
                     $min = PHP_INT_MAX;
                     $max = 0;
@@ -383,7 +383,7 @@ private function handlePrice(&$product, $sub_products, &$customData)
                         list($min, $max) = $_priceModel->getTotalPrices($product, null, $with_tax, true);
                     }
 
-                    if ($type == 'grouped' || $type == 'configurable')
+                    if ($type == 'grouped')
                     {
                         if (count($sub_products) > 0)
                         {
@@ -508,6 +508,7 @@ public function getObject(Mage_Catalog_Model_Product $product)
             $categoryCollection = Mage::getResourceModel('catalog/category_collection')
                 ->addAttributeToSelect('name')
                 ->addAttributeToFilter('entity_id', $_categoryIds)
+                ->addAttributeToFilter('include_in_menu', '1')
                 ->addFieldToFilter('level', array('gt' => 1))
                 ->addIsActiveFilter();
 

code/Helper/Logger.php

@@ -2,10 +2,10 @@
 
 class Algolia_Algoliasearch_Helper_Logger extends Mage_Core_Helper_Abstract
 {
-    private $enabled;
-    private $config;
-    private $timers = array();
-    private $stores = array();
+    protected $enabled;
+    protected $config;
+    protected $timers = array();
+    protected $stores = array();
 
     public function __construct()
     {
@@ -53,11 +53,13 @@ public function stop($action)
 
     public function log($message)
     {
-        Mage::log($message, null, 'algolia.log');
+        if ($this->config->isLoggingEnabled()) {
+            Mage::log($message, null, 'algolia.log');
+        }
     }
 
-    private function formatTime($begin, $end)
+    protected function formatTime($begin, $end)
     {
         return ($end - $begin).'sec';
     }
-}
+}

code/Model/Indexer/Algolia.php

@@ -5,14 +5,14 @@ class Algolia_Algoliasearch_Model_Indexer_Algolia extends Mage_Index_Model_Index
     const EVENT_MATCH_RESULT_KEY = 'algoliasearch_match_result';
 
     /** @var Algolia_Algoliasearch_Model_Resource_Engine */
-    private $engine;
-    private $config;
+    protected $engine;
+    protected $config;
 
     public static $product_categories = array();
-    private static $credential_error = false;
+    protected static $credential_error = false;
 
     /** @var Algolia_Algoliasearch_Helper_Logger */
-    private $logger;
+    protected $logger;
 
     public function __construct()
     {
@@ -196,7 +196,15 @@ protected function _registerCatalogProductEvent(Mage_Index_Model_Event $event)
                 }
 
                 $reindexData['catalogsearch_force_reindex'] = TRUE;
-                $reindexData['catalogsearch_product_ids'] = $actionObject->getProductIds();
+
+                if ($actionObject->getIsDeleted())
+                {
+                    $reindexData['catalogsearch_delete_product_id'] = $actionObject->getProductIds();
+                }
+                else
+                {
+                    $reindexData['catalogsearch_product_ids'] = $actionObject->getProductIds();
+                }
 
                 foreach ($reindexData as $k => $v)
                 {