From 12e54459e3698814807d641c8ef8303057f076a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Tatarczuk?= Date: Wed, 16 Mar 2016 11:52:19 +0100 Subject: [PATCH 1/4] Add image thumbnail/small directives, add image resizing option --- .../community/Doofinder/Feed/Helper/Data.php | 1 + .../Feed/Model/Map/Product/Abstract.php | 26 +++++++++++++++---- .../Doofinder/Feed/Model/Observers/Feed.php | 1 + .../Feed/controllers/FeedController.php | 1 + .../community/Doofinder/Feed/etc/config.xml | 9 ++++++- .../community/Doofinder/Feed/etc/system.xml | 9 +++++++ 6 files changed, 41 insertions(+), 6 deletions(-) diff --git a/app/code/community/Doofinder/Feed/Helper/Data.php b/app/code/community/Doofinder/Feed/Helper/Data.php index d9331785..32987a22 100644 --- a/app/code/community/Doofinder/Feed/Helper/Data.php +++ b/app/code/community/Doofinder/Feed/Helper/Data.php @@ -387,6 +387,7 @@ public function getStoreConfig($storeCode = '') { 'enabled' => Mage::getStoreConfig('doofinder_cron/schedule_settings/enabled', $storeCode), 'display_price' => Mage::getStoreConfig('doofinder_cron/feed_settings/display_price', $storeCode), 'grouped' => Mage::getStoreConfig('doofinder_cron/feed_settings/grouped', $storeCode), + 'image_size' => Mage::getStoreConfig('doofinder_cron/feed_settings/image_size', $storeCode), 'stepSize' => Mage::getStoreConfig('doofinder_cron/schedule_settings/step', $storeCode), 'stepDelay' => Mage::getStoreConfig('doofinder_cron/schedule_settings/delay', $storeCode), 'frequency' => Mage::getStoreConfig('doofinder_cron/schedule_settings/frequency', $storeCode), diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Abstract.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Abstract.php index 01d0f293..cb2b5f6a 100644 --- a/app/code/community/Doofinder/Feed/Model/Map/Product/Abstract.php +++ b/app/code/community/Doofinder/Feed/Model/Map/Product/Abstract.php @@ -184,19 +184,35 @@ protected function mapDirectiveUrl() return $product->getUrlModel()->getUrl($product, array('_nosid' => true)); } - protected function mapDirectiveImageLink() + protected function mapDirectiveImageLink($args, $attributeName = 'image') { $product = $this->getProduct(); $image = $product->getData('image'); - if ($image != 'no_selection' && $image != "") - return (string) Mage::helper('catalog/image') - ->init($product, 'image') - ->resize(120); + if ($image != 'no_selection' && $image != "") { + $image = Mage::helper('catalog/image') + ->init($product, $attributeName); + + if ($size = $this->getGenerator()->getData('image_size')) { + $image->resize($size); + } + + return (string) $image; + } return ""; } + protected function mapDirectiveImageLinkThumbnail($args) + { + return $this->mapDirectiveImageLink($args, 'thumbnail'); + } + + protected function mapDirectiveImageLinkSmall($args) + { + return $this->mapDirectiveImageLink($args, 'small_image'); + } + public function collectProductPrices() { if ( ! $this->getData('collected_product_prices') ) diff --git a/app/code/community/Doofinder/Feed/Model/Observers/Feed.php b/app/code/community/Doofinder/Feed/Model/Observers/Feed.php index 13854f1b..7d74d294 100644 --- a/app/code/community/Doofinder/Feed/Model/Observers/Feed.php +++ b/app/code/community/Doofinder/Feed/Model/Observers/Feed.php @@ -78,6 +78,7 @@ public function generateFeed($observer) 'grouped' => $this->_getBoolean($this->config['grouped']), 'display_price' => $this->_getBoolean($this->config['display_price']), 'minimal_price' => $this->_getBoolean('minimal_price', false), + 'image_size' => $this->config['image_size'], 'customer_group_id' => 0, ); diff --git a/app/code/community/Doofinder/Feed/controllers/FeedController.php b/app/code/community/Doofinder/Feed/controllers/FeedController.php index 1f73500f..46e58ea5 100644 --- a/app/code/community/Doofinder/Feed/controllers/FeedController.php +++ b/app/code/community/Doofinder/Feed/controllers/FeedController.php @@ -52,6 +52,7 @@ public function indexAction() 'display_price' => (bool) $config['display_price'], 'minimal_price' => $this->_getBoolean('minimal_price', false), 'customer_group_id' => 0, + 'image_size' => $config['image_size'], ); $generator = Mage::getSingleton('doofinder_feed/generator', $options); diff --git a/app/code/community/Doofinder/Feed/etc/config.xml b/app/code/community/Doofinder/Feed/etc/config.xml index efbf8044..d4e9f952 100644 --- a/app/code/community/Doofinder/Feed/etc/config.xml +++ b/app/code/community/Doofinder/Feed/etc/config.xml @@ -148,8 +148,14 @@ - + + + + + + + @@ -230,6 +236,7 @@ 1 0 + df_directive_id diff --git a/app/code/community/Doofinder/Feed/etc/system.xml b/app/code/community/Doofinder/Feed/etc/system.xml index 6cefb4f0..04792648 100644 --- a/app/code/community/Doofinder/Feed/etc/system.xml +++ b/app/code/community/Doofinder/Feed/etc/system.xml @@ -43,6 +43,15 @@ 0 1 + + + Export product image with given width. Leave empty to use original size. + text + 9 + 1 + 0 + 1 + From 7e5854bd4745ea71de60f874ab0cf61710aad6eb Mon Sep 17 00:00:00 2001 From: Carlos Escribano Date: Mon, 28 Mar 2016 09:50:25 +0200 Subject: [PATCH 2/4] Change order of the panels. Signed-off-by: Carlos Escribano --- .../community/Doofinder/Feed/etc/system.xml | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/app/code/community/Doofinder/Feed/etc/system.xml b/app/code/community/Doofinder/Feed/etc/system.xml index 04792648..045d9c1e 100644 --- a/app/code/community/Doofinder/Feed/etc/system.xml +++ b/app/code/community/Doofinder/Feed/etc/system.xml @@ -15,51 +15,11 @@ 0 1 - - - true - text - 10 - 1 - 0 - 1 - - - - select - adminhtml/system_config_source_yesno - 7 - 1 - 0 - 1 - - - - Export each component of a configurable product separately, instead of exporting them as a single product. - select - adminhtml/system_config_source_yesno - 8 - 1 - 0 - 1 - - - - Export product image with given width. Leave empty to use original size. - text - 9 - 1 - 0 - 1 - - - - false text - 15 + 10 1 0 1 @@ -211,6 +171,46 @@ + + + true + text + 15 + 1 + 0 + 1 + + + + select + adminhtml/system_config_source_yesno + 7 + 1 + 0 + 1 + + + + Export each component of a configurable product separately, instead of exporting them as a single product. + select + adminhtml/system_config_source_yesno + 8 + 1 + 0 + 1 + + + + Export product image with given width. Leave empty to use original size. + text + 9 + 1 + 0 + 1 + + + + false From 2d3e8e8dd8e880eee0bfa06a9eb3cdb8f4a8f100 Mon Sep 17 00:00:00 2001 From: Carlos Escribano Date: Mon, 28 Mar 2016 09:55:14 +0200 Subject: [PATCH 3/4] Fix support article link Signed-off-by: Carlos Escribano --- .../Doofinder/Feed/Block/Settings/Panel/Crondescription.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Panel/Crondescription.php b/app/code/community/Doofinder/Feed/Block/Settings/Panel/Crondescription.php index 01d9a437..0dad4c5f 100644 --- a/app/code/community/Doofinder/Feed/Block/Settings/Panel/Crondescription.php +++ b/app/code/community/Doofinder/Feed/Block/Settings/Panel/Crondescription.php @@ -11,5 +11,5 @@ class Doofinder_Feed_Block_Settings_Panel_CronDescription extends Doofinder_Feed_Block_Settings_Panel_Description { - protected $description = 'THIS FEATURE IS CURRENTLY IN BETA.
Feeds can be generated directly in your server to save computer resources. See this article for more information.'; + protected $description = 'THIS FEATURE IS CURRENTLY IN BETA.
Feeds can be generated directly in your server to save computer resources. See this article for more information.'; } From e879d8799b244effba0536e5bc47a9bab2b1bb8c Mon Sep 17 00:00:00 2001 From: Carlos Escribano Date: Mon, 28 Mar 2016 09:56:31 +0200 Subject: [PATCH 4/4] New Version 1.5.15 Signed-off-by: Carlos Escribano --- .../Doofinder/Feed/Block/Adminhtml/Log/View.php | 2 +- .../Doofinder/Feed/Block/Adminhtml/Map/Additional.php | 2 +- .../community/Doofinder/Feed/Block/Integration.php | 2 +- .../Doofinder/Feed/Block/Settings/Buttons/Generate.php | 2 +- .../Doofinder/Feed/Block/Settings/Buttons/ViewLog.php | 2 +- .../Feed/Block/Settings/Panel/Crondescription.php | 2 +- .../Doofinder/Feed/Block/Settings/Panel/Datetime.php | 2 +- .../Feed/Block/Settings/Panel/Description.php | 2 +- .../Doofinder/Feed/Block/Settings/Panel/File.php | 2 +- .../Feed/Block/Settings/Panel/Layerdescription.php | 2 +- .../Doofinder/Feed/Block/Settings/Panel/Message.php | 2 +- app/code/community/Doofinder/Feed/Helper/Data.php | 4 ++-- app/code/community/Doofinder/Feed/Helper/Log.php | 4 ++-- app/code/community/Doofinder/Feed/Helper/Tax.php | 4 ++-- .../Model/Adminhtml/System/Config/Backend/Cron.php | 2 +- app/code/community/Doofinder/Feed/Model/Config.php | 4 ++-- app/code/community/Doofinder/Feed/Model/Cron.php | 2 +- app/code/community/Doofinder/Feed/Model/Generator.php | 4 ++-- app/code/community/Doofinder/Feed/Model/Log.php | 2 +- .../Doofinder/Feed/Model/Map/Product/Abstract.php | 4 ++-- .../Doofinder/Feed/Model/Map/Product/Associated.php | 4 ++-- .../Doofinder/Feed/Model/Map/Product/Bundle.php | 4 ++-- .../Doofinder/Feed/Model/Map/Product/Configurable.php | 4 ++-- .../Doofinder/Feed/Model/Map/Product/Downloadable.php | 4 ++-- .../Doofinder/Feed/Model/Map/Product/Grouped.php | 4 ++-- .../Doofinder/Feed/Model/Map/Product/Simple.php | 4 ++-- .../Doofinder/Feed/Model/Map/Product/Virtual.php | 4 ++-- .../community/Doofinder/Feed/Model/Mysql4/Cron.php | 2 +- .../Doofinder/Feed/Model/Mysql4/Cron/Collection.php | 2 +- app/code/community/Doofinder/Feed/Model/Mysql4/Log.php | 2 +- .../Doofinder/Feed/Model/Mysql4/Log/Collection.php | 2 +- .../community/Doofinder/Feed/Model/Observers/Feed.php | 2 +- .../community/Doofinder/Feed/Model/Observers/Logs.php | 2 +- .../Doofinder/Feed/Model/Observers/Schedule.php | 2 +- .../Doofinder/Feed/Model/Resource/Mysql4/Setup.php | 2 +- .../Model/System/Config/Backend/Map/Additional.php | 2 +- .../Doofinder/Feed/Model/System/Config/Reset.php | 2 +- .../Model/System/Config/Source/Product/Attributes.php | 2 +- app/code/community/Doofinder/Feed/Model/Tools.php | 4 ++-- .../Feed/controllers/DoofinderFeedFeedController.php | 2 +- .../Feed/controllers/DoofinderFeedLogController.php | 2 +- .../Doofinder/Feed/controllers/FeedController.php | 4 ++-- .../Doofinder/Feed/controllers/IndexController.php | 4 ++-- app/code/community/Doofinder/Feed/etc/config.xml | 2 +- package.json | 2 +- var/connect/Doofinder_Feed.xml | 8 ++++---- var/connect/package.xml | 10 +++++----- 47 files changed, 70 insertions(+), 70 deletions(-) diff --git a/app/code/community/Doofinder/Feed/Block/Adminhtml/Log/View.php b/app/code/community/Doofinder/Feed/Block/Adminhtml/Log/View.php index f878dbb6..879a783e 100644 --- a/app/code/community/Doofinder/Feed/Block/Adminhtml/Log/View.php +++ b/app/code/community/Doofinder/Feed/Block/Adminhtml/Log/View.php @@ -6,7 +6,7 @@ /** * @category blocks * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Block_Adminhtml_Log_View extends Mage_Adminhtml_Block_Widget_Grid diff --git a/app/code/community/Doofinder/Feed/Block/Adminhtml/Map/Additional.php b/app/code/community/Doofinder/Feed/Block/Adminhtml/Map/Additional.php index ddc739ba..03ae1dca 100644 --- a/app/code/community/Doofinder/Feed/Block/Adminhtml/Map/Additional.php +++ b/app/code/community/Doofinder/Feed/Block/Adminhtml/Map/Additional.php @@ -6,7 +6,7 @@ /** * @category blocks * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Block_Adminhtml_Map_Additional extends Mage_Adminhtml_Block_System_Config_Form_Field diff --git a/app/code/community/Doofinder/Feed/Block/Integration.php b/app/code/community/Doofinder/Feed/Block/Integration.php index 91ec1826..3333fe99 100644 --- a/app/code/community/Doofinder/Feed/Block/Integration.php +++ b/app/code/community/Doofinder/Feed/Block/Integration.php @@ -6,7 +6,7 @@ /** * @category blocks * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Block_Integration extends Mage_Core_Block_Abstract diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Buttons/Generate.php b/app/code/community/Doofinder/Feed/Block/Settings/Buttons/Generate.php index 3a80aabd..5c95d266 100644 --- a/app/code/community/Doofinder/Feed/Block/Settings/Buttons/Generate.php +++ b/app/code/community/Doofinder/Feed/Block/Settings/Buttons/Generate.php @@ -6,7 +6,7 @@ /** * @category blocks * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Block_Settings_Buttons_Generate extends Mage_Adminhtml_Block_System_Config_Form_Field diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Buttons/ViewLog.php b/app/code/community/Doofinder/Feed/Block/Settings/Buttons/ViewLog.php index d73ffd79..4268da9f 100644 --- a/app/code/community/Doofinder/Feed/Block/Settings/Buttons/ViewLog.php +++ b/app/code/community/Doofinder/Feed/Block/Settings/Buttons/ViewLog.php @@ -6,7 +6,7 @@ /** * @category blocks * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Block_Settings_Buttons_ViewLog extends Mage_Adminhtml_Block_System_Config_Form_Field diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Panel/Crondescription.php b/app/code/community/Doofinder/Feed/Block/Settings/Panel/Crondescription.php index 0dad4c5f..23b89dbe 100644 --- a/app/code/community/Doofinder/Feed/Block/Settings/Panel/Crondescription.php +++ b/app/code/community/Doofinder/Feed/Block/Settings/Panel/Crondescription.php @@ -6,7 +6,7 @@ /** * @category blocks * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Block_Settings_Panel_CronDescription extends Doofinder_Feed_Block_Settings_Panel_Description diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Panel/Datetime.php b/app/code/community/Doofinder/Feed/Block/Settings/Panel/Datetime.php index 1929492a..8aeb3d8f 100644 --- a/app/code/community/Doofinder/Feed/Block/Settings/Panel/Datetime.php +++ b/app/code/community/Doofinder/Feed/Block/Settings/Panel/Datetime.php @@ -6,7 +6,7 @@ /** * @category blocks * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Block_Settings_Panel_Datetime extends Mage_Adminhtml_Block_System_Config_Form_Field diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Panel/Description.php b/app/code/community/Doofinder/Feed/Block/Settings/Panel/Description.php index 4b951bd4..3a30ac2e 100644 --- a/app/code/community/Doofinder/Feed/Block/Settings/Panel/Description.php +++ b/app/code/community/Doofinder/Feed/Block/Settings/Panel/Description.php @@ -6,7 +6,7 @@ /** * @category blocks * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Block_Settings_Panel_Description extends Mage_Adminhtml_Block_System_Config_Form_Field diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Panel/File.php b/app/code/community/Doofinder/Feed/Block/Settings/Panel/File.php index 0cc65eec..8669c7bd 100644 --- a/app/code/community/Doofinder/Feed/Block/Settings/Panel/File.php +++ b/app/code/community/Doofinder/Feed/Block/Settings/Panel/File.php @@ -6,7 +6,7 @@ /** * @category blocks * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Block_Settings_Panel_File extends Mage_Adminhtml_Block_System_Config_Form_Field diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Panel/Layerdescription.php b/app/code/community/Doofinder/Feed/Block/Settings/Panel/Layerdescription.php index d49e7100..1358e06c 100644 --- a/app/code/community/Doofinder/Feed/Block/Settings/Panel/Layerdescription.php +++ b/app/code/community/Doofinder/Feed/Block/Settings/Panel/Layerdescription.php @@ -6,7 +6,7 @@ /** * @category blocks * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Block_Settings_Panel_LayerDescription extends Doofinder_Feed_Block_Settings_Panel_Description diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Panel/Message.php b/app/code/community/Doofinder/Feed/Block/Settings/Panel/Message.php index 5ba9d348..e69da9a0 100644 --- a/app/code/community/Doofinder/Feed/Block/Settings/Panel/Message.php +++ b/app/code/community/Doofinder/Feed/Block/Settings/Panel/Message.php @@ -6,7 +6,7 @@ /** * @category blocks * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Block_Settings_Panel_Message extends Mage_Adminhtml_Block_System_Config_Form_Field diff --git a/app/code/community/Doofinder/Feed/Helper/Data.php b/app/code/community/Doofinder/Feed/Helper/Data.php index fa55dc49..429a487e 100644 --- a/app/code/community/Doofinder/Feed/Helper/Data.php +++ b/app/code/community/Doofinder/Feed/Helper/Data.php @@ -6,13 +6,13 @@ /** * @category Helpers * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ /** * Data helper for Doofinder Feed * - * @version 1.5.14 + * @version 1.5.15 * @package Doofinder_Feed */ class Doofinder_Feed_Helper_Data extends Mage_Core_Helper_Abstract diff --git a/app/code/community/Doofinder/Feed/Helper/Log.php b/app/code/community/Doofinder/Feed/Helper/Log.php index ce231075..48675d70 100644 --- a/app/code/community/Doofinder/Feed/Helper/Log.php +++ b/app/code/community/Doofinder/Feed/Helper/Log.php @@ -6,13 +6,13 @@ /** * @category Helpers * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ /** * Log helper for Doofinder Feed * - * @version 1.5.14 + * @version 1.5.15 * @package Doofinder_Feed */ class Doofinder_Feed_Helper_Log extends Mage_Core_Helper_Abstract diff --git a/app/code/community/Doofinder/Feed/Helper/Tax.php b/app/code/community/Doofinder/Feed/Helper/Tax.php index 3600edba..d38f1932 100644 --- a/app/code/community/Doofinder/Feed/Helper/Tax.php +++ b/app/code/community/Doofinder/Feed/Helper/Tax.php @@ -6,13 +6,13 @@ /** * @category Helpers * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ /** * Tax helper for Doofinder Feed * - * @version 1.5.14 + * @version 1.5.15 * @package Doofinder_Feed */ class Doofinder_Feed_Helper_Tax extends Mage_Tax_Helper_Data diff --git a/app/code/community/Doofinder/Feed/Model/Adminhtml/System/Config/Backend/Cron.php b/app/code/community/Doofinder/Feed/Model/Adminhtml/System/Config/Backend/Cron.php index e52bc65a..40432c6f 100644 --- a/app/code/community/Doofinder/Feed/Model/Adminhtml/System/Config/Backend/Cron.php +++ b/app/code/community/Doofinder/Feed/Model/Adminhtml/System/Config/Backend/Cron.php @@ -6,7 +6,7 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Model_Adminhtml_System_Config_Backend_Cron extends Mage_Core_Model_Config_Data { diff --git a/app/code/community/Doofinder/Feed/Model/Config.php b/app/code/community/Doofinder/Feed/Model/Config.php index c60e3e20..6c627a8d 100644 --- a/app/code/community/Doofinder/Feed/Model/Config.php +++ b/app/code/community/Doofinder/Feed/Model/Config.php @@ -6,13 +6,13 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ /** * Config model for Doofinder Feed * - * @version 1.5.14 + * @version 1.5.15 * @package Doofinder_Feed */ class Doofinder_Feed_Model_Config extends Mage_Core_Model_Config_Data diff --git a/app/code/community/Doofinder/Feed/Model/Cron.php b/app/code/community/Doofinder/Feed/Model/Cron.php index c8a75274..2c0269a0 100644 --- a/app/code/community/Doofinder/Feed/Model/Cron.php +++ b/app/code/community/Doofinder/Feed/Model/Cron.php @@ -6,7 +6,7 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Model_Cron extends Mage_Core_Model_Abstract { diff --git a/app/code/community/Doofinder/Feed/Model/Generator.php b/app/code/community/Doofinder/Feed/Model/Generator.php index 5d9532d6..a6cbf9ca 100644 --- a/app/code/community/Doofinder/Feed/Model/Generator.php +++ b/app/code/community/Doofinder/Feed/Model/Generator.php @@ -6,13 +6,13 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ /** * Generator model for Doofinder Feed * - * @version 1.5.14 + * @version 1.5.15 * @package Doofinder_Feed */ if (!defined('DS')) diff --git a/app/code/community/Doofinder/Feed/Model/Log.php b/app/code/community/Doofinder/Feed/Model/Log.php index 92c746f1..e6d0ce2c 100644 --- a/app/code/community/Doofinder/Feed/Model/Log.php +++ b/app/code/community/Doofinder/Feed/Model/Log.php @@ -6,7 +6,7 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Model_Log extends Mage_Core_Model_Abstract { diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Abstract.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Abstract.php index 10805148..8e0d5f72 100644 --- a/app/code/community/Doofinder/Feed/Model/Map/Product/Abstract.php +++ b/app/code/community/Doofinder/Feed/Model/Map/Product/Abstract.php @@ -6,13 +6,13 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ /** * Abstract Product Map Model for Doofinder Feed * - * @version 1.5.14 + * @version 1.5.15 * @package Doofinder_Feed */ class Doofinder_Feed_Model_Map_Product_Abstract extends Varien_Object diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Associated.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Associated.php index 174c4780..2aded220 100644 --- a/app/code/community/Doofinder/Feed/Model/Map/Product/Associated.php +++ b/app/code/community/Doofinder/Feed/Model/Map/Product/Associated.php @@ -6,13 +6,13 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ /** * Associated Product Map Model for Doofinder Feed * - * @version 1.5.14 + * @version 1.5.15 * @package Doofinder_Feed */ class Doofinder_Feed_Model_Map_Product_Associated diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Bundle.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Bundle.php index 69f71b33..f7297992 100644 --- a/app/code/community/Doofinder/Feed/Model/Map/Product/Bundle.php +++ b/app/code/community/Doofinder/Feed/Model/Map/Product/Bundle.php @@ -6,13 +6,13 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ /** * Bundle Product Map Model for Doofinder Feed * - * @version 1.5.14 + * @version 1.5.15 * @package Doofinder_Feed */ class Doofinder_Feed_Model_Map_Product_Bundle diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Configurable.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Configurable.php index 487183b8..081ee65f 100644 --- a/app/code/community/Doofinder/Feed/Model/Map/Product/Configurable.php +++ b/app/code/community/Doofinder/Feed/Model/Map/Product/Configurable.php @@ -6,13 +6,13 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ /** * Configurable Product Map Model for Doofinder Feed * - * @version 1.5.14 + * @version 1.5.15 * @package Doofinder_Feed */ class Doofinder_Feed_Model_Map_Product_Configurable diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Downloadable.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Downloadable.php index cfcde542..91c4f44c 100644 --- a/app/code/community/Doofinder/Feed/Model/Map/Product/Downloadable.php +++ b/app/code/community/Doofinder/Feed/Model/Map/Product/Downloadable.php @@ -6,13 +6,13 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ /** * Downloadable Product Map Model for Doofinder Feed * - * @version 1.5.14 + * @version 1.5.15 * @package Doofinder_Feed */ class Doofinder_Feed_Model_Map_Product_Downloadable diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Grouped.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Grouped.php index b80e7a77..e8b8683d 100644 --- a/app/code/community/Doofinder/Feed/Model/Map/Product/Grouped.php +++ b/app/code/community/Doofinder/Feed/Model/Map/Product/Grouped.php @@ -6,13 +6,13 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ /** * Grouped Product Map Model for Doofinder Feed * - * @version 1.5.14 + * @version 1.5.15 * @package Doofinder_Feed */ class Doofinder_Feed_Model_Map_Product_Grouped diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Simple.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Simple.php index 003b4cdc..6dd7d0bb 100644 --- a/app/code/community/Doofinder/Feed/Model/Map/Product/Simple.php +++ b/app/code/community/Doofinder/Feed/Model/Map/Product/Simple.php @@ -6,13 +6,13 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ /** * Simple Product Map Model for Doofinder Feed * - * @version 1.5.14 + * @version 1.5.15 * @package Doofinder_Feed */ class Doofinder_Feed_Model_Map_Product_Simple diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Virtual.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Virtual.php index 4d4695b4..abbd8d3a 100644 --- a/app/code/community/Doofinder/Feed/Model/Map/Product/Virtual.php +++ b/app/code/community/Doofinder/Feed/Model/Map/Product/Virtual.php @@ -6,13 +6,13 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ /** * Virtual Product Map Model for Doofinder Feed * - * @version 1.5.14 + * @version 1.5.15 * @package Doofinder_Feed */ class Doofinder_Feed_Model_Map_Product_Virtual diff --git a/app/code/community/Doofinder/Feed/Model/Mysql4/Cron.php b/app/code/community/Doofinder/Feed/Model/Mysql4/Cron.php index 10019e0a..f4450bfc 100644 --- a/app/code/community/Doofinder/Feed/Model/Mysql4/Cron.php +++ b/app/code/community/Doofinder/Feed/Model/Mysql4/Cron.php @@ -6,7 +6,7 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Model_Mysql4_Cron extends Mage_Core_Model_Mysql4_Abstract { diff --git a/app/code/community/Doofinder/Feed/Model/Mysql4/Cron/Collection.php b/app/code/community/Doofinder/Feed/Model/Mysql4/Cron/Collection.php index b300e59e..75c437ba 100644 --- a/app/code/community/Doofinder/Feed/Model/Mysql4/Cron/Collection.php +++ b/app/code/community/Doofinder/Feed/Model/Mysql4/Cron/Collection.php @@ -6,7 +6,7 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Model_Mysql4_Cron_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract { diff --git a/app/code/community/Doofinder/Feed/Model/Mysql4/Log.php b/app/code/community/Doofinder/Feed/Model/Mysql4/Log.php index 06ce8667..93e36dad 100644 --- a/app/code/community/Doofinder/Feed/Model/Mysql4/Log.php +++ b/app/code/community/Doofinder/Feed/Model/Mysql4/Log.php @@ -6,7 +6,7 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Model_Mysql4_Log extends Mage_Core_Model_Mysql4_Abstract { diff --git a/app/code/community/Doofinder/Feed/Model/Mysql4/Log/Collection.php b/app/code/community/Doofinder/Feed/Model/Mysql4/Log/Collection.php index b42baf87..48f1c648 100644 --- a/app/code/community/Doofinder/Feed/Model/Mysql4/Log/Collection.php +++ b/app/code/community/Doofinder/Feed/Model/Mysql4/Log/Collection.php @@ -6,7 +6,7 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Model_Mysql4_Log_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract diff --git a/app/code/community/Doofinder/Feed/Model/Observers/Feed.php b/app/code/community/Doofinder/Feed/Model/Observers/Feed.php index 3bd80da8..2cdd017c 100644 --- a/app/code/community/Doofinder/Feed/Model/Observers/Feed.php +++ b/app/code/community/Doofinder/Feed/Model/Observers/Feed.php @@ -6,7 +6,7 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Model_Observers_Feed diff --git a/app/code/community/Doofinder/Feed/Model/Observers/Logs.php b/app/code/community/Doofinder/Feed/Model/Observers/Logs.php index 6eec20ed..4cab11bf 100644 --- a/app/code/community/Doofinder/Feed/Model/Observers/Logs.php +++ b/app/code/community/Doofinder/Feed/Model/Observers/Logs.php @@ -6,7 +6,7 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Model_Observers_Logs diff --git a/app/code/community/Doofinder/Feed/Model/Observers/Schedule.php b/app/code/community/Doofinder/Feed/Model/Observers/Schedule.php index 45f66879..748f366c 100644 --- a/app/code/community/Doofinder/Feed/Model/Observers/Schedule.php +++ b/app/code/community/Doofinder/Feed/Model/Observers/Schedule.php @@ -6,7 +6,7 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Model_Observers_Schedule diff --git a/app/code/community/Doofinder/Feed/Model/Resource/Mysql4/Setup.php b/app/code/community/Doofinder/Feed/Model/Resource/Mysql4/Setup.php index 5e934d4d..977a80d7 100644 --- a/app/code/community/Doofinder/Feed/Model/Resource/Mysql4/Setup.php +++ b/app/code/community/Doofinder/Feed/Model/Resource/Mysql4/Setup.php @@ -6,7 +6,7 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Model_Resource_Mysql4_Setup extends Mage_Core_Model_Resource_Setup { diff --git a/app/code/community/Doofinder/Feed/Model/System/Config/Backend/Map/Additional.php b/app/code/community/Doofinder/Feed/Model/System/Config/Backend/Map/Additional.php index 80d3acb6..1bc2a698 100644 --- a/app/code/community/Doofinder/Feed/Model/System/Config/Backend/Map/Additional.php +++ b/app/code/community/Doofinder/Feed/Model/System/Config/Backend/Map/Additional.php @@ -6,7 +6,7 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Model_System_Config_Backend_Map_Additional extends Mage_Adminhtml_Model_System_Config_Backend_Serialized diff --git a/app/code/community/Doofinder/Feed/Model/System/Config/Reset.php b/app/code/community/Doofinder/Feed/Model/System/Config/Reset.php index a2836a37..d736d93a 100644 --- a/app/code/community/Doofinder/Feed/Model/System/Config/Reset.php +++ b/app/code/community/Doofinder/Feed/Model/System/Config/Reset.php @@ -6,7 +6,7 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Model_System_Config_Reset extends Mage_Core_Model_Config_Data diff --git a/app/code/community/Doofinder/Feed/Model/System/Config/Source/Product/Attributes.php b/app/code/community/Doofinder/Feed/Model/System/Config/Source/Product/Attributes.php index 0bc88cd7..46e3e876 100644 --- a/app/code/community/Doofinder/Feed/Model/System/Config/Source/Product/Attributes.php +++ b/app/code/community/Doofinder/Feed/Model/System/Config/Source/Product/Attributes.php @@ -6,7 +6,7 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_Model_System_Config_Source_Product_Attributes diff --git a/app/code/community/Doofinder/Feed/Model/Tools.php b/app/code/community/Doofinder/Feed/Model/Tools.php index c28f443d..21eb68e9 100644 --- a/app/code/community/Doofinder/Feed/Model/Tools.php +++ b/app/code/community/Doofinder/Feed/Model/Tools.php @@ -6,13 +6,13 @@ /** * @category Models * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ /** * Tools model for Doofinder Feed * - * @version 1.5.14 + * @version 1.5.15 * @package Doofinder_Feed */ class Doofinder_Feed_Model_Tools extends Varien_Object diff --git a/app/code/community/Doofinder/Feed/controllers/DoofinderFeedFeedController.php b/app/code/community/Doofinder/Feed/controllers/DoofinderFeedFeedController.php index ebc719e3..c55addc6 100644 --- a/app/code/community/Doofinder/Feed/controllers/DoofinderFeedFeedController.php +++ b/app/code/community/Doofinder/Feed/controllers/DoofinderFeedFeedController.php @@ -6,7 +6,7 @@ /** * @category controllers * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_DoofinderFeedFeedController extends Mage_Adminhtml_Controller_Action diff --git a/app/code/community/Doofinder/Feed/controllers/DoofinderFeedLogController.php b/app/code/community/Doofinder/Feed/controllers/DoofinderFeedLogController.php index f93eb977..518410c0 100644 --- a/app/code/community/Doofinder/Feed/controllers/DoofinderFeedLogController.php +++ b/app/code/community/Doofinder/Feed/controllers/DoofinderFeedLogController.php @@ -6,7 +6,7 @@ /** * @category controllers * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ class Doofinder_Feed_DoofinderFeedLogController extends Mage_Adminhtml_Controller_Action diff --git a/app/code/community/Doofinder/Feed/controllers/FeedController.php b/app/code/community/Doofinder/Feed/controllers/FeedController.php index e341cdd1..cc4ca298 100644 --- a/app/code/community/Doofinder/Feed/controllers/FeedController.php +++ b/app/code/community/Doofinder/Feed/controllers/FeedController.php @@ -6,13 +6,13 @@ /** * @category controllers * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ /** * Feed controller for Doofinder Feed * - * @version 1.5.14 + * @version 1.5.15 * @package Doofinder_Feed */ class Doofinder_Feed_FeedController extends Mage_Core_Controller_Front_Action diff --git a/app/code/community/Doofinder/Feed/controllers/IndexController.php b/app/code/community/Doofinder/Feed/controllers/IndexController.php index 75f25660..3a8837e4 100644 --- a/app/code/community/Doofinder/Feed/controllers/IndexController.php +++ b/app/code/community/Doofinder/Feed/controllers/IndexController.php @@ -6,13 +6,13 @@ /** * @category controllers * @package Doofinder_Feed - * @version 1.5.14 + * @version 1.5.15 */ /** * Index controller for Doofinder Feed * - * @version 1.5.14 + * @version 1.5.15 * @package Doofinder_Feed */ class Doofinder_Feed_IndexController extends Mage_Core_Controller_Front_Action diff --git a/app/code/community/Doofinder/Feed/etc/config.xml b/app/code/community/Doofinder/Feed/etc/config.xml index 8418a39e..295327b1 100644 --- a/app/code/community/Doofinder/Feed/etc/config.xml +++ b/app/code/community/Doofinder/Feed/etc/config.xml @@ -3,7 +3,7 @@ - 1.5.14 + 1.5.15 diff --git a/package.json b/package.json index bcc4577f..c28c50a5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "doofinder-for-magento", - "version": "1.5.14", + "version": "1.5.15", "devDependencies": { "grunt": "^0.4.5", "grunt-contrib-clean": "^0.5.0", diff --git a/var/connect/Doofinder_Feed.xml b/var/connect/Doofinder_Feed.xml index 276cbf67..9f1975be 100644 --- a/var/connect/Doofinder_Feed.xml +++ b/var/connect/Doofinder_Feed.xml @@ -1,5 +1,5 @@ <_> - neGjMK7AOatRc7dC + tK8hDg0ZgWoHGYxZ Doofinder_Feed community @@ -49,9 +49,9 @@ You can get more info and create your account visiting the Doofinder site: http://www.doofinder.com Open Software License (OSL 3.0) http://opensource.org/licenses/osl-3.0.php - 1.5.14 + 1.5.15 stable - Limit products obtained from Doofinder for internal search. + Choose image and (optionally) size for product images. Carlos Escribano Rey @@ -80,7 +80,7 @@ http://www.doofinder.com - + diff --git a/var/connect/package.xml b/var/connect/package.xml index b49ba57a..ffdc4b1a 100644 --- a/var/connect/package.xml +++ b/var/connect/package.xml @@ -1,7 +1,7 @@ Doofinder_Feed - 1.5.14 + 1.5.15 stable Open Software License (OSL 3.0) community @@ -48,11 +48,11 @@ Doofinder is fast and innovative. With no doubt, it is the best search engine fo You can get more info and create your account visiting the Doofinder site: http://www.doofinder.com - Limit products obtained from Doofinder for internal search. + Choose image and (optionally) size for product images. Carlos Escribano Reydoofindercarlos@doofinder.com - 2016-03-14 - - + 2016-03-28 + + 5.2.06.0.0