From 2d0f54e0ee7478bb8b96fe45a9a01757232c35ad Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Thu, 14 Feb 2013 09:46:18 +0100 Subject: [PATCH] // Fixed warning and wrong cart rule total --- classes/Cart.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/classes/Cart.php b/classes/Cart.php index 921b185fd..1dda83cb7 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -2325,7 +2325,7 @@ class CartCore extends ObjectModel public function getDeliveryOption($default_country = null, $dontAutoSelectOptions = false, $use_cache = true) { static $cache = array(); - $cache_id = (int)$default_country.'-'.(int)$dontAutoSelectOptions; + $cache_id = (int)(is_object($default_country) ? $default_country->id : 0).'-'.(int)$dontAutoSelectOptions; if (isset($cache[$cache_id]) && $use_cache) return $cache[$cache_id]; @@ -2865,7 +2865,9 @@ class CartCore extends ObjectModel if ($cart_rule['free_shipping'] && (empty($cart_rule['code']) || preg_match('/^'.CartRule::BO_ORDER_CODE_PREFIX.'[0-9]+/', $cart_rule['code']))) { $cart_rule['value_real'] -= $total_shipping; - $cart_rule['value_tax_exc'] = $total_shipping_tax_exc; + $cart_rule['value_tax_exc'] -= $total_shipping_tax_exc; + $total_discounts -= $total_shipping; + $total_discounts_tax_exc -= $total_shipping_tax_exc; // Update total shipping $total_shipping = 0;