dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// tax lines must be negative on order_slip as the other parts

Browse Source
This commit is contained in:
rGaillard
2012-09-05 15:05:33 +00:00
parent 85a46c18a2
commit 139bd56c94
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
classes/pdf/HTMLTemplateOrderSlip.php
View File

@@ -148,6 +148,7 @@ class HTMLTemplateOrderSlipCore extends HTMLTemplateInvoice
'product_tax_breakdown' => $this->getProductTaxesBreakdown(),
'shipping_tax_breakdown' => $this->getShippingTaxesBreakdown(),
'order' => $this->order,
'is_order_slip' => true
));
return $this->smarty->fetch($this->getTemplate('invoice.tax-tab'));

12
pdf/invoice.tax-tab.tpl
View File

@@ -50,10 +50,10 @@
<td style="width: 20%; text-align: right;">{$rate} %</td>
{if !$use_one_after_another_method}
<td style="width: 20%; text-align: right;">
{displayPrice currency=$order->id_currency price=$product_tax_infos.total_price_tax_excl}
{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$product_tax_infos.total_price_tax_excl}
</td>
{/if}
<td style="width: 20%; text-align: right;">{displayPrice currency=$order->id_currency price=$product_tax_infos.total_amount}</td>
<td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$product_tax_infos.total_amount}</td>
</tr>
{/foreach}
{/if}
@@ -64,9 +64,9 @@
<td style="width: 30%">{l s='Shipping' pdf='true'}</td>
<td style="width: 20%; text-align: right;">{$shipping_tax_infos.rate} %</td>
{if !$use_one_after_another_method}
<td style="width: 20%; text-align: right;">{displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_tax_excl}</td>
<td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_tax_excl}</td>
{/if}
<td style="width: 20%; text-align: right;">{displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_amount}</td>
<td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_amount}</td>
</tr>
{/foreach}
{/if}
@@ -78,9 +78,9 @@
<td style="width: 30%">{l s='Ecotax' pdf='true'}</td>
<td style="width: 20%; text-align: right;">{$ecotax_tax_infos.rate } %</td>
{if !$use_one_after_another_method}
<td style="width: 20%; text-align: right;">{displayPrice currency=$order->id_currency price=$ecotax_tax_infos.ecotax_tax_excl}</td>
<td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$ecotax_tax_infos.ecotax_tax_excl}</td>
{/if}
<td style="width: 20%; text-align: right;">{displayPrice currency=$order->id_currency price=($ecotax_tax_infos.ecotax_tax_incl - $ecotax_tax_infos.ecotax_tax_excl)}</td>
<td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=($ecotax_tax_infos.ecotax_tax_incl - $ecotax_tax_infos.ecotax_tax_excl)}</td>
</tr>
{/if}
{/foreach}