Merge branch 'ticket-fidelite' into develop

This commit is contained in:
Marion Muszynski 2016-04-22 16:31:11 +02:00
commit bd74ed03d7
2 changed files with 2 additions and 2 deletions

View File

@ -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}

View File

@ -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}