From 1870dd4dd2ab6ae91afa4b3b709bf37375ad61b6 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Wed, 9 Oct 2013 15:33:46 +0200 Subject: [PATCH] // Added order state color in order::getHistory() --- classes/order/Order.php | 2 +- controllers/front/OrderDetailController.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/order/Order.php b/classes/order/Order.php index 42e5b42b0..d740ee700 100644 --- a/classes/order/Order.php +++ b/classes/order/Order.php @@ -463,7 +463,7 @@ class OrderCore extends ObjectModel { $id_lang = $id_lang ? (int)($id_lang) : 'o.`id_lang`'; $result = Db::getInstance()->executeS(' - SELECT oh.*, e.`firstname` AS employee_firstname, e.`lastname` AS employee_lastname, osl.`name` AS ostate_name + SELECT os.*, oh.*, e.`firstname` as employee_firstname, e.`lastname` as employee_lastname, osl.`name` as ostate_name FROM `'._DB_PREFIX_.'orders` o LEFT JOIN `'._DB_PREFIX_.'order_history` oh ON o.`id_order` = oh.`id_order` LEFT JOIN `'._DB_PREFIX_.'order_state` os ON os.`id_order_state` = oh.`id_order_state` diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php index a5f9321c1..8b35fe936 100644 --- a/controllers/front/OrderDetailController.php +++ b/controllers/front/OrderDetailController.php @@ -168,9 +168,9 @@ class OrderDetailControllerCore extends FrontController $this->context->smarty->assign(array( 'shop_name' => strval(Configuration::get('PS_SHOP_NAME')), 'order' => $order, - 'return_allowed' => (int)($order->isReturnable()), + 'return_allowed' => (int)$order->isReturnable(), 'currency' => new Currency($order->id_currency), - 'order_state' => (int)($id_order_state), + 'order_state' => (int)$id_order_state, 'invoiceAllowed' => (int)(Configuration::get('PS_INVOICE')), 'invoice' => (OrderState::invoiceAvailable($id_order_state) && count($order->getInvoicesCollection())), 'order_history' => $order->getHistory($this->context->language->id, false, true),