Merge pull request #332 from algolia/develop

1.5.4 release

.gitignore

@@ -0,0 +1 @@
+.DS_Store

Algolia_Algoliasearch.xml

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

CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Change Log
 
+### 1.5.4
+
+- UPDATED: instantsearch.js update
+- FIX: issue with slaves creation
+- FIX: issue for bundle products when customer group is enabled
+- FIX: casting in resulting in bad typing in Algolia
+
 ### 1.5.3
 
 - UPDATED: added a config to disable logging

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.3-green.svg)
+![Latest version](https://img.shields.io/badge/latest-1.5.4-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/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.3)";
+        \AlgoliaSearch\Version::$custom_value = " Magento (1.5.4)";
 
         $this->algolia_helper               = Mage::helper('algoliasearch/algoliahelper');
 

code/Helper/Entity/Helper.php

@@ -44,6 +44,9 @@ protected function castProductObject(&$productData)
     {
         foreach ($productData as $key => &$data)
         {
+            if ($key === 'sku') {
+                continue;
+            }
             $data = $this->try_cast($data);
 
             if (is_array($data) === false)

code/Helper/Entity/Producthelper.php

@@ -224,35 +224,31 @@ public function setSettings($storeId)
 
             foreach ($sorting_indices as $values)
             {
-                if ($this->config->isCustomerGroupsEnabled($storeId))
+                if ($this->config->isCustomerGroupsEnabled($storeId) && strpos($values['attribute'], 'price') !== false)
                 {
-                    if (strpos($values['attribute'], 'price') !== false)
+                    foreach ($groups = Mage::getModel('customer/group')->getCollection() as $group)
                     {
-                        foreach ($groups = Mage::getModel('customer/group')->getCollection() as $group)
-                        {
-                            $group_id = (int)$group->getData('customer_group_id');
+                        $group_id = (int)$group->getData('customer_group_id');
 
-                            $suffix_index_name = 'group_' . $group_id;
+                        $suffix_index_name = 'group_' . $group_id;
 
-                            $sort_attribute = strpos($values['attribute'], 'price') !== false ? $values['attribute'].'.'.$currencies[0].'.'.$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');
+                        $mergeSettings['ranking'] = array($values['sort'] . '(' . $sort_attribute . ')', 'typo', 'geo', 'words', 'proximity', 'attribute', 'exact', 'custom');
 
-                            $this->algolia_helper->setSettings($this->getIndexName($storeId).'_'.$values['attribute'].'_'. $suffix_index_name .'_'.$values['sort'], $mergeSettings);
-                        }
+                        $this->algolia_helper->setSettings($this->getIndexName($storeId) . '_' . $values['attribute'] . '_' . $suffix_index_name . '_' . $values['sort'], $mergeSettings);
                     }
                 }
                 else
                 {
-                    $sort_attribute = strpos($values['attribute'], 'price') !== false ? $values['attribute'].'.'.$currencies[0].'.'.'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');
+                    $mergeSettings['ranking'] = array($values['sort'] . '(' . $sort_attribute . ')', 'typo', 'geo', 'words', 'proximity', 'attribute', 'exact', 'custom');
 
                     if ($values['attribute'] === 'price')
-                        $this->algolia_helper->setSettings($this->getIndexName($storeId) . '_' .$values['attribute']. '_default_' . $values['sort'], $mergeSettings);
+                        $this->algolia_helper->setSettings($this->getIndexName($storeId) . '_' . $values['attribute'] . '_default_' . $values['sort'], $mergeSettings);
                     else
-                        $this->algolia_helper->setSettings($this->getIndexName($storeId) . '_' .$values['attribute']. '_' . $values['sort'], $mergeSettings);
-
+                        $this->algolia_helper->setSettings($this->getIndexName($storeId) . '_' . $values['attribute'] . '_' . $values['sort'], $mergeSettings);
                 }
             }
         }
@@ -355,6 +351,8 @@ protected function handlePrice(&$product, $sub_products, &$customData)
 
                         if ($special_price && $special_price < $customData[$field][$currency_code]['group_' . $group_id])
                         {
+                            $customData[$field][$currency_code]['group_' . $group_id . '_original_formated'] = $customData[$field][$currency_code]['default_formated'];
+
                             $customData[$field][$currency_code]['group_' . $group_id] = $special_price;
                             $customData[$field][$currency_code]['group_' . $group_id . '_formated'] = $this->formatPrice($special_price, false, $currency_code);
                         }
@@ -381,6 +379,8 @@ protected function handlePrice(&$product, $sub_products, &$customData)
                         $_priceModel = $product->getPriceModel();
 
                         list($min, $max) = $_priceModel->getTotalPrices($product, null, $with_tax, true);
+                        $min = (double) $min;
+                        $max = (double) $max;
                     }
 
                     if ($type == 'grouped')
@@ -429,13 +429,17 @@ protected function handlePrice(&$product, $sub_products, &$customData)
                                 if ($min != $max && $min <= $customData[$field][$currency_code]['group_' . $group_id])
                                 {
                                     $customData[$field][$currency_code]['group_' . $group_id] = 0;
-                                    $customData[$field][$currency_code]['group_' . $group_id . '_formated'] = $dashed_format;
                                 }
+                                else
+                                {
+                                    $customData[$field][$currency_code]['group_' . $group_id] = $customData[$field][$currency_code]['default'];
+                                }
+
+                                $customData[$field][$currency_code]['group_' . $group_id . '_formated'] = $dashed_format;
                             }
                         }
                     }
 
-
                     if ($customData[$field][$currency_code]['default'] == 0)
                     {
                         $customData[$field][$currency_code]['default'] = $min;

code/etc/config.xml

@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Algolia_Algoliasearch>
-            <version>1.5.3</version>
+            <version>1.5.4</version>
         </Algolia_Algoliasearch>
     </modules>
     <frontend>

code/etc/system.xml

@@ -4,7 +4,7 @@
         <algoliasearch translate="label" module="algoliasearch">
             <label>
                 <![CDATA[
-                Algolia Search 1.5.3
+                Algolia Search 1.5.4
                 <style>
                     .algoliasearch-admin-menu span {
                         padding-left: 38px !important;

design/frontend/template/beforetopsearch.phtml

@@ -173,7 +173,7 @@ if ($config->isInstantEnabled() && $isSearchPage) {
                 if (Array.isArray(hit.price))
                     hit.price = hit.price[0];
 
-                if (price_key !== '.' + algoliaConfig.currency_code + '.default' &&
+                if (price_key !== '.' + algoliaConfig.currency_code + '.default' && hit['price'] !== undefined &&
                         hit['price'][algoliaConfig.currency_code][price_key.substr(1) + '_formated'] !== hit['price'][algoliaConfig.currency_code]['default_formated']) {
                     hit['price'][algoliaConfig.currency_code][price_key.substr(1) + '_original_formated'] = hit['price'][algoliaConfig.currency_code]['default_formated'];
                 }

dev/bin/start.sh

@@ -14,6 +14,7 @@ n98-magerun --root-dir=/var/www/htdocs config:set algoliasearch/credentials/appl
 n98-magerun --root-dir=/var/www/htdocs config:set algoliasearch/credentials/search_only_api_key $SEARCH_ONLY_API_KEY
 n98-magerun --root-dir=/var/www/htdocs config:set algoliasearch/credentials/api_key $API_KEY
 n98-magerun --root-dir=/var/www/htdocs config:set algoliasearch/credentials/index_prefix $INDEX_PREFIX
+n98-magerun --root-dir=/var/www/htdocs config:set algoliasearch/credentials/is_instant_enabled "1"
 n98-magerun --root-dir=/var/www/htdocs config:set web/unsecure/base_url $BASE_URL
 n98-magerun --root-dir=/var/www/htdocs config:set web/secure/base_url $BASE_URL
 

dev/frontend/package.json

@@ -8,7 +8,7 @@
     "build": "./scripts/build.sh"
   },
   "dependencies": {
-    "algoliasearch-extensions-bundle": "^4.2.0"
+    "algoliasearch-extensions-bundle": "^4.3.1"
   },
   "author": "Algolia <support@algolia.com>",
   "license": "ISC"

dev/frontend/scripts/build.sh

@@ -3,5 +3,5 @@ set -e # exit when error
 set -x # debug messages
 
 npm install algoliasearch-extensions-bundle@latest --save
-cp node_modules/algoliasearch-extensions-bundle/dist/algoliaBundle.min.js ../../js/algoliaBundle.min.js
-cp node_modules/algoliasearch-extensions-bundle/dist/algoliaAdminBundle.min.js ../../js/algoliaAdminBundle.min.js
+cp node_modules/algoliasearch-extensions-bundle/dist/algoliaBundle.min.js* ../../js/
+cp node_modules/algoliasearch-extensions-bundle/dist/algoliaAdminBundle.min.js* ../../js/

doc/_config.yml

@@ -1,4 +1,4 @@
-version: 1.5.3
+version: 1.5.4
 
 # Site settings
 title: Algolia for Magento