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

Merge pull request #1124 from PhpMadman/1.6-HistoryColorFix

Browse Source 
[*] FO : Fixed issue with custom statues does not have any color, ...
This commit is contained in:
Jérôme Nadaud
2013-12-11 03:10:38 -08:00
parent 850350c2a6 b40c642737
commit 0af76e01fb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/Order.php
+1 -1
View File
@@ -830,7 +830,7 @@ class OrderCore extends ObjectModel
foreach ($res as $key => $val) foreach ($res as $key => $val)
{ {
$res2 = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' $res2 = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT os.`id_order_state`, osl.`name` AS order_state, os.`invoice` SELECT os.`id_order_state`, osl.`name` AS order_state, os.`invoice`, os.`color` as order_state_color
FROM `'._DB_PREFIX_.'order_history` oh FROM `'._DB_PREFIX_.'order_history` oh
LEFT JOIN `'._DB_PREFIX_.'order_state` os ON (os.`id_order_state` = oh.`id_order_state`) LEFT JOIN `'._DB_PREFIX_.'order_state` os ON (os.`id_order_state` = oh.`id_order_state`)
INNER JOIN `'._DB_PREFIX_.'order_state_lang` osl ON (os.`id_order_state` = osl.`id_order_state` AND osl.`id_lang` = '.(int)$context->language->id.') INNER JOIN `'._DB_PREFIX_.'order_state_lang` osl ON (os.`id_order_state` = osl.`id_order_state` AND osl.`id_lang` = '.(int)$context->language->id.')
themes/default-bootstrap/history.tpl
+1 -1
View File
@@ -87,7 +87,7 @@
<td class="history_method">{$order.payment|escape:'html':'UTF-8'}</td> <td class="history_method">{$order.payment|escape:'html':'UTF-8'}</td>
<td data-value="{$order.id_order_state}" class="history_state"> <td data-value="{$order.id_order_state}" class="history_state">
{if isset($order.order_state)} {if isset($order.order_state)}
<span class="label{if $order.id_order_state == 1 || $order.id_order_state == 10 || $order.id_order_state == 11} label-info{elseif $order.id_order_state == 5 || $order.id_order_state == 2 || $order.id_order_state == 12} label-success{elseif $order.id_order_state == 6 || $order.id_order_state == 7 || $order.id_order_state == 8} label-danger{elseif $order.id_order_state == 3 || $order.id_order_state == 9 || $order.id_order_state == 4} label-warning{/if}"> <span class="label{if $order.id_order_state == 1 || $order.id_order_state == 10 || $order.id_order_state == 11} label-info{elseif $order.id_order_state == 5 || $order.id_order_state == 2 || $order.id_order_state == 12} label-success{elseif $order.id_order_state == 6 || $order.id_order_state == 7 || $order.id_order_state == 8} label-danger{elseif $order.id_order_state == 3 || $order.id_order_state == 9 || $order.id_order_state == 4} label-warning{/if}" {if $order.id_order_state > 12}style="background-color:{$order.order_state_color};"{/if}>
{$order.order_state|escape:'html':'UTF-8'} {$order.order_state|escape:'html':'UTF-8'}
</span> </span>
{/if} {/if}