From 0eccf985921a8a05d760da7c87b936211351eb65 Mon Sep 17 00:00:00 2001 From: rGaillard Date: Fri, 25 Nov 2011 13:43:40 +0000 Subject: [PATCH] // Fix change currency on editing order git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10664 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminOrdersController.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index d64724423..4c01e4123 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -634,12 +634,13 @@ class AdminOrdersControllerCore extends AdminController $payment->amount = Tools::convertPriceFull((float)$payment->amount, $old_currency, $currency); $payment->update(); } - - $order_carrier = Db::getInstance()->executeS(' + + $order_carrier = Db::getInstance()->getRow(' SELECT * FROM `'._DB_PREFIX_.'order_carrier` WHERE `id_order` = '.(int)$order->id); - // Update order carrier amount + + // Update order carrier amount Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'order_carrier` SET `shipping_cost_tax_excl` = '.(float)Tools::convertPriceFull($order_carrier['shipping_cost_tax_excl'], $old_currency, $currency).',