Merge branch 'ticket-12830-OrderConf' into develop

This commit is contained in:
Marion Muszynski 2017-03-23 15:30:50 +01:00
commit cbcbe2a3c9
2 changed files with 8 additions and 9 deletions

View File

@ -1,5 +1,5 @@
{if $discount_value > 0}
<p id="loyalty_cart">
{l s='En validant ce panier vous recevrez un crédit fidélité de '} <b>{convertPrice price=$voucher}</b> {l s='à utiliser lors de vos prochaines commandes'}
{l s='En validant ce panier vous recevrez un crédit fidélité de ' mod='loyalty'} <b>{convertPrice price=$voucher}</b> {l s='à utiliser lors de vos prochaines commandes' mod='loyalty'}
</p>
{/if}

View File

@ -36,7 +36,7 @@
<div id="order_conf_detail">
<div class="order_conf_left">
<p><strong>{l s='Hello'} {$customer->firstname},</strong></p> <br />
<p>{l s='You just order on Bébé boutik and we thank you in'}</p> <br />
<p>{l s='You just order on Bébé boutik and we thank you in'}</p> <br />
<p>{l s='The tracking number will be emailed upon shipment of the package'}</p> <br />
<p>{l s='You can download your invoice in your account, on'} <a href="{$link->getPageLink('history.php', true)}">"{l s='Order History'}"</a></p>
</div>
@ -52,7 +52,7 @@
</p>
</div>
</form>
</div>
<div class="clear"></div>
@ -97,7 +97,7 @@
{if $order->total_discounts != 0}
<tr>
<td colspan="2" align="right">{l s='Total discounts'}</td>
<td colspan="2" align="right">{displayPrice price=$order->total_discounts}</td>
<td colspan="2" align="right">{displayPrice price=$order->total_discounts}</td>
</tr>
{/if}
<tr>
@ -130,7 +130,7 @@
<li>{$address_invoice->address1} <br />{$address_invoice->address2}</li>
<li>{if $address_invoice->postcode}{$address_invoice->postcode} {/if}{$address_invoice->city}</li>
<li>{$address_invoice->country}</li>
</ul>
</ul>
</div>
@ -141,13 +141,12 @@
</div>
<div class="link link_right">
<a href="{$link->getCMSLink(14)}#ancre_10">{l s='How make a return ?'}</a>
</div>
</div>
</div>
<div class="clear"></div>
<div class="detail_info_footer">
<p>{l s='Our customer service with your listening'}</p>
<p><a href="mailto:contact@bebeboutik.com">contact@bebeboutik.com</a></p>
<p>{l s='Une question ? Retrouvez notre aide en ligne'} <a href="{$base_dir_ssl}modules/ant_support/help.php">{l s='ici'}</a></p>
<p>{l s='Customer Service'} : {l s='05 67 80 15 60 9h - 12h et 14h - 18h, du lundi au vend.'}</p>
</div>