Skip to content

Commit 0ec38f3

Browse files
carlosescricarlosescri
committed
Merge branch 'release/v1.5.20'
2 parents 8f73027 + 5db75d1 commit 0ec38f3

Some content is hidden

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

54 files changed

+727
-89
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.5.19
9+
* @version 1.5.20
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.5.19
9+
* @version 1.5.20
1010
*/
1111

1212
class Doofinder_Feed_Block_Adminhtml_Map_Additional extends Mage_Adminhtml_Block_System_Config_Form_Field

‎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.5.19
9+
* @version 1.5.20
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.5.19
9+
* @version 1.5.20
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.5.19
9+
* @version 1.5.20
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/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.5.19
9+
* @version 1.5.20
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.5.19
9+
* @version 1.5.20
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: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,15 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.5.19
9+
* @version 1.5.20
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_Description extends Mage_Adminhtml_Block_System_Config_Form_Field
1313
{
14+
const INFO = 'info';
15+
const WARNING = 'warning';
16+
17+
protected $level = self::INFO;
1418
protected $description = 'You can set the rest of the options for each store separately by modifying the Current Configuration Scope.';
1519

1620
protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
@@ -26,7 +30,7 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
2630
$name = $element->getName();
2731
$element->setScopeLabel('');
2832

29-
return '<p class="doofinder-info">' . $text . '</p>';
33+
return '<p class="doofinder-' . $this->level . '">' . $text . '</p>';
3034
}
3135

3236
public function render(Varien_Data_Form_Element_Abstract $element)

‎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.5.19
9+
* @version 1.5.20
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/Hashdescription.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?php
22
class Doofinder_Feed_Block_Settings_Panel_HashDescription extends Doofinder_Feed_Block_Settings_Panel_Description
33
{
4-
protected $description = 'The Hash ID value must be configured separately for each store view by modifying the Current Configuration Scope.';
4+
protected $level = self::WARNING;
5+
protected $description = '<b>IMPORTANT:</b> You must configure a "hashid" for each store view. Use the "Current Configuration Scope" selector at the top left side of the page to choose a store view.';
56
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.5.19
9+
* @version 1.5.20
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_LayerDescription extends Doofinder_Feed_Block_Settings_Panel_Description
1313
{
14-
protected $description = 'The layer script must be configured separately for each store view by modifying the Current Configuration Scope.';
14+
protected $level = self::WARNING;
15+
protected $description = '<b>IMPORTANT:</b> You must configure a different Layer script for each store view. Use the "Current Configuration Scope" selector at the top left side of the page to choose a store view.';
1516
}

‎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.5.19
9+
* @version 1.5.20
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_Message extends Mage_Adminhtml_Block_System_Config_Form_Field

‎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.5.19
9+
* @version 1.5.20
1010
*/
1111

1212
/**
1313
* Data helper for Doofinder Feed
1414
*
15-
* @version 1.5.19
15+
* @version 1.5.20
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.5.19
9+
* @version 1.5.20
1010
*/
1111

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

‎app/code/community/Doofinder/Feed/Helper/Tax.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.5.19
9+
* @version 1.5.20
1010
*/
1111

1212
/**
1313
* Tax helper for Doofinder Feed
1414
*
15-
* @version 1.5.19
15+
* @version 1.5.20
1616
* @package Doofinder_Feed
1717
*/
1818
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.5.19
9+
* @version 1.5.20
1010
*/
1111

1212
class Doofinder_Feed_Model_Adminhtml_System_Config_Backend_Cron extends Mage_Core_Model_Config_Data {

‎app/code/community/Doofinder/Feed/Model/Adminhtml/System/Config/Validation/HashId.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
class Doofinder_Feed_Model_Adminhtml_System_Config_Validation_HashId extends Mage_Core_Model_Config_Data {
3+
public function save() {
4+
// Hash id to save
5+
$hashId = $this->getValue();
6+
$stores = Mage::app()->getStores();
7+
foreach ($stores as $store) {
8+
$code = $store->getCode();
9+
$scopeHashId = Mage::getStoreConfig('doofinder_search/internal_settings/hash_id', $code);
10+
if ($hashId !== '' && $hashId === $scopeHashId) {
11+
Mage::throwException("HashID ".$hashId." is already used in ".$code." store. It must have a unique value.");
12+
exit;
13+
}
14+
}
15+
return parent::save();
16+
}
17+
}

‎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.5.19
9+
* @version 1.5.20
1010
*/
1111

1212
/**
1313
* Config model for Doofinder Feed
1414
*
15-
* @version 1.5.19
15+
* @version 1.5.20
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.5.19
9+
* @version 1.5.20
1010
*/
1111

1212
class Doofinder_Feed_Model_Cron extends Mage_Core_Model_Abstract {

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

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

1212
/**
1313
* Generator model for Doofinder Feed
1414
*
15-
* @version 1.5.19
15+
* @version 1.5.20
1616
* @package Doofinder_Feed
1717
*/
1818
if (!defined('DS'))
@@ -88,8 +88,8 @@ public function run()
8888
$this->getData('_limit_')
8989
);
9090

91-
// Only close feed if there was at least one processed product
92-
if ($this->getLastProcessedProductId() != $this->getData('_offset_')) {
91+
// Only close feed if close empty flag is set to true or there was at least one processed product
92+
if ($this->getData('close_empty') || $this->getLastProcessedProductId() != $this->getData('_offset_')) {
9393
$this->_closeFeed();
9494
}
9595

@@ -174,6 +174,7 @@ public function addProductToFeed($args)
174174
Mage::throwException("There is no map definition for product with type {$row['type_id']}");
175175
}
176176

177+
177178
$product = Mage::getModel('catalog/product');
178179
$product->setData($row)
179180
->setStoreId($this->getStoreId())
@@ -223,6 +224,7 @@ protected function _batchProcessProducts($offset, $limit)
223224
protected function _addProductToXml(
224225
Doofinder_Feed_Model_Map_Product_Abstract $productMap)
225226
{
227+
226228
$iDumped = 0;
227229
$displayPrice = $this->getDisplayPrice();
228230

@@ -622,12 +624,16 @@ protected function _getProductCollection($offset = 0, $limit = 0)
622624
{
623625
$collection = $this->getProductCollection($offset, $limit);
624626

627+
if (count($this->getProducts()))
628+
$collection->addAttributeToFilter('entity_id', array('in' => $this->getProducts()));
629+
625630
if ($limit && $limit > 0)
626631
$collection->getSelect()->limit($limit, 0);
627632

628633
if ($offset)
629634
$collection->addAttributeToFilter('entity_id', array('gt' => $offset));
630635

636+
631637
return $collection;
632638
}
633639

@@ -738,7 +744,6 @@ protected function _getFieldsMap()
738744
'field' => $key,
739745
);
740746
}
741-
742747
return $this->_fieldMap;
743748
}
744749

‎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.5.19
9+
* @version 1.5.20
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.5.19
9+
* @version 1.5.20
1010
*/
1111

1212
/**
1313
* Abstract Product Map Model for Doofinder Feed
1414
*
15-
* @version 1.5.19
15+
* @version 1.5.20
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.5.19
9+
* @version 1.5.20
1010
*/
1111

1212
/**
1313
* Associated Product Map Model for Doofinder Feed
1414
*
15-
* @version 1.5.19
15+
* @version 1.5.20
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.5.19
9+
* @version 1.5.20
1010
*/
1111

1212
/**
1313
* Bundle Product Map Model for Doofinder Feed
1414
*
15-
* @version 1.5.19
15+
* @version 1.5.20
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.5.19
9+
* @version 1.5.20
1010
*/
1111

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

‎app/code/community/Doofinder/Feed/Model/Map/Product/Downloadable.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.5.19
9+
* @version 1.5.20
1010
*/
1111

1212
/**
1313
* Downloadable Product Map Model for Doofinder Feed
1414
*
15-
* @version 1.5.19
15+
* @version 1.5.20
1616
* @package Doofinder_Feed
1717
*/
1818
class Doofinder_Feed_Model_Map_Product_Downloadable

0 commit comments

Comments
 (0)