Skip to content

Add composer support #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 19 commits into
base: develop
Choose a base branch
from
Open

Add composer support #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9b7fcd1
Create composer.json
Feb 21, 2019
4c67a24
Update composer.json
Feb 21, 2019
09c5dcb
Update composer.json
Feb 21, 2019
df10390
Update composer.json
Feb 21, 2019
b95d478
Update composer.json
Feb 21, 2019
5c39c2e
Merge pull request #1 from doofinder/master
Apr 21, 2020
f1b0a6b
New Release: v1.8.32
carlosescri May 20, 2020
5af7fb2
Merge branch 'release/v1.8.32'
carlosescri May 20, 2020
df371ec
fix: fallback to magento's default search in case of exception (#130)
carlosescri Sep 23, 2020
f94b03e
fix: don't send display event for banners (#129)
carlosescri Sep 23, 2020
da5cee8
New Release: v1.8.33
carlosescri Sep 23, 2020
4cfee34
Merge branch 'hotfix/v1.8.33'
carlosescri Sep 23, 2020
3fc7de7
Fix getting price for bundle product
Jan 29, 2020
53b93b7
New Release: v1.8.32
carlosescri May 20, 2020
d588341
fix: fallback to magento's default search in case of exception (#130)
carlosescri Sep 23, 2020
6f1cada
fix: don't send display event for banners (#129)
carlosescri Sep 23, 2020
3433788
New Release: v1.8.33
carlosescri Sep 23, 2020
9e7f88c
Merge pull request #3 from doofinder/master
Dec 10, 2020
276b0c8
Remove double licence mention
Dec 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/community/Doofinder/Feed/Block/Adminhtml/Log/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* @category blocks
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

class Doofinder_Feed_Block_Adminhtml_Log_View extends Mage_Adminhtml_Block_Widget_Grid
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Doofinder/Feed/Block/Adminhtml/Map/Additional.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* @category blocks
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

class Doofinder_Feed_Block_Adminhtml_Map_Additional extends Mage_Adminhtml_Block_System_Config_Form_Field
Expand Down
8 changes: 2 additions & 6 deletions app/code/community/Doofinder/Feed/Block/Banner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* @category blocks
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

class Doofinder_Feed_Block_Banner extends Mage_Core_Block_Template
Expand All @@ -33,11 +33,7 @@ public function _construct()
*/
public function getBanner()
{
$banner = $this->helper->getBanner();
if ($banner !== null) {
$this->helper->registerBannerDisplay($banner['id']);
}
return $banner;
return $this->helper->getBanner();
}

/**
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Doofinder/Feed/Block/Integration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* @category blocks
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

class Doofinder_Feed_Block_Integration extends Mage_Core_Block_Abstract
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Doofinder/Feed/Block/Settings/Buttons/Generate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* @category blocks
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

class Doofinder_Feed_Block_Settings_Buttons_Generate extends Mage_Adminhtml_Block_System_Config_Form_Field
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Doofinder/Feed/Block/Settings/Buttons/ViewLog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* @category blocks
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

class Doofinder_Feed_Block_Settings_Buttons_ViewLog extends Mage_Adminhtml_Block_System_Config_Form_Field
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Doofinder/Feed/Block/Settings/Locks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* @category blocks
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

class Doofinder_Feed_Block_Settings_Locks extends Mage_Adminhtml_Block_System_Config_Form_Field
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Doofinder/Feed/Block/Settings/Panel/AtomicUpdates.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* @category blocks
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

class Doofinder_Feed_Block_Settings_Panel_AtomicUpdates extends Mage_Adminhtml_Block_System_Config_Form_Field
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Doofinder/Feed/Block/Settings/Panel/Crondescription.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* @category blocks
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

class Doofinder_Feed_Block_Settings_Panel_CronDescription extends Doofinder_Feed_Block_Settings_Panel_Description
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Doofinder/Feed/Block/Settings/Panel/Datetime.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* @category blocks
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

class Doofinder_Feed_Block_Settings_Panel_Datetime extends Mage_Adminhtml_Block_System_Config_Form_Field
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Doofinder/Feed/Block/Settings/Panel/Description.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* @category blocks
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

class Doofinder_Feed_Block_Settings_Panel_Description extends Mage_Adminhtml_Block_System_Config_Form_Field
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Doofinder/Feed/Block/Settings/Panel/DynamicFeedUrl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* @category blocks
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

class Doofinder_Feed_Block_Settings_Panel_DynamicFeedUrl extends Mage_Adminhtml_Block_System_Config_Form_Field
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Doofinder/Feed/Block/Settings/Panel/File.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* @category blocks
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

class Doofinder_Feed_Block_Settings_Panel_File extends Mage_Adminhtml_Block_System_Config_Form_Field
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Doofinder/Feed/Block/Settings/Panel/Layerdescription.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* @category blocks
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

class Doofinder_Feed_Block_Settings_Panel_LayerDescription extends Doofinder_Feed_Block_Settings_Panel_Description
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Doofinder/Feed/Block/Settings/Panel/Message.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* @category blocks
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

class Doofinder_Feed_Block_Settings_Panel_Message extends Mage_Adminhtml_Block_System_Config_Form_Field
Expand Down
15 changes: 2 additions & 13 deletions app/code/community/Doofinder/Feed/Helper/Banner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
/**
* @category Helpers
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

/**
* Data helper for Doofinder Feed
*
* @version 1.8.31
* @version 1.8.33
* @package Doofinder_Feed
*/
class Doofinder_Feed_Helper_Banner extends Mage_Core_Helper_Abstract
Expand Down Expand Up @@ -46,17 +46,6 @@ public function getBanner()
return $banner;
}

/**
* Register Banner Display in Doofinder API.
*
* @param integer $bannerId
* @return void
*/
public function registerBannerDisplay($bannerId)
{
$this->searchHelper->getSearchClient()->registerBannerDisplay($bannerId);
}

/**
* Register Banner Click in Doofinder API.
*
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Doofinder/Feed/Helper/Data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
/**
* @category Helpers
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

/**
* Data helper for Doofinder Feed
*
* @version 1.8.31
* @version 1.8.33
* @package Doofinder_Feed
*/
class Doofinder_Feed_Helper_Data extends Mage_Core_Helper_Abstract
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Doofinder/Feed/Helper/Log.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
/**
* @category Helpers
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

/**
* Log helper for Doofinder Feed
*
* @version 1.8.31
* @version 1.8.33
* @package Doofinder_Feed
*/
class Doofinder_Feed_Helper_Log extends Mage_Core_Helper_Abstract
Expand Down
10 changes: 10 additions & 0 deletions app/code/community/Doofinder/Feed/Helper/Search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ class Doofinder_Feed_Helper_Search extends Mage_Core_Helper_Abstract

protected $_lastSearch = null;
protected $_lastResults = null;
protected $_searchError = false;

/**
* @var \Doofinder\Api\Management\SearchEngine[]
Expand Down Expand Up @@ -70,6 +71,7 @@ public function performDoofinderSearch($queryText)
// @codingStandardsIgnoreEnd
} catch (\Doofinder\Api\Search\Error $e) {
$results = null;
$this->_searchError = true;
Mage::logException($e);
}

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

/**
* @return boolean
*/
public function getSearchError()
{
return $this->_searchError;
}

/**
* Retrieve ids from Doofinder Results
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Doofinder/Feed/Helper/Tax.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* @category Helpers
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

class Doofinder_Feed_Helper_Tax extends Mage_Tax_Helper_Data
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Doofinder/Feed/Model/Adminhtml/System/Config/Backend/Cron.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* @category Models
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

class Doofinder_Feed_Model_Adminhtml_System_Config_Backend_Cron extends Mage_Core_Model_Config_Data
Expand Down
4 changes: 4 additions & 0 deletions app/code/community/Doofinder/Feed/Model/CatalogSearch/Resource/Fulltext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,14 @@ public function prepareResult($object, $queryText, $query)
return parent::prepareResult($object, $queryText, $query);
}

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

// Fetch initial results
$results = $helper->performDoofinderSearch($queryText);
if ($helper->getSearchError()) {
return parent::prepareResult($object, $queryText, $query);
}

$adapter = $this->_getWriteAdapter();

Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Doofinder/Feed/Model/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
/**
* @category Models
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

/**
* Config model for Doofinder Feed
*
* @version 1.8.31
* @version 1.8.33
* @package Doofinder_Feed
*/
class Doofinder_Feed_Model_Config extends Mage_Core_Model_Config_Data
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Doofinder/Feed/Model/Cron.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* @category Models
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

class Doofinder_Feed_Model_Cron extends Mage_Core_Model_Abstract
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Doofinder/Feed/Model/Generator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
/**
* @category Models
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

/**
* Generator model for Doofinder Feed
*
* @version 1.8.31
* @version 1.8.33
* @package Doofinder_Feed
*/
if (!defined('DS'))
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Doofinder/Feed/Model/Log.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* @category Models
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

class Doofinder_Feed_Model_Log extends Mage_Core_Model_Abstract
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Doofinder/Feed/Model/Map/Product/Abstract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
/**
* @category Models
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

/**
* Abstract Product Map Model for Doofinder Feed
*
* @version 1.8.31
* @version 1.8.33
* @package Doofinder_Feed
*/
class Doofinder_Feed_Model_Map_Product_Abstract extends Varien_Object
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Doofinder/Feed/Model/Map/Product/Associated.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
/**
* @category Models
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

/**
* Associated Product Map Model for Doofinder Feed
*
* @version 1.8.31
* @version 1.8.33
* @package Doofinder_Feed
*/
class Doofinder_Feed_Model_Map_Product_Associated
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Doofinder/Feed/Model/Map/Product/Bundle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
/**
* @category Models
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

/**
* Bundle Product Map Model for Doofinder Feed
*
* @version 1.8.31
* @version 1.8.33
* @package Doofinder_Feed
*/
class Doofinder_Feed_Model_Map_Product_Bundle
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Doofinder/Feed/Model/Map/Product/Configurable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
/**
* @category Models
* @package Doofinder_Feed
* @version 1.8.31
* @version 1.8.33
*/

/**
* Configurable Product Map Model for Doofinder Feed
*
* @version 1.8.31
* @version 1.8.33
* @package Doofinder_Feed
*/
class Doofinder_Feed_Model_Map_Product_Configurable
Expand Down
Loading