New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Currency improvements #1780

Merged
merged 15 commits into from Dec 7, 2015

update template pdf

  • Loading branch information...
gillesbourgeat committed Nov 13, 2015
commit 2c80368290bdb7a508d3d167d4b4e81b365725f2
@@ -168,9 +168,6 @@
</page_footer>
{loop name="order.invoice" type="order" id=$order_id customer="*"}
{loop name="currency.order" type="currency" id=$CURRENCY}
{assign "orderCurrency" $SYMBOL}
{/loop}
<table class="table-info">
<col style="width: 100%; padding: 0mm;" />
@@ -171,9 +171,6 @@
{$taxes = []}
{loop name="order.invoice" type="order" id=$order_id customer="*"}
{loop name="currency.order" type="currency" id=$CURRENCY}
{assign "orderCurrency" $SYMBOL}
{/loop}
<table class="table-info">
<col style="width: 100%; padding: 0mm;" />
<tr>
@@ -280,11 +277,11 @@ <h3>{intl l="Invoice address"}</h3>
{/loop}
{/ifloop}
</td>
<td><p class="align-right">{format_money number=$realPrice symbol=$orderCurrency}</p></td>
<td><p class="align-right">{format_money number=$realTax symbol=$orderCurrency}</p></td>
<td><p class="align-right">{format_money number=$realTaxedPrice symbol=$orderCurrency}</p></td>
<td><p class="align-right">{format_money number=$realPrice currency_id=$CURRENCY}</p></td>
<td><p class="align-right">{format_money number=$realTax currency_id=$CURRENCY}</p></td>
<td><p class="align-right">{format_money number=$realTaxedPrice currency_id=$CURRENCY}</p></td>
<td><p class="align-center">{$QUANTITY}</p></td>
<td><p class="align-right">{format_money number={$realTotalPrice} symbol=$orderCurrency}</p></td>
<td><p class="align-right">{format_money number=$realTotalPrice currency_id=$CURRENCY}</p></td>
</tr>
{hook name="invoice.order-product" order="{$order_id}" order_product="{$ID}"}
@@ -322,12 +319,12 @@ <h3>{intl l="Delivery module"}</h3>
{if $DISCOUNT}
<tr>
<td class="table-3-1"><p>{intl l="Discount"}</p></td>
<td class="table-3-1 align-right"><p>{format_money number=$DISCOUNT symbol=$orderCurrency}</p></td>
<td class="table-3-1 align-right"><p>{format_money number=$DISCOUNT currency_id=$CURRENCY}</p></td>
</tr>
{/if}
<tr>
<td class="table-3-1"><p>{intl l="Total without tax"}</p></td>
<td class="table-3-1 align-right"><p>{format_money number={$TOTAL_AMOUNT - $POSTAGE_UNTAXED} symbol=$orderCurrency}</p></td>
<td class="table-3-1 align-right"><p>{format_money number={$TOTAL_AMOUNT - $POSTAGE_UNTAXED} currency_id=$CURRENCY}</p></td>
</tr>
{strip}
{capture name="tax"}
@@ -339,36 +336,36 @@ <h3>{intl l="Delivery module"}</h3>
{if $_price_taxe_ != 0}
<tr>
<td class="table-3-2"><p>{$name}</p></td>
<td class="table-3-2 align-right"><p>{format_money number=$_price_taxe_ symbol=$orderCurrency}</p></td>
<td class="table-3-2 align-right"><p>{format_money number=$_price_taxe_ currency_id=$CURRENCY}</p></td>
</tr>
{/if}
{/foreach}
{if $POSTAGE_TAX != 0}
<tr>
<td class="table-3-2"><p>{intl l="Postage"}<br>{$POSTAGE_TAX_RULE_TITLE}</p></td>
<td class="table-3-2 align-right"><p>{format_money number=$POSTAGE_TAX symbol=$orderCurrency}</p></td>
<td class="table-3-2 align-right"><p>{format_money number=$POSTAGE_TAX currency_id=$CURRENCY}</p></td>
</tr>
{/if}
{/capture}
{/strip}
{if $smarty.capture.tax ne ""}
<tr>
<td class="table-3-1"><p>{intl l="Tax"}</p></td>
<td class="table-3-1 align-right"><p>{format_money number=$TOTAL_TAX symbol=$orderCurrency}</p></td>
<td class="table-3-1 align-right"><p>{format_money number=$TOTAL_TAX currency_id=$CURRENCY}</p></td>
</tr>
{$smarty.capture.tax nofilter}
{/if}
<tr>
<td class="table-3-1"><p>{intl l="Total with tax"}</p></td>
<td class="table-3-1 align-right"><p>{format_money number={$TOTAL_TAXED_AMOUNT - $POSTAGE} symbol=$orderCurrency}</p></td>
<td class="table-3-1 align-right"><p>{format_money number={$TOTAL_TAXED_AMOUNT - $POSTAGE} currency_id=$CURRENCY}</p></td>
</tr>
<tr>
<td class="table-3-1"><p>{intl l="Postage"}</p></td>
<td class="table-3-1 align-right"><p>{format_money number=$POSTAGE symbol=$orderCurrency}</p></td>
<td class="table-3-1 align-right"><p>{format_money number=$POSTAGE currency_id=$CURRENCY}</p></td>
</tr>
<tr>
<td class="table-3-1" style="background:#f6993c;"><h3 style="color:white;">{intl l="Total"}</h3></td>
<td class="table-3-1 align-right" style="background:#f6993c;"><h3 style="color:white;">{format_money number=$TOTAL_TAXED_AMOUNT symbol=$orderCurrency}</h3></td>
<td class="table-3-1 align-right" style="background:#f6993c;"><h3 style="color:white;">{format_money number=$TOTAL_TAXED_AMOUNT currency_id=$CURRENCY}</h3></td>
</tr>
</table>
</td>
ProTip! Use n and p to navigate between commits in a pull request.