dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] CORE : Preserve carrier reference integrity in cart rules when updating a carrier

Browse Source
This commit is contained in:
gRoussac
2013-03-13 14:31:26 +01:00
parent df2e121a60
commit 7591efd6d6
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
+2 -2
View File
@@ -98,7 +98,7 @@
<p><strong>{l s='Unselected carriers'}</strong></p> <p><strong>{l s='Unselected carriers'}</strong></p>
<select id="carrier_select_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple> <select id="carrier_select_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
{foreach from=$carriers.unselected item='carrier'} {foreach from=$carriers.unselected item='carrier'}
<option value="{$carrier.id_carrier|intval}">&nbsp;{$carrier.name|escape}</option> <option value="{$carrier.id_reference|intval}">&nbsp;{$carrier.name|escape}</option>
{/foreach} {/foreach}
</select><br /><br /> </select><br /><br />
<a <a
@@ -112,7 +112,7 @@
<p><strong>{l s='Selected carriers'}</strong></p> <p><strong>{l s='Selected carriers'}</strong></p>
<select name="carrier_select[]" id="carrier_select_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple> <select name="carrier_select[]" id="carrier_select_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
{foreach from=$carriers.selected item='carrier'} {foreach from=$carriers.selected item='carrier'}
<option value="{$carrier.id_carrier|intval}">&nbsp;{$carrier.name|escape}</option> <option value="{$carrier.id_reference|intval}">&nbsp;{$carrier.name|escape}</option>
{/foreach} {/foreach}
</select><br /><br /> </select><br /><br />
<a <a
classes/CartRule.php
+10 -6
View File
@@ -445,8 +445,9 @@ class CartRuleCore extends ObjectModel
$id_cart_rule = (int)Db::getInstance()->getValue(' $id_cart_rule = (int)Db::getInstance()->getValue('
SELECT crc.id_cart_rule SELECT crc.id_cart_rule
FROM '._DB_PREFIX_.'cart_rule_carrier crc FROM '._DB_PREFIX_.'cart_rule_carrier crc
INNER JOIN '._DB_PREFIX_.'carrier c ON (c.id_reference = crc.id_carrier AND c.deleted = 0)
WHERE crc.id_cart_rule = '.(int)$this->id.' WHERE crc.id_cart_rule = '.(int)$this->id.'
AND crc.id_carrier = '.(int)$context->cart->id_carrier); AND c.id_carrier = '.(int)$context->cart->id_carrier);
if (!$id_cart_rule) if (!$id_cart_rule)
return (!$display_error) ? false : Tools::displayError('You cannot use this voucher with this carrier'); return (!$display_error) ? false : Tools::displayError('You cannot use this voucher with this carrier');
} }
@@ -762,10 +763,11 @@ class CartRuleCore extends ObjectModel
else else
{ {
$data = Db::getInstance()->executeS(' $data = Db::getInstance()->executeS('
SELECT crc.id_cart_rule, crc.id_carrier SELECT crc.id_cart_rule, c.id_carrier
FROM '._DB_PREFIX_.'cart_rule_carrier crc FROM '._DB_PREFIX_.'cart_rule_carrier crc
INNER JOIN '._DB_PREFIX_.'carrier c ON (c.id_reference = crc.id_carrier AND c.deleted = 0)
WHERE crc.id_cart_rule = '.(int)$this->id.' WHERE crc.id_cart_rule = '.(int)$this->id.'
AND crc.id_carrier = '.(int)$context->cart->id_carrier); AND c.id_carrier = '.(int)$context->cart->id_carrier);
if ($data) if ($data)
foreach ($data as $cart_rule) foreach ($data as $cart_rule)
@@ -1032,9 +1034,10 @@ class CartRuleCore extends ObjectModel
SELECT t.*'.($i18n ? ', tl.*' : '').', IF(crt.id_'.$type.' IS NULL, 0, 1) as selected SELECT t.*'.($i18n ? ', tl.*' : '').', IF(crt.id_'.$type.' IS NULL, 0, 1) as selected
FROM `'._DB_PREFIX_.$type.'` t FROM `'._DB_PREFIX_.$type.'` t
'.($i18n ? 'LEFT JOIN `'._DB_PREFIX_.$type.'_lang` tl ON (t.id_'.$type.' = tl.id_'.$type.' AND tl.id_lang = '.(int)Context::getContext()->language->id.')' : '').' '.($i18n ? 'LEFT JOIN `'._DB_PREFIX_.$type.'_lang` tl ON (t.id_'.$type.' = tl.id_'.$type.' AND tl.id_lang = '.(int)Context::getContext()->language->id.')' : '').'
LEFT JOIN (SELECT id_'.$type.' FROM `'._DB_PREFIX_.'cart_rule_'.$type.'` WHERE id_cart_rule = '.(int)$this->id.') crt ON t.id_'.$type.' = crt.id_'.$type.' LEFT JOIN (SELECT id_'.$type.' FROM `'._DB_PREFIX_.'cart_rule_'.$type.'` WHERE id_cart_rule = '.(int)$this->id.') crt ON t.id_'.($type == 'carrier' ? 'reference' : $type).' = crt.id_'.$type.'
WHERE 1 '.($active_only ? ' AND t.active = 1' : ''). WHERE 1 '.($active_only ? ' AND t.active = 1' : '').
$shop_list. $shop_list
.(in_array($type, array('carrier', 'shop')) ? ' AND t.deleted = 0' : '').
' ORDER BY name ASC', ' ORDER BY name ASC',
false); false);
while ($row = Db::getInstance()->nextRow($resource)) while ($row = Db::getInstance()->nextRow($resource))
@@ -1081,6 +1084,7 @@ class CartRuleCore extends ObjectModel
FROM '._DB_PREFIX_.'cart_rule cr FROM '._DB_PREFIX_.'cart_rule cr
LEFT JOIN '._DB_PREFIX_.'cart_rule_shop crs ON cr.id_cart_rule = crs.id_cart_rule LEFT JOIN '._DB_PREFIX_.'cart_rule_shop crs ON cr.id_cart_rule = crs.id_cart_rule
LEFT JOIN '._DB_PREFIX_.'cart_rule_carrier crca ON cr.id_cart_rule = crca.id_cart_rule LEFT JOIN '._DB_PREFIX_.'cart_rule_carrier crca ON cr.id_cart_rule = crca.id_cart_rule
'.($context->cart->id_carrier ? 'INNER JOIN '._DB_PREFIX_.'carrier c ON (c.id_reference = crca.id_carrier AND c.deleted = 0)' : '').'
LEFT JOIN '._DB_PREFIX_.'cart_rule_country crco ON cr.id_cart_rule = crco.id_cart_rule LEFT JOIN '._DB_PREFIX_.'cart_rule_country crco ON cr.id_cart_rule = crco.id_cart_rule
WHERE cr.active = 1 WHERE cr.active = 1
AND cr.code = "" AND cr.code = ""
@@ -1093,7 +1097,7 @@ class CartRuleCore extends ObjectModel
) )
AND ( AND (
cr.carrier_restriction = 0 cr.carrier_restriction = 0
'.($context->cart->id_carrier ? 'OR crca.id_carrier = '.(int)$context->cart->id_carrier : '').' '.($context->cart->id_carrier ? 'OR c.id_carrier = '.(int)$context->cart->id_carrier : '').'
) )
AND ( AND (
cr.shop_restriction = 0 cr.shop_restriction = 0
install-dev/upgrade/sql/1.5.4.0.sql
+2
View File
@@ -46,3 +46,5 @@ ALTER TABLE `PREFIX_address` CHANGE `phone` `phone` varchar(32) default NULL;
ALTER TABLE `PREFIX_address` CHANGE `phone_mobile` `phone_mobile` varchar(32) default NULL; ALTER TABLE `PREFIX_address` CHANGE `phone_mobile` `phone_mobile` varchar(32) default NULL;
/* PHP:update_genders_images(); */; /* PHP:update_genders_images(); */;
UPDATE `PREFIX_cart_rule_carrier` crc INNER JOIN `PREFIX_carrier` c ON crc.`id_carrier` = c.`id_carrier` SET crc.`id_carrier` = c.`id_reference`;