| {l s='Code'} | -{l s='Description'} | -{l s='Quantity'} | -{l s='Value'}* | -{l s='Minimum'} | -{l s='Cumulative'} | -{l s='Expiration date'} | -
|---|---|---|---|---|---|---|
| {$discountDetail.code} | -{$discountDetail.name} | -{$discountDetail.quantity_for_user} | -- {if $discountDetail.id_discount_type == 1} - {$discountDetail.value|escape:'html':'UTF-8'}% - {elseif $discountDetail.id_discount_type == 2} - {convertPrice price=$discountDetail.value} ({if $discountDetail.reduction_tax == 1}{l s='Tax included'}{else}{l s='Tax excluded'}{/if}) - {elseif $discountDetail.id_discount_type == 3} - {l s='Free shipping'} - {else} - - - {/if} - | -- {if $discountDetail.minimal == 0} - {l s='None'} - {else} - {convertPrice price=$discountDetail.minimal} - {/if} - | -- {if $discountDetail.cumulable == 1} - {l s='Yes'} - {else} - {l s='No'} - {/if} - | -{dateFormat date=$discountDetail.date_to} | -
| {l s='Code'} | +{l s='Description'} | +{l s='Quantity'} | +{l s='Value'}* | +{l s='Minimum'} | +{l s='Cumulative'} | +{l s='Expiration date'} | +
|---|---|---|---|---|---|---|
| {$discountDetail.code} | +{$discountDetail.name} | +{$discountDetail.quantity_for_user} | ++ {if $discountDetail.id_discount_type == 1} + {$discountDetail.value|escape:'html':'UTF-8'}% + {elseif $discountDetail.id_discount_type == 2} + {convertPrice price=$discountDetail.value} ({if $discountDetail.reduction_tax == 1}{l s='Tax included'}{else}{l s='Tax excluded'}{/if}) + {elseif $discountDetail.id_discount_type == 3} + {l s='Free shipping'} + {else} + - + {/if} + | ++ {if $discountDetail.minimal == 0} + {l s='None'} + {else} + {convertPrice price=$discountDetail.minimal} + {/if} + | ++ {if $discountDetail.cumulable == 1} + {l s='Yes'} + {else} + {l s='No'} + {/if} + | ++ {dateFormat date=$discountDetail.date_to} + | +
{l s='You do not have any vouchers.'}
{/if} diff --git a/themes/default-bootstrap/header.tpl b/themes/default-bootstrap/header.tpl index b64881274..2da5ae370 100644 --- a/themes/default-bootstrap/header.tpl +++ b/themes/default-bootstrap/header.tpl @@ -116,7 +116,6 @@ {l s='Sign in'} {/if} - {if count($languages) > 1}{l s='Here are the orders you\'ve placed since your account was created.'}
++ {l s='Here are the orders you\'ve placed since your account was created.'} +
-{if $slowValidation}{l s='If you have just placed an order, it may take a few minutes for it to be validated. Please refresh this page if your order is missing.'}
{/if} +{if $slowValidation} ++ {l s='If you have just placed an order, it may take a few minutes for it to be validated. Please refresh this page if your order is missing.'} +
+{/if}| {l s='Order reference'} | -{l s='Date'} | -{l s='Total price'} | -{l s='Payment'} | -{l s='Status'} | -{l s='Invoice'} | -- |
|---|---|---|---|---|---|---|
|
- {if isset($order.invoice) && $order.invoice && isset($order.virtual) && $order.virtual} |
- {dateFormat date=$order.date_add full=0} | -{displayPrice price=$order.total_paid currency=$order.id_currency no_utf8=false convert=false} | -{$order.payment|escape:'html':'UTF-8'} | -{if isset($order.order_state)}{$order.order_state|escape:'html':'UTF-8'}{/if} | -- {if (isset($order.invoice) && $order.invoice && isset($order.invoice_number) && $order.invoice_number) && isset($invoiceAllowed) && $invoiceAllowed == true} - {l s='PDF'} - {else}-{/if} - | -- {l s='Details'} - {if isset($opc) && $opc} - - {else} - - {/if} - {l s='Reorder'} - - | -
{l s='You have not placed any orders.'}
{/if}{l s='Please be sure to update your personal information if it has changed.'}
-*{l s='Required field'}
++ {l s='Please be sure to update your personal information if it has changed.'} +
++ *{l s='Required field'} +