dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Added order state color in order::getHistory()

Browse Source
This commit is contained in:
Damien Metzger
2013-10-09 15:33:46 +02:00
parent c8347cbc59
commit 1870dd4dd2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/Order.php
+1 -1
View File
@@ -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`
controllers/front/OrderDetailController.php
+2 -2
View File
@@ -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),