From f87ee2f2f66dbb54a5fe803a0c66ece23e82bbc7 Mon Sep 17 00:00:00 2001 From: dMetzger Date: Mon, 21 May 2012 14:50:13 +0000 Subject: [PATCH] // variable misnamed --- classes/Cart.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/classes/Cart.php b/classes/Cart.php index 32a485c40..10aa1d90c 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -1458,7 +1458,7 @@ class CartCore extends ObjectModel if (is_null($products)) $in_order = true; else - foreach ($products as $products) + foreach ($products as $product) if ($cart_rule['obj']->gift_product == $product['id_product'] && $cart_rule['obj']->gift_product_attribute = $product['id_product_attribute']) $in_order = true; @@ -1469,8 +1469,12 @@ class CartCore extends ObjectModel // If the cart rule offers a reduction, the amount is prorated (with the products in the package) if ($cart_rule['obj']->reduction_percent > 0 || $cart_rule['obj']->reduction_amount > 0) { - $id_address_delivery = ((is_null($products) || !isset($products[0])) ? $this->id_address_delivery : $products[0]['id_address_delivery']); - $package = array('id_address' => $id_address_delivery, 'products' => $products); + $package = null; + if (!is_null($products)) + { + $id_address_delivery = (is_null($products) ? $this->id_address_delivery : $products[0]['id_address_delivery']); + $package = array('id_address' => $id_address_delivery, 'products' => $products); + } $order_total_discount += Tools::ps_round($cart_rule['obj']->getContextualValue($with_taxes, $virtual_context, CartRule::FILTER_ACTION_REDUCTION, $package), 2); } }