// Fixed #PSCFV-2605

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15803 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-06-04 08:23:28 +00:00
parent ae2da2fc11
commit 564903dfdf
+1 -11
View File
@@ -1169,17 +1169,7 @@ class CartCore extends ObjectModel
$return = $this->update(true);
// refresh cache of self::_products
$this->_products = $this->getProducts(true);
// If there isn't any product left (which does not belong to a cart rule), remove all the cart rules associated to this cart
// Compare the quantity of products in the cart and the quantity of product offered (you can't simply compare the product itself, because the same product can be paid and free (2 products bought, 1 free))
$quantity_in_cart = 0;
if ($this->_products)
foreach ($this->_products as $product)
$quantity_in_cart += $product['cart_quantity'];
$count_free_products = Db::getInstance()->getValue('SELECT count(*) FROM `'._DB_PREFIX_.'cart_cart_rule` ccr LEFT JOIN `'._DB_PREFIX_.'cart_rule` cr ON ccr.id_cart_rule = cr.id_cart_rule WHERE `id_cart` = '.(int)$this->id.' AND gift_product != 0');
if ($quantity_in_cart <= $count_free_products)
foreach ($this->getCartRules() as $cart_rule)
$this->removeCartRule($cart_rule['id_cart_rule']);
CartRule::autoRemoveFromCart();
return $return;
}