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

[-] FO : uncombinable cart rules are not combinable anymore

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12721 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-01-26 15:17:23 +00:00
parent 2a21769946
commit ff44291d38
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Cart.php
View File

@@ -693,7 +693,7 @@ class CartCore extends ObjectModel
public function addCartRule($id_cart_rule)
{
// You can't add a cart rule that does not exist
$cartRule = new CartRule($id_cart_rule, Context::getContext()->lang->id);
$cartRule = new CartRule($id_cart_rule, Context::getContext()->language->id);
if (!Validate::isLoadedObject($cartRule))
return false;

2
classes/CartRule.php
View File

@@ -294,7 +294,7 @@ class CartRuleCore extends ObjectModel
{
if ($otherCartRule['id_cart_rule'] == $this->id && !$alreadyInCart)
return Tools::displayError('This voucher is already in your cart');
if ($this->carrier_restriction && $otherCartRule['cart_rule_restriction'])
if ($this->cart_rule_restriction && $otherCartRule['cart_rule_restriction'])
{
$combinable = Db::getInstance()->getValue('
SELECT id_cart_rule_1

2
controllers/front/ParentOrderController.php
View File

@@ -116,7 +116,7 @@ class ParentOrderControllerCore extends FrontController
'discount_name' => Tools::safeOutput($code)
));
}
elseif ($id_cart_rule = (int)Tools::getValue('deleteDiscount') && Validate::isUnsignedId($id_cart_rule))
elseif (($id_cart_rule = (int)Tools::getValue('deleteDiscount')) && Validate::isUnsignedId($id_cart_rule))
{
$this->context->cart->removeCartRule($id_cart_rule);
Tools::redirect('index.php?controller=order-opc');

1
themes/default/css/global.css
View File

@@ -660,7 +660,6 @@ table#cart_summary td {
table#cart_summary td.cart_delete,
table#cart_summary td.price_discount_del {border-right:none}
table#cart_summary .last_item td {border-bottom:1px solid #999}
table#cart_summary td.cart_discount_price {border-bottom:1px solid #999}
table#cart_summary tr:nth-child(odd),