diff --git a/core/lib/Thelia/Core/Template/Loop/Cart.php b/core/lib/Thelia/Core/Template/Loop/Cart.php index fdabe26c8..88b5a53d4 100755 --- a/core/lib/Thelia/Core/Template/Loop/Cart.php +++ b/core/lib/Thelia/Core/Template/Loop/Cart.php @@ -79,7 +79,7 @@ class Cart extends BaseLoop implements ArraySearchLoopInterface public function parseResults(LoopResult $loopResult) { - $taxCountry = TaxEngine::getInstance($this->request->getSession())->getTaxCountry(); + $taxCountry = TaxEngine::getInstance($this->request->getSession())->getDeliveryCountry(); foreach($loopResult->getResultDataCollection() as $cartItem) { $product = $cartItem->getProduct(); diff --git a/core/lib/Thelia/Core/Template/Loop/Product.php b/core/lib/Thelia/Core/Template/Loop/Product.php index 0668df260..49bab69ec 100755 --- a/core/lib/Thelia/Core/Template/Loop/Product.php +++ b/core/lib/Thelia/Core/Template/Loop/Product.php @@ -465,7 +465,7 @@ class Product extends BaseI18nLoop implements PropelSearchLoopInterface, SearchL return $this->parseComplex($loopResult); } - $taxCountry = TaxEngine::getInstance($this->request->getSession())->getTaxCountry(); + $taxCountry = TaxEngine::getInstance($this->request->getSession())->getDeliveryCountry(); foreach ($loopResult->getResultDataCollection() as $product) { @@ -983,7 +983,7 @@ class Product extends BaseI18nLoop implements PropelSearchLoopInterface, SearchL { $loopResult = new LoopResult($results); - $taxCountry = TaxEngine::getInstance($this->request->getSession())->getTaxCountry(); + $taxCountry = TaxEngine::getInstance($this->request->getSession())->getDeliveryCountry(); foreach ($loopResult->getResultDataCollection() as $product) { diff --git a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php index 687bf7fdb..319bb7fee 100755 --- a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php +++ b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php @@ -146,7 +146,7 @@ class ProductSaleElements extends BaseLoop implements PropelSearchLoopInterface public function parseResults(LoopResult $loopResult) { - $taxCountry = TaxEngine::getInstance($this->request->getSession())->getTaxCountry(); + $taxCountry = TaxEngine::getInstance($this->request->getSession())->getDeliveryCountry(); foreach ($loopResult->getResultDataCollection() as $PSEValue) { $loopResultRow = new LoopResultRow($PSEValue); diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php index 0c38ed899..eab83e140 100755 --- a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php +++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php @@ -184,7 +184,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin if (array_key_exists('currentCountry', self::$dataAccessCache)) { $taxCountry = self::$dataAccessCache['currentCountry']; } else { - $taxCountry = TaxEngine::getInstance($this->request->getSession())->getTaxCountry(); + $taxCountry = TaxEngine::getInstance($this->request->getSession())->getDeliveryCountry(); self::$dataAccessCache['currentCountry'] = $taxCountry; } diff --git a/core/lib/Thelia/TaxEngine/TaxEngine.php b/core/lib/Thelia/TaxEngine/TaxEngine.php index 9e2f1909d..36406dc59 100755 --- a/core/lib/Thelia/TaxEngine/TaxEngine.php +++ b/core/lib/Thelia/TaxEngine/TaxEngine.php @@ -104,7 +104,7 @@ class TaxEngine * @param bool $force result is static cached ; even if a below parameter change between 2 calls, we need to keep coherent results. but you can force it. * @return null|TaxEngine */ - public function getTaxCountry($force = false) + public function getDeliveryCountry($force = false) { if(false === $force || null === self::$taxCountry) { /* is there a logged in customer ? */