Merge branch 'ticket-fidelite' into develop
This commit is contained in:
commit
bd74ed03d7
@ -33,7 +33,7 @@
|
||||
<td class="history_link bold">{l s='#' mod='loyalty'}{$order.id|string_format:"%06d"}</td>
|
||||
<td class="history_date">{dateFormat date=$order.date full=1}</td>
|
||||
<td class="history_method">{Tools::displayPrice($order.total_without_shipping)}</td>
|
||||
<td class="history_method">{Tools::displayPrice($order.reduc_value)}</td>
|
||||
<td class="history_method">{Tools::displayPrice($order.discount_value)}</td>
|
||||
<td class="history_method">{$order.state|escape:'htmlall':'UTF-8'}</td>
|
||||
</tr>
|
||||
{/foreach}
|
||||
|
@ -56,7 +56,7 @@
|
||||
<tr class="alternate_item">
|
||||
<td class="history_link bold">{l s='#' mod='loyalty'}{$order.id|string_format:"%06d"}</td>
|
||||
<td class="history_date">{dateFormat date=$order.date}</td>
|
||||
<td class="history_method">{Tools::displayPrice($order.reduc_value)}</td>
|
||||
<td class="history_method">{Tools::displayPrice($order.discount_value)}</td>
|
||||
<td class="history_method">{$order.state|escape:'htmlall':'UTF-8'}</td>
|
||||
</tr>
|
||||
{/foreach}
|
||||
|
Loading…
Reference in New Issue
Block a user