Skip to content

Commit 443f861

Browse files
author
Jan Petr
authored
Merge pull request #1127 from algolia/develop
Develop
2 parents 9357b9e + b12c38f commit 443f861

File tree

46 files changed

+586
-2961
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+586
-2961
lines changed

‎CHANGELOG.md

+22
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
# CHANGE LOG
22

3+
## 1.16.0
4+
5+
### Updates
6+
- Update max PHP dependency (#1090)
7+
- Update Reindex SKU for improved messaging (#1098)
8+
- Added ProxyHelper to assist with plan upsell (#1109)
9+
- Update autocomplete version in algoliaBundle.js (#1121)
10+
- Improvements to Indexing and Indexing Queue
11+
- Skip inactive stores (#1101)
12+
- Add distinct to category collection fetch (#1104)
13+
- Fail "Remove Algolia products" silently on non-existent index (#1111)
14+
- Fetch max_record_size and add retry on stuck PIDs for indexing queue (#1117)
15+
16+
### Fixes
17+
- Fix directory casing 404s (#1095)
18+
- Add table prefixes when calling core/resource instances (#1097)
19+
- Fix price_with_tax for customer groups (#1100)
20+
- Fix autocomplete frontend hook (#1102)
21+
- Fix jobs locking (#1118)
22+
- Fix Dockerfile (#1120)
23+
- Fix sticky autocomplete input value after clear toggle (#1122)
24+
325
## 1.15.0
426

527
### Features

‎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.15.0-green.svg)
4+
![Latest version](https://img.shields.io/badge/latest-1.16.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/IndexingQueue.php ‎app/code/community/Algolia/Algoliasearch/Block/Adminhtml/Indexingqueue.php

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

3-
class Algolia_Algoliasearch_Block_Adminhtml_IndexingQueue extends Mage_Adminhtml_Block_Widget_Grid_Container
3+
class Algolia_Algoliasearch_Block_Adminhtml_Indexingqueue extends Mage_Adminhtml_Block_Widget_Grid_Container
44
{
55
/**
66
* Initialize Grid Container

‎app/code/community/Algolia/Algoliasearch/Block/Adminhtml/IndexingQueue/Edit.php ‎app/code/community/Algolia/Algoliasearch/Block/Adminhtml/Indexingqueue/Edit.php

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

3-
class Algolia_Algoliasearch_Block_Adminhtml_IndexingQueue_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
3+
class Algolia_Algoliasearch_Block_Adminhtml_Indexingqueue_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
44
{
55
/**
66
* Internal constructor.

‎app/code/community/Algolia/Algoliasearch/Block/Adminhtml/IndexingQueue/Edit/Form.php ‎app/code/community/Algolia/Algoliasearch/Block/Adminhtml/Indexingqueue/Edit/Form.php

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

3-
class Algolia_Algoliasearch_Block_Adminhtml_IndexingQueue_Edit_Form extends Mage_Adminhtml_Block_Widget_Form
3+
class Algolia_Algoliasearch_Block_Adminhtml_Indexingqueue_Edit_Form extends Mage_Adminhtml_Block_Widget_Form
44
{
55
/**
66
* @return Algolia_Algoliasearch_Block_Adminhtml_IndexingQueue_Edit_Form

‎app/code/community/Algolia/Algoliasearch/Block/Adminhtml/IndexingQueue/Grid.php ‎app/code/community/Algolia/Algoliasearch/Block/Adminhtml/Indexingqueue/Grid.php

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

3-
class Algolia_Algoliasearch_Block_Adminhtml_IndexingQueue_Grid extends Mage_Adminhtml_Block_Widget_Grid
3+
class Algolia_Algoliasearch_Block_Adminhtml_Indexingqueue_Grid extends Mage_Adminhtml_Block_Widget_Grid
44
{
55
/**
66
* Initialize Grid Properties

‎app/code/community/Algolia/Algoliasearch/Block/Adminhtml/IndexingQueue/Grid/Renderer/Json.php ‎app/code/community/Algolia/Algoliasearch/Block/Adminhtml/Indexingqueue/Grid/Renderer/Json.php

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

3-
class Algolia_Algoliasearch_Block_Adminhtml_IndexingQueue_Grid_Renderer_Json extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
3+
class Algolia_Algoliasearch_Block_Adminhtml_Indexingqueue_Grid_Renderer_Json extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
44
{
55
/**
66
* @param Varien_Object $row

‎app/code/community/Algolia/Algoliasearch/Block/Adminhtml/IndexingQueue/Status.php ‎app/code/community/Algolia/Algoliasearch/Block/Adminhtml/Indexingqueue/Status.php

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

3-
class Algolia_Algoliasearch_Block_Adminhtml_IndexingQueue_Status extends Mage_Adminhtml_Block_Template
3+
class Algolia_Algoliasearch_Block_Adminhtml_Indexingqueue_Status extends Mage_Adminhtml_Block_Template
44
{
55
const CRON_QUEUE_FREQUENCY = 330;
66

‎app/code/community/Algolia/Algoliasearch/Block/Adminhtml/ReindexSku/Edit.php ‎app/code/community/Algolia/Algoliasearch/Block/Adminhtml/Reindexsku/Edit.php

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

3-
class Algolia_Algoliasearch_Block_Adminhtml_ReindexSku_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
3+
class Algolia_Algoliasearch_Block_Adminhtml_Reindexsku_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
44
{
55
/**
66
* Internal constructor.

‎app/code/community/Algolia/Algoliasearch/Block/Adminhtml/ReindexSku/Edit/Form.php ‎app/code/community/Algolia/Algoliasearch/Block/Adminhtml/Reindexsku/Edit/Form.php

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

3-
class Algolia_Algoliasearch_Block_Adminhtml_ReindexSku_Edit_Form extends Mage_Adminhtml_Block_Widget_Form
3+
class Algolia_Algoliasearch_Block_Adminhtml_Reindexsku_Edit_Form extends Mage_Adminhtml_Block_Widget_Form
44
{
55
/**
66
* @return Algolia_AlgoliaSearch_Block_Adminhtml_ReindexSku_Edit_Form

‎app/code/community/Algolia/Algoliasearch/Block/System/Config/Form/Field/AbstractField.php

+6
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@ protected function getRenderer($columnId, array $columnSettings)
8383
$selectField->setOptions($options);
8484
$selectField->setExtraParams('style="width:'.$width.'px;"');
8585

86+
if (isset($columnSettings['disabled']) && $columnSettings['disabled'] != 0) {
87+
$extra = $selectField->getExtraParams();
88+
$extra .= ' disabled';
89+
$selectField->setExtraParams($extra);
90+
}
91+
8692
$this->selectFields[$columnId] = $selectField;
8793

8894
return $this->selectFields[$columnId];

‎app/code/community/Algolia/Algoliasearch/Block/System/Config/Form/Field/ClickAnalytics.php

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?php
2+
3+
class Algolia_Algoliasearch_Block_System_Config_Form_Field_ClickAnalytics extends Mage_Adminhtml_Block_System_Config_Form_Field
4+
{
5+
protected $_showUpsell = false;
6+
7+
protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
8+
{
9+
if (!$this->isClickAnalyticsEnabled($element)) {
10+
$element->setDisabled(true);
11+
$this->_showUpsell = true;
12+
}
13+
14+
return parent::_getElementHtml($element);
15+
}
16+
17+
/**
18+
* @return bool
19+
*/
20+
public function isClickAnalyticsEnabled()
21+
{
22+
$proxyHelper = Mage::helper('algoliasearch/proxyHelper');
23+
$info = $proxyHelper->getClientConfigurationData();
24+
25+
return isset($info['click_analytics']) && $info['click_analytics'] == 1;
26+
}
27+
28+
protected function _decorateRowHtml($element, $html)
29+
{
30+
if (!$this->_showUpsell) {
31+
return parent::_decorateRowHtml($element, $html);
32+
}
33+
34+
$additionalRow = '<tr class="algoliasearch-messages"><td colspan="3"><div class="algoliasearch-config-info icon-stars">';
35+
$additionalRow .= $this->__('To get access to this Algolia feature, please consider <a href="%s" target="_blank">upgrading to a higher plan.</a>',
36+
'https://www.algolia.com/pricing/');
37+
$additionalRow .= '</div></td></tr>';
38+
39+
return '<tr id="row_' . $element->getHtmlId() . '">' . $html . '</tr>' . $additionalRow;
40+
}
41+
}

‎app/code/community/Algolia/Algoliasearch/Block/System/Config/Form/Field/Facets.php

+42-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66
class Algolia_Algoliasearch_Block_System_Config_Form_Field_Facets extends Algolia_Algoliasearch_Block_System_Config_Form_Field_AbstractField
77
{
8+
protected $_isQueryRulesDisabled;
9+
810
public function __construct()
911
{
1012
$this->settings = array(
@@ -52,10 +54,11 @@ public function __construct()
5254
'create_rule' => array(
5355
'label' => 'Create Query rule?',
5456
'options' => array(
55-
'1' => 'Yes',
56-
'2' => 'No'
57+
'2' => 'No',
58+
'1' => 'Yes'
5759
),
5860
'rowMethod' => 'getCreateRule',
61+
'disabled' => $this->isQueryRulesDisabled()
5962
),
6063
),
6164
'buttonLabel' => 'Add Facet',
@@ -64,4 +67,41 @@ public function __construct()
6467

6568
parent::__construct();
6669
}
70+
71+
/**
72+
* @return bool
73+
*/
74+
public function isQueryRulesDisabled()
75+
{
76+
if (is_null($this->_isQueryRulesDisabled)) {
77+
$this->_isQueryRulesDisabled = $this->_disableQueryRules();
78+
}
79+
80+
return $this->_isQueryRulesDisabled;
81+
}
82+
83+
/**
84+
* @return bool
85+
*/
86+
protected function _disableQueryRules()
87+
{
88+
$proxyHelper = Mage::helper('algoliasearch/proxyHelper');
89+
$info = $proxyHelper->getClientConfigurationData();
90+
91+
return !isset($info['query_rules']) || $info['query_rules'] == 0;
92+
}
93+
94+
protected function _decorateRowHtml($element, $html)
95+
{
96+
if (!$this->isQueryRulesDisabled()) {
97+
return parent::_decorateRowHtml($element, $html);
98+
}
99+
100+
$additionalRow = '<tr class="algoliasearch-messages"><td></td><td><div class="algoliasearch-config-info icon-stars">';
101+
$additionalRow .= $this->__('To get access to this Algolia feature, please consider <a href="%s" target="_blank">upgrading to a higher plan.</a>',
102+
'https://www.algolia.com/pricing/');
103+
$additionalRow .= '</div></td></tr>';
104+
105+
return '<tr id="row_' . $element->getHtmlId() . '">' . $html . '</tr>' . $additionalRow;
106+
}
67107
}

‎app/code/community/Algolia/Algoliasearch/Block/System/Config/Form/Field/Logo.php

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?php
2+
3+
class Algolia_Algoliasearch_Block_System_Config_Form_Field_Logo extends Mage_Adminhtml_Block_System_Config_Form_Field
4+
{
5+
protected $_showUpsell = false;
6+
7+
protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
8+
{
9+
if ($this->showLogo($element)) {
10+
$element->setDisabled(true);
11+
$element->setValue(0);
12+
$this->_showUpsell = true;
13+
}
14+
15+
return parent::_getElementHtml($element);
16+
}
17+
18+
/**
19+
* @return bool
20+
*/
21+
public function showLogo()
22+
{
23+
$proxyHelper = Mage::helper('algoliasearch/proxyHelper');
24+
$info = $proxyHelper->getClientConfigurationData();
25+
26+
return isset($info['require_logo']) && $info['require_logo'] == 1;
27+
}
28+
29+
protected function _decorateRowHtml($element, $html)
30+
{
31+
if (!$this->_showUpsell) {
32+
return parent::_decorateRowHtml($element, $html);
33+
}
34+
35+
$additionalRow = '<tr class="algoliasearch-messages"><td></td><td colspan="3"><div class="algoliasearch-config-info icon-stars">';
36+
$additionalRow .= $this->__('To be able to remove the Algolia logo, please consider <a href="%s" target="_blank">upgrading to a higher plan.</a>',
37+
'https://www.algolia.com/pricing/');
38+
$additionalRow .= '</div></td></tr>';
39+
40+
return '<tr id="row_' . $element->getHtmlId() . '">' . $html . '</tr>' . $additionalRow;
41+
}
42+
}

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

+14-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Algolia_Algoliasearch_Helper_Algoliahelper extends Mage_Core_Helper_Abstra
1313
protected $config;
1414

1515
/** @var int */
16-
protected $maxRecordSize = 20000;
16+
protected $maxRecordSize;
1717

1818
/** @var array */
1919
protected $potentiallyLongAttributes = array('description', 'short_description', 'meta_description', 'content');
@@ -236,7 +236,7 @@ public function copySynonyms($fromIndexName, $toIndexName)
236236
$this->lastUsedIndexName = $toIndex;
237237
$this->lastTaskId = $res['taskID'];
238238
}
239-
239+
240240
/**
241241
* @param $fromIndexName
242242
* @param $toIndexName
@@ -332,11 +332,21 @@ private function prepareRecords(&$objects, $indexName)
332332
}
333333
}
334334

335+
private function getMaxRecordSize()
336+
{
337+
if (!$this->maxRecordSize) {
338+
$this->maxRecordSize = $this->config->getMaxRecordSizeLimit()
339+
? $this->config->getMaxRecordSizeLimit() : $this->config->getDefaultMaxRecordSize();
340+
}
341+
342+
return $this->maxRecordSize;
343+
}
344+
335345
public function handleTooBigRecord($object)
336346
{
337347
$size = mb_strlen(json_encode($object));
338348

339-
if ($size > $this->maxRecordSize) {
349+
if ($size > $this->getMaxRecordSize()) {
340350
foreach ($this->potentiallyLongAttributes as $attribute) {
341351
if (isset($object[$attribute])) {
342352
unset($object[$attribute]);
@@ -345,7 +355,7 @@ public function handleTooBigRecord($object)
345355

346356
$size = mb_strlen(json_encode($object));
347357

348-
if ($size > $this->maxRecordSize) {
358+
if ($size > $this->getMaxRecordSize()) {
349359
$object = false;
350360
}
351361
}

0 commit comments

Comments
 (0)