From d6937e9d94aa78ad20bdf6b02245ac621a678317 Mon Sep 17 00:00:00 2001 From: rGaillard Date: Wed, 11 Jul 2012 15:30:18 +0000 Subject: [PATCH] // Fix bad variable name on PaymentModule.php git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16350 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/PaymentModule.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index f5714eda6..f1b13769b 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -204,13 +204,13 @@ abstract class PaymentModuleCore extends Module if (Configuration::get('PS_TAX_ADDRESS_TYPE') == 'id_address_delivery') { $address = new Address($id_address); - $this->context->country = new Country($address->id_country, $this->context->id_lang); + $this->context->country = new Country($address->id_country, $this->context->cart->id_lang); } $carrier = null; if (!$this->context->cart->isVirtualCart() && isset($package['id_carrier'])) { - $carrier = new Carrier($package['id_carrier'], $this->context->language->id); + $carrier = new Carrier($package['id_carrier'], $this->context->cart->id_lang); $order->id_carrier = (int)$carrier->id; $id_carrier = (int)$carrier->id; } @@ -224,7 +224,7 @@ abstract class PaymentModuleCore extends Module $order->id_address_invoice = (int)$this->context->cart->id_address_invoice; $order->id_address_delivery = (int)$id_address; $order->id_currency = $this->context->currency->id; - $order->id_lang = (int)$this->context->language->id; + $order->id_lang = (int)$this->context->cart->id_lang; $order->id_cart = (int)$this->context->cart->id; $order->reference = $reference; $order->id_shop = (int)$this->context->shop->id;