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

[-] FO : sometimes the cart rules total was doubled - fixed! #PSTEST-1202

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14871 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-04-25 12:58:35 +00:00
parent 2659bd8929
commit c1d7658749
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Cart.php
+20 -5
View File
@@ -314,8 +314,8 @@ class CartCore extends ObjectModel
// If the cart has not been saved, then there can't be any cart rule applied
if (!CartRule::isFeatureActive() || !$this->id)
return array();
$cache_key = 'Cart::getCartRules'.$this->id;
$cache_key = 'Cart::getCartRules'.$this->id.'-'.$filter;
if (!Cache::isStored($cache_key))
{
$result = Db::getInstance()->executeS('
@@ -326,7 +326,10 @@ class CartCore extends ObjectModel
cd.`id_cart_rule` = crl.`id_cart_rule`
AND crl.id_lang = '.(int)$this->id_lang.'
)
WHERE `id_cart` = '.(int)$this->id
WHERE `id_cart` = '.(int)$this->id.'
'.($filter == CartRule::FILTER_ACTION_SHIPPING ? 'AND free_shipping = 1' : '').'
'.($filter == CartRule::FILTER_ACTION_GIFT ? 'AND gift_product != 0' : '').'
'.($filter == CartRule::FILTER_ACTION_REDUCTION ? 'AND (reduction_percent != 0 OR reduction_amount != 0)' : '')
);
Cache::store($cache_key, $result);
}
@@ -1413,8 +1416,20 @@ class CartCore extends ObjectModel
if ($with_shipping)
$cart_rules = $this->getCartRules(CartRule::FILTER_ACTION_ALL);
else
$cart_rules = array_merge($this->getCartRules(CartRule::FILTER_ACTION_REDUCTION), $this->getCartRules(CartRule::FILTER_ACTION_GIFT));
{
$cart_rules = $this->getCartRules(CartRule::FILTER_ACTION_REDUCTION);
// Cart Rules array are merged manually in order to avoid doubles
foreach ($this->getCartRules(CartRule::FILTER_ACTION_GIFT) as $tmp_cart_rule)
{
$flag = false;
foreach ($cart_rules as $cart_rule)
if ($tmp_cart_rule['id_cart_rule'] == $cart_rule['id_cart_rule'])
$flag = true;
if (!$flag)
$cart_rules[] = $tmp_cart_rule;
}
}
foreach ($cart_rules as $cart_rule)
if ($with_shipping)
$order_total_discount += Tools::ps_round($cart_rule['obj']->getContextualValue($with_taxes, $virtual_context, CartRule::FILTER_ACTION_ALL), 2);