From 2084089d1aeab834ec128b76e50042ecfdc5c62f Mon Sep 17 00:00:00 2001 From: rGaillard Date: Tue, 2 Oct 2012 13:43:31 +0000 Subject: [PATCH] // Fix #PSCFV-4615 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17692 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Cart.php | 2 +- classes/Product.php | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/classes/Cart.php b/classes/Cart.php index 27ac63854..663b43152 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -588,7 +588,7 @@ class CartCore extends ObjectModel ((int)$this->id_customer ? (int)$this->id_customer : null), (int)$this->id, ((int)$address_id ? (int)$address_id : null), - null, + $null, true, true, $cart_shop_context diff --git a/classes/Product.php b/classes/Product.php index 05c802f4c..ba426d5f8 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -487,10 +487,8 @@ class ProductCore extends ObjectModel die(Tools::displayError()); self::$_taxCalculationMethod = Group::getPriceDisplayMethod((int)$customer->id_default_group); } - else if (Validate::isLoadedObject(Context::getContext()->customer)) - self::$_taxCalculationMethod = Group::getPriceDisplayMethod(Context::getContext()->customer->id_default_group); else - self::$_taxCalculationMethod = Group::getDefaultPriceDisplayMethod(); + self::$_taxCalculationMethod = Group::getPriceDisplayMethod(Group::getCurrent()->id); } public static function getTaxCalculationMethod($id_customer = null)