From 23862593f1a61cc2945582db28c4b55567ca4242 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Tue, 27 Nov 2012 16:33:32 +0100 Subject: [PATCH] [-] FO : fixed bug #PSCFV-5865 - Payment modules are not visible in the hookPayment for a foreigner country --- classes/controller/FrontController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php index b35710e15..abe7d578f 100755 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -165,7 +165,7 @@ class FrontControllerCore extends Controller /* Theme is missing */ if (!is_dir(_PS_THEME_DIR_)) die(sprintf(Tools::displayError('Current theme unavailable "%s". Please check your theme directory name and permissions.'), basename(rtrim(_PS_THEME_DIR_, '/\\')))); - + if (Configuration::get('PS_GEOLOCATION_ENABLED')) if (($newDefault = $this->geolocationManagement($this->context->country)) && Validate::isLoadedObject($newDefault)) $this->context->country = $newDefault; @@ -298,6 +298,7 @@ class FrontControllerCore extends Controller { $infos = Address::getCountryAndState((int)($cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')})); $country = new Country((int)$infos['id_country']); + $this->context->country = $country; if (Validate::isLoadedObject($country)) $display_tax_label = $country->display_tax_label; }