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

// norm

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12911 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
fBrignoli
2012-02-01 15:56:39 +00:00
parent d89dbcecc3
commit 3f67f95a5c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/CartRule.php
+5 -5
View File
@@ -364,8 +364,8 @@ class CartRuleCore extends ObjectModel
OR (id_cart_rule_2 = '.(int)$this->id.' AND id_cart_rule_1 = '.(int)$otherCartRule['id_cart_rule'].')');
if (!$combinable)
{
$cartRule = new CartRule($otherCartRule['cart_rule_restriction'], $context->cart->id_lang);
return Tools::displayError('This voucher is not combinable with an other voucher already in your cart:').' '.$cartRule->name;
$cart_rule = new CartRule($otherCartRule['cart_rule_restriction'], $context->cart->id_lang);
return Tools::displayError('This voucher is not combinable with an other voucher already in your cart:').' '.$cart_rule->name;
}
}
}
@@ -537,11 +537,11 @@ class CartRuleCore extends ObjectModel
$minimum_amount = $this->minimum_amount;
if ($this->minimum_amount_currency != Configuration::get('PS_CURRENCY_DEFAULT'))
{
$minimumAmountCurrency = new Currency($this->minimum_amount_currency);
if ($this->minimum_amount == 0 || $minimumAmountCurrency->conversion_rate == 0)
$minimum_amount_currency = new Currency($this->minimum_amount_currency);
if ($this->minimum_amount == 0 || $minimum_amount_currency->conversion_rate == 0)
$minimum_amount = 0;
else
$minimum_amount = $this->minimum_amount / $minimumAmountCurrency->conversion_rate;
$minimum_amount = $this->minimum_amount / $minimum_amount_currency->conversion_rate;
}
$cartTotal = $context->cart->getOrderTotal($this->minimum_amount_tax, Cart::ONLY_PRODUCTS);
if ($this->minimum_amount_shipping)