From 2553bc015e051dfb3140629f9dc9a97838d2190c Mon Sep 17 00:00:00 2001 From: rGaillard Date: Mon, 21 May 2012 13:05:16 +0000 Subject: [PATCH] [-] BO: Fix PSCFV-2442 product price on backoffice order git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15493 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminOrdersController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 96c0d480c..86a66ade5 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -1299,6 +1299,7 @@ class AdminOrdersControllerCore extends AdminController public function ajaxProcessSearchProducts() { + Context::getContext()->customer = new Customer((int)Tools::getValue('id_customer')); $currency = new Currency(Tools::getValue('id_currency')); if ($products = Product::searchByName((int)$this->context->language->id, pSQL(Tools::getValue('product_search')))) { @@ -1332,7 +1333,7 @@ class AdminOrdersControllerCore extends AdminController $price_tax_excl = Product::getPriceStatic((int)$product['id_product'], false, $attribute['id_product_attribute']); $combinations[$attribute['id_product_attribute']]['price_tax_incl'] = Tools::ps_round(Tools::convertPrice($price_tax_incl, $currency), 2); $combinations[$attribute['id_product_attribute']]['price_tax_excl'] = Tools::ps_round(Tools::convertPrice($price_tax_excl, $currency), 2); - $combinations[$attribute['id_product_attribute']]['formatted_price'] = Tools::displayPrice(Tools::convertPrice($price_tax_incl, $currency), $currency); + $combinations[$attribute['id_product_attribute']]['formatted_price'] = Tools::displayPrice(Tools::convertPrice($price_tax_excl, $currency), $currency); } if (!isset($combinations[$attribute['id_product_attribute']]['qty_in_stock'])) $combinations[$attribute['id_product_attribute']]['qty_in_stock'] = StockAvailable::getQuantityAvailableByProduct((int)$product['id_product'], $attribute['id_product_attribute'], (int)$this->context->shop->id);