Skip to content

Commit bf5aa0d

Browse files
author
Jan Petr
authored
Merge pull request #972 from algolia/develop
Develop
2 parents c91305c + 48f22bc commit bf5aa0d

File tree

30 files changed

+542
-272
lines changed

30 files changed

+542
-272
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ install:
1717
- composer install --no-scripts
1818

1919
script:
20-
- dev/runTests.sh -a $ALGOLIA_APPLICATION_ID -k $ALGOLIA_API_KEY -s $ALGOLIA_SEARCH_API_KEY -b http://magento.local -p magento1_tests_ -v 193 --xdebug
20+
- dev/runTests.sh -a $ALGOLIA_APPLICATION_ID -k $ALGOLIA_API_KEY -s $ALGOLIA_SEARCH_API_KEY -b http://magento.local -p magento1_tests_ -v 193

‎CHANGELOG.md

+102-76
Large diffs are not rendered by default.

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Algolia Search for Magento 1.6+
22
==================
33

4-
![Latest version](https://img.shields.io/badge/latest-1.12.0-green.svg)
4+
![Latest version](https://img.shields.io/badge/latest-1.13.0-green.svg)
55

66
[![Build Status](https://travis-ci.org/algolia/algoliasearch-magento.svg?branch=master)](https://travis-ci.org/algolia/algoliasearch-magento)
77
![PHP >= 5.3](https://img.shields.io/badge/php-%3E=5.3-green.svg)

‎app/code/community/Algolia/Algoliasearch/Block/Adminhtml/Notifications.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function getQueueInfo()
2626

2727
$readConnection = $resource->getConnection('core_read');
2828

29-
$size = (int)$readConnection->query('SELECT COUNT(*) as total_count FROM '.$tableName)->fetchColumn(0);
29+
$size = (int) $readConnection->query('SELECT COUNT(*) as total_count FROM '.$tableName)->fetchColumn(0);
3030
$maxJobsPerSingleRun = $config->getNumberOfJobToRun();
3131

3232
$etaMinutes = ceil($size / $maxJobsPerSingleRun) * 5; // 5 - assuming the queue runner runs every 5 minutes

‎app/code/community/Algolia/Algoliasearch/Helper/Algoliahelper.php

+4
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ public function __construct()
3434
\AlgoliaSearch\Version::addPrefixUserAgentSegment('Magento integration', $version);
3535
\AlgoliaSearch\Version::addSuffixUserAgentSegment('PHP', phpversion());
3636
\AlgoliaSearch\Version::addSuffixUserAgentSegment('Magento', Mage::getVersion());
37+
38+
if (method_exists('Mage', 'getEdition')) {
39+
\AlgoliaSearch\Version::addSuffixUserAgentSegment('Edition', Mage::getEdition());
40+
}
3741
}
3842

3943
public function resetCredentialsFromConfig()

‎app/code/community/Algolia/Algoliasearch/Helper/Config.php

+14
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class Algolia_Algoliasearch_Helper_Config extends Mage_Core_Helper_Abstract
2121
const MAX_VALUES_PER_FACET = 'algoliasearch/instant/max_values_per_facet';
2222
const SORTING_INDICES = 'algoliasearch/instant/sorts';
2323
const XML_ADD_TO_CART_ENABLE = 'algoliasearch/instant/add_to_cart_enable';
24+
const INFINITE_SCROLL_ENABLE = 'algoliasearch/instant/infinite_scroll_enable';
2425

2526
const NB_OF_PRODUCTS_SUGGESTIONS = 'algoliasearch/autocomplete/nb_of_products_suggestions';
2627
const NB_OF_CATEGORIES_SUGGESTIONS = 'algoliasearch/autocomplete/nb_of_categories_suggestions';
@@ -78,6 +79,7 @@ class Algolia_Algoliasearch_Helper_Config extends Mage_Core_Helper_Abstract
7879
const INDEX_PRODUCT_ON_CATEGORY_PRODUCTS_UPDATE = 'algoliasearch/advanced/index_product_on_category_products_update';
7980
const INDEX_ALL_CATEGORY_PRODUCTS_ON_CATEGORY_UPDATE = 'algoliasearch/advanced/index_all_category_product_on_category_update';
8081
const PREVENT_BACKEND_RENDERING = 'algoliasearch/advanced/prevent_backend_rendering';
82+
const PREVENT_BACKEND_RENDERING_DISPLAY_MODE = 'algoliasearch/advanced/prevent_backend_rendering_display_mode';
8183
const BACKEND_RENDERING_ALLOWED_USER_AGENTS = 'algoliasearch/advanced/backend_rendering_allowed_user_agents';
8284

8385
const SHOW_OUT_OF_STOCK = 'cataloginventory/options/show_out_of_stock';
@@ -242,6 +244,12 @@ public function isAddToCartEnable($storeId = null)
242244
return Mage::getStoreConfigFlag(self::XML_ADD_TO_CART_ENABLE, $storeId);
243245
}
244246

247+
public function isInfiniteScrollEnabled($storeId = null)
248+
{
249+
return $this->isInstantEnabled($storeId)
250+
&& Mage::getStoreConfigFlag(self::INFINITE_SCROLL_ENABLE, $storeId);
251+
}
252+
245253
public function isRemoveBranding($storeId = null)
246254
{
247255
return Mage::getStoreConfigFlag(self::REMOVE_BRANDING, $storeId);
@@ -445,6 +453,7 @@ public function getAttributesToRetrieve($group_id)
445453
'image_url',
446454
'in_stock',
447455
'type_id',
456+
'value', // for additional sections
448457
));
449458

450459
/** @var Mage_Directory_Model_Currency $currencyDirectory */
@@ -670,6 +679,11 @@ public function preventBackendRendering($storeId = null)
670679
return true;
671680
}
672681

682+
public function getBackendRenderingDisplayMode($storeId = null)
683+
{
684+
return Mage::getStoreConfig(self::PREVENT_BACKEND_RENDERING_DISPLAY_MODE, $storeId);
685+
}
686+
673687
private function getCustomRanking($configName, $storeId = null)
674688
{
675689
$attrs = unserialize(Mage::getStoreConfig($configName, $storeId));

‎app/code/community/Algolia/Algoliasearch/Helper/Entity/Helper.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ protected function strip($s, $completeRemoveTags = array())
8282
{
8383
if (!empty($completeRemoveTags)) {
8484
$dom = new DOMDocument();
85-
if (@$dom->loadHTML($s)) {
85+
if (@$dom->loadHTML('<?xml encoding="utf-8" ?>' . $s)) {
8686
$toRemove = array();
8787
foreach ($completeRemoveTags as $tag) {
8888
$removeTags = $dom->getElementsByTagName($tag);

‎app/code/community/Algolia/Algoliasearch/Helper/Entity/Producthelper.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ public function getProductCollectionQuery($storeId, $productIds = null, $only_vi
151151

152152
$products = $products->setStoreId($storeId);
153153
$products = $products->addStoreFilter($storeId);
154+
$products = $products->distinct(true);
154155

155156
if ($productIds && count($productIds) > 0) {
156157
$products = $products->addAttributeToFilter('entity_id', array('in' => $productIds));
@@ -171,6 +172,7 @@ public function getProductCollectionQuery($storeId, $productIds = null, $only_vi
171172
}
172173

173174
$products = $products
175+
->addAttributeToSelect('special_price')
174176
->addAttributeToSelect('special_from_date')
175177
->addAttributeToSelect('special_to_date')
176178
->addAttributeToSelect('visibility')
@@ -897,7 +899,7 @@ public function getObject(Mage_Catalog_Model_Product $product)
897899

898900
foreach ($additionalAttributes as $attribute) {
899901
$attribute_name = $attribute['attribute'];
900-
if (isset($customData[$attribute_name])) {
902+
if (array_key_exists($attribute_name, $customData)) {
901903
continue;
902904
}
903905

‎app/code/community/Algolia/Algoliasearch/Model/Observer.php

+77-18
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ public function __construct()
3030
}
3131

3232
/**
33-
* On config save.
33+
* On configuration save
34+
*
35+
* @param Varien_Event_Observer $observer
3436
*/
3537
public function configSaved(Varien_Event_Observer $observer)
3638
{
@@ -57,33 +59,36 @@ public function addBundleToAdmin(Varien_Event_Observer $observer)
5759
$req = Mage::app()->getRequest();
5860

5961
if (strpos($req->getPathInfo(), 'system_config/edit/section/algoliasearch') !== false) {
60-
$observer->getLayout()->getUpdate()->addHandle('algolia_bundle_handle');
62+
$observer->getData('layout')->getUpdate()->addHandle('algolia_bundle_handle');
6163
}
6264
}
6365

6466
/**
65-
* Call algoliasearch.xml To load js / css / phtml.
67+
* Call algoliasearch.xml to load JS / CSS / PHTMLs
68+
*
69+
* @param Varien_Event_Observer $observer
70+
* @return $this
6671
*/
6772
public function useAlgoliaSearchPopup(Varien_Event_Observer $observer)
6873
{
69-
if ($this->config->isEnabledFrontEnd()) {
70-
if ($this->config->getApplicationID() && $this->config->getAPIKey()) {
71-
if ($this->config->isPopupEnabled() || $this->config->isInstantEnabled()) {
72-
$observer->getLayout()->getUpdate()->addHandle('algolia_search_handle');
73-
74-
if ($this->config->isDefaultSelector()) {
75-
$observer->getLayout()->getUpdate()->addHandle('algolia_search_handle_with_topsearch');
76-
} else {
77-
$observer->getLayout()->getUpdate()->addHandle('algolia_search_handle_no_topsearch');
78-
}
74+
if (!$this->config->isEnabledFrontEnd()) {
75+
return $this;
76+
}
7977

80-
if ($this->config->preventBackendRendering() === true) {
81-
$observer->getLayout()->getUpdate()->addHandle('algolia_search_handle_prevent_backend_rendering');
82-
}
83-
}
84-
}
78+
if (!$this->config->getApplicationID() || !$this->config->getAPIKey()) {
79+
return $this;
8580
}
8681

82+
$this->loadAlgoliasearchHandle($observer);
83+
84+
$this->loadSearchFormHandle($observer);
85+
86+
$this->loadInstantSearchHandle($observer);
87+
88+
$this->loadAutocompleteHandle($observer);
89+
90+
$this->loadPreventBackendRenderingHandle($observer);
91+
8792
return $this;
8893
}
8994

@@ -244,4 +249,58 @@ public function moveProductsTmpIndex(Varien_Object $event)
244249

245250
$this->helper->moveProductsIndex($storeId);
246251
}
252+
253+
private function loadAlgoliasearchHandle(Varien_Event_Observer $observer)
254+
{
255+
if (!$this->config->isPopupEnabled() && !$this->config->isInstantEnabled()) {
256+
return;
257+
}
258+
259+
$observer->getData('layout')->getUpdate()->addHandle('algolia_search_handle');
260+
}
261+
262+
private function loadSearchFormHandle(Varien_Event_Observer $observer)
263+
{
264+
if (!$this->config->isDefaultSelector()) {
265+
return;
266+
}
267+
268+
$observer->getData('layout')->getUpdate()->addHandle('algolia_search_handle_with_topsearch');
269+
}
270+
271+
private function loadInstantSearchHandle(Varien_Event_Observer $observer)
272+
{
273+
if (!$this->config->isInstantEnabled()) {
274+
return;
275+
}
276+
277+
$category = Mage::registry('current_category');
278+
if ($this->config->replaceCategories() && $category && $category->getDisplayMode() === 'PAGE') {
279+
return;
280+
}
281+
282+
$observer->getData('layout')->getUpdate()->addHandle('algolia_search_handle_instantsearch');
283+
}
284+
285+
private function loadAutocompleteHandle(Varien_Event_Observer $observer)
286+
{
287+
if ($this->config->isPopupEnabled()) {
288+
$observer->getData('layout')->getUpdate()->addHandle('algolia_search_handle_autocomplete');
289+
}
290+
}
291+
292+
private function loadPreventBackendRenderingHandle(Varien_Event_Observer $observer)
293+
{
294+
if (!$this->config->preventBackendRendering()) {
295+
return;
296+
}
297+
298+
$category = Mage::registry('current_category');
299+
$backendRenderingDisplayMode = $this->config->getBackendRenderingDisplayMode();
300+
if ($category && $backendRenderingDisplayMode === 'only_products' && $category->getDisplayMode() === 'PAGE') {
301+
return;
302+
}
303+
304+
$observer->getData('layout')->getUpdate() ->addHandle('algolia_search_handle_prevent_backend_rendering');
305+
}
247306
}

‎app/code/community/Algolia/Algoliasearch/Model/Resource/Fulltext.php

+32-8
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function prepareResult($object, $queryText, $query)
3131

3232
protected function _saveProductIndexes($storeId, $productIndexes)
3333
{
34-
if ($this->config->isEnabledBackend(Mage::app()->getStore()->getId()) === false) {
34+
if ($this->config->isEnabledBackend($storeId) === false) {
3535
return parent::_saveProductIndexes($storeId, $productIndexes);
3636
}
3737

@@ -40,32 +40,56 @@ protected function _saveProductIndexes($storeId, $productIndexes)
4040

4141
/**
4242
* Only used when reindexing everything. Otherwise Model/Indexer/Algolia will take care of the rest.
43+
*
44+
* @param int|null $storeId
45+
* @param array|null $productIds
46+
*
47+
* @return $this|Mage_CatalogSearch_Model_Resource_Fulltext
4348
*/
4449
public function rebuildIndex($storeId = null, $productIds = null)
4550
{
46-
if ($this->config->isEnabledBackend(Mage::app()->getStore()->getId()) === false) {
51+
if ($this->config->isModuleOutputEnabled() === false) {
4752
return parent::rebuildIndex($storeId, $productIds);
4853
}
4954

50-
if ($this->config->isModuleOutputEnabled() === false) {
55+
if ($storeId !== null) {
56+
$this->reindex($storeId, $productIds);
57+
58+
return $this;
59+
}
60+
61+
/** @var Mage_Core_Model_Store $store */
62+
foreach (Mage::app()->getStores() as $store) {
63+
$this->reindex($store->getId(), $productIds);
64+
}
65+
66+
return $this;
67+
}
68+
69+
private function reindex($storeId, $productIds)
70+
{
71+
if ($this->config->isEnabledBackend($storeId) === false) {
5172
return parent::rebuildIndex($storeId, $productIds);
5273
}
5374

54-
if (!$this->config->getApplicationID() || !$this->config->getAPIKey() || !$this->config->getSearchOnlyAPIKey()) {
75+
return $this->reindexAlgolia($storeId, $productIds);
76+
}
77+
78+
private function reindexAlgolia($storeId, $productIds)
79+
{
80+
if (!$this->config->getApplicationID($storeId) || !$this->config->getAPIKey($storeId) || !$this->config->getSearchOnlyAPIKey($storeId)) {
5581
/** @var Mage_Adminhtml_Model_Session $session */
5682
$session = Mage::getSingleton('adminhtml/session');
5783
$session->addError('Algolia reindexing failed: You need to configure your Algolia credentials in System > Configuration > Algolia Search.');
5884

59-
return null;
85+
return;
6086
}
6187

6288
/* Avoid Indexing twice */
6389
if (is_array($productIds) && $productIds > 0) {
64-
return $this;
90+
return;
6591
}
6692

6793
$this->engine->rebuildProducts($storeId);
68-
69-
return $this;
7094
}
7195
}

‎app/code/community/Algolia/Algoliasearch/Model/System/BackendRenderingDisplayMode.php

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?php
2+
3+
class Algolia_Algoliasearch_Model_System_BackendRenderingDisplayMode
4+
{
5+
public function toOptionArray()
6+
{
7+
return array(
8+
array('value' => 'all', 'label' => Mage::helper('algoliasearch')->__('All categories')),
9+
array('value' => 'only_products', 'label' => Mage::helper('algoliasearch')->__('Categories without static blocks')),
10+
);
11+
}
12+
}

‎app/code/community/Algolia/Algoliasearch/controllers/Adminhtml/QueueController.php ‎app/code/community/Algolia/Algoliasearch/controllers/Adminhtml/AlgoliaQueueController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
class Algolia_Algoliasearch_Adminhtml_QueueController extends Mage_Adminhtml_Controller_Action
3+
class Algolia_Algoliasearch_Adminhtml_AlgoliaQueueController extends Mage_Adminhtml_Controller_Action
44
{
55
public function _isAllowed()
66
{

‎app/code/community/Algolia/Algoliasearch/etc/config.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<config>
33
<modules>
44
<Algolia_Algoliasearch>
5-
<version>1.12.0</version>
5+
<version>1.13.0</version>
66
</Algolia_Algoliasearch>
77
</modules>
88
<frontend>
@@ -182,7 +182,7 @@
182182
<index_prefix>magento_</index_prefix>
183183
<is_popup_enabled>1</is_popup_enabled>
184184
<is_instant_enabled>0</is_instant_enabled>
185-
<use_image_adaptive>0</use_image_adaptive>
185+
<use_adaptive_image>0</use_adaptive_image>
186186
</credentials>
187187
<products>
188188
<number_product_results>9</number_product_results>
@@ -201,6 +201,7 @@
201201
<max_values_per_facet>10</max_values_per_facet>
202202
<sorts>a:3:{s:18:"_1432908018844_844";a:3:{s:9:"attribute";s:5:"price";s:4:"sort";s:3:"asc";s:5:"label";s:12:"Lowest price";}s:18:"_1432908022539_539";a:3:{s:9:"attribute";s:5:"price";s:4:"sort";s:4:"desc";s:5:"label";s:13:"Highest price";}s:18:"_1433768597454_454";a:3:{s:9:"attribute";s:10:"created_at";s:4:"sort";s:4:"desc";s:5:"label";s:12:"Newest first";}}</sorts>
203203
<add_to_cart_enable>1</add_to_cart_enable>
204+
<infinite_scroll_enable>0</infinite_scroll_enable>
204205
</instant>
205206
<autocomplete>
206207
<nb_of_products_suggestions>6</nb_of_products_suggestions>
@@ -251,6 +252,7 @@
251252
<index_product_on_category_products_update>1</index_product_on_category_products_update>
252253
<index_all_category_product_on_category_update>0</index_all_category_product_on_category_update>
253254
<prevent_backend_rendering>0</prevent_backend_rendering>
255+
<prevent_backend_rendering_display_mode>all</prevent_backend_rendering_display_mode>
254256
<backend_rendering_allowed_user_agents>Googlebot
255257
Bingbot</backend_rendering_allowed_user_agents>
256258
</advanced>

0 commit comments

Comments
 (0)