Skip to content

Commit 4cfee34

Browse files
carlosescricarlosescri
committed
Merge branch 'hotfix/v1.8.33'
2 parents 5af7fb2 + da5cee8 commit 4cfee34

Some content is hidden

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

57 files changed

+94
-95
lines changed

‎app/code/community/Doofinder/Feed/Block/Adminhtml/Log/View.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
class Doofinder_Feed_Block_Adminhtml_Log_View extends Mage_Adminhtml_Block_Widget_Grid

‎app/code/community/Doofinder/Feed/Block/Adminhtml/Map/Additional.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
class Doofinder_Feed_Block_Adminhtml_Map_Additional extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Banner.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
class Doofinder_Feed_Block_Banner extends Mage_Core_Block_Template
@@ -33,11 +33,7 @@ public function _construct()
3333
*/
3434
public function getBanner()
3535
{
36-
$banner = $this->helper->getBanner();
37-
if ($banner !== null) {
38-
$this->helper->registerBannerDisplay($banner['id']);
39-
}
40-
return $banner;
36+
return $this->helper->getBanner();
4137
}
4238

4339
/**

‎app/code/community/Doofinder/Feed/Block/Integration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
class Doofinder_Feed_Block_Integration extends Mage_Core_Block_Abstract

‎app/code/community/Doofinder/Feed/Block/Settings/Buttons/Generate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Buttons_Generate extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Buttons/ViewLog.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Buttons_ViewLog extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Locks.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Locks extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/AtomicUpdates.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_AtomicUpdates extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/Crondescription.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_CronDescription extends Doofinder_Feed_Block_Settings_Panel_Description

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/Datetime.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_Datetime extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/Description.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_Description extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/DynamicFeedUrl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_DynamicFeedUrl extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/File.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_File extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/Layerdescription.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_LayerDescription extends Doofinder_Feed_Block_Settings_Panel_Description

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/Message.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_Message extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Helper/Banner.php

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
/**
77
* @category Helpers
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
/**
1313
* Data helper for Doofinder Feed
1414
*
15-
* @version 1.8.32
15+
* @version 1.8.33
1616
* @package Doofinder_Feed
1717
*/
1818
class Doofinder_Feed_Helper_Banner extends Mage_Core_Helper_Abstract
@@ -46,17 +46,6 @@ public function getBanner()
4646
return $banner;
4747
}
4848

49-
/**
50-
* Register Banner Display in Doofinder API.
51-
*
52-
* @param integer $bannerId
53-
* @return void
54-
*/
55-
public function registerBannerDisplay($bannerId)
56-
{
57-
$this->searchHelper->getSearchClient()->registerBannerDisplay($bannerId);
58-
}
59-
6049
/**
6150
* Register Banner Click in Doofinder API.
6251
*

‎app/code/community/Doofinder/Feed/Helper/Data.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
/**
77
* @category Helpers
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
/**
1313
* Data helper for Doofinder Feed
1414
*
15-
* @version 1.8.32
15+
* @version 1.8.33
1616
* @package Doofinder_Feed
1717
*/
1818
class Doofinder_Feed_Helper_Data extends Mage_Core_Helper_Abstract

‎app/code/community/Doofinder/Feed/Helper/Log.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
/**
77
* @category Helpers
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
/**
1313
* Log helper for Doofinder Feed
1414
*
15-
* @version 1.8.32
15+
* @version 1.8.33
1616
* @package Doofinder_Feed
1717
*/
1818
class Doofinder_Feed_Helper_Log extends Mage_Core_Helper_Abstract

‎app/code/community/Doofinder/Feed/Helper/Search.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ class Doofinder_Feed_Helper_Search extends Mage_Core_Helper_Abstract
77

88
protected $_lastSearch = null;
99
protected $_lastResults = null;
10+
protected $_searchError = false;
1011

1112
/**
1213
* @var \Doofinder\Api\Management\SearchEngine[]
@@ -70,6 +71,7 @@ public function performDoofinderSearch($queryText)
7071
// @codingStandardsIgnoreEnd
7172
} catch (\Doofinder\Api\Search\Error $e) {
7273
$results = null;
74+
$this->_searchError = true;
7375
Mage::logException($e);
7476
}
7577

@@ -80,6 +82,14 @@ public function performDoofinderSearch($queryText)
8082
return $results ? $this->retrieveIds($results) : array();
8183
}
8284

85+
/**
86+
* @return boolean
87+
*/
88+
public function getSearchError()
89+
{
90+
return $this->_searchError;
91+
}
92+
8393
/**
8494
* Retrieve ids from Doofinder Results
8595
*

‎app/code/community/Doofinder/Feed/Helper/Tax.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category Helpers
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
class Doofinder_Feed_Helper_Tax extends Mage_Tax_Helper_Data

‎app/code/community/Doofinder/Feed/Model/Adminhtml/System/Config/Backend/Cron.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category Models
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
class Doofinder_Feed_Model_Adminhtml_System_Config_Backend_Cron extends Mage_Core_Model_Config_Data

‎app/code/community/Doofinder/Feed/Model/CatalogSearch/Resource/Fulltext.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,14 @@ public function prepareResult($object, $queryText, $query)
8080
return parent::prepareResult($object, $queryText, $query);
8181
}
8282

83+
/** @var Doofinder_Feed_Helper_Search $helper */
8384
$helper = Mage::helper('doofinder_feed/search');
8485

8586
// Fetch initial results
8687
$results = $helper->performDoofinderSearch($queryText);
88+
if ($helper->getSearchError()) {
89+
return parent::prepareResult($object, $queryText, $query);
90+
}
8791

8892
$adapter = $this->_getWriteAdapter();
8993

‎app/code/community/Doofinder/Feed/Model/Config.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
/**
77
* @category Models
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
/**
1313
* Config model for Doofinder Feed
1414
*
15-
* @version 1.8.32
15+
* @version 1.8.33
1616
* @package Doofinder_Feed
1717
*/
1818
class Doofinder_Feed_Model_Config extends Mage_Core_Model_Config_Data

‎app/code/community/Doofinder/Feed/Model/Cron.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category Models
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
class Doofinder_Feed_Model_Cron extends Mage_Core_Model_Abstract

‎app/code/community/Doofinder/Feed/Model/Generator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
/**
77
* @category Models
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
/**
1313
* Generator model for Doofinder Feed
1414
*
15-
* @version 1.8.32
15+
* @version 1.8.33
1616
* @package Doofinder_Feed
1717
*/
1818
if (!defined('DS'))

‎app/code/community/Doofinder/Feed/Model/Log.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category Models
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
class Doofinder_Feed_Model_Log extends Mage_Core_Model_Abstract

‎app/code/community/Doofinder/Feed/Model/Map/Product/Abstract.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
/**
77
* @category Models
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
/**
1313
* Abstract Product Map Model for Doofinder Feed
1414
*
15-
* @version 1.8.32
15+
* @version 1.8.33
1616
* @package Doofinder_Feed
1717
*/
1818
class Doofinder_Feed_Model_Map_Product_Abstract extends Varien_Object

‎app/code/community/Doofinder/Feed/Model/Map/Product/Associated.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
/**
77
* @category Models
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
/**
1313
* Associated Product Map Model for Doofinder Feed
1414
*
15-
* @version 1.8.32
15+
* @version 1.8.33
1616
* @package Doofinder_Feed
1717
*/
1818
class Doofinder_Feed_Model_Map_Product_Associated

‎app/code/community/Doofinder/Feed/Model/Map/Product/Bundle.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
/**
77
* @category Models
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
/**
1313
* Bundle Product Map Model for Doofinder Feed
1414
*
15-
* @version 1.8.32
15+
* @version 1.8.33
1616
* @package Doofinder_Feed
1717
*/
1818
class Doofinder_Feed_Model_Map_Product_Bundle

‎app/code/community/Doofinder/Feed/Model/Map/Product/Configurable.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
/**
77
* @category Models
88
* @package Doofinder_Feed
9-
* @version 1.8.32
9+
* @version 1.8.33
1010
*/
1111

1212
/**
1313
* Configurable Product Map Model for Doofinder Feed
1414
*
15-
* @version 1.8.32
15+
* @version 1.8.33
1616
* @package Doofinder_Feed
1717
*/
1818
class Doofinder_Feed_Model_Map_Product_Configurable

0 commit comments

Comments
 (0)