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 ea1e9f8435
commit 4acec40fbf
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/pdf/HTMLTemplateOrderSlip.php
+1
View File
@@ -148,6 +148,7 @@ class HTMLTemplateOrderSlipCore extends HTMLTemplateInvoice
'product_tax_breakdown' => $this->getProductTaxesBreakdown(), 'product_tax_breakdown' => $this->getProductTaxesBreakdown(),
'shipping_tax_breakdown' => $this->getShippingTaxesBreakdown(), 'shipping_tax_breakdown' => $this->getShippingTaxesBreakdown(),
'order' => $this->order, 'order' => $this->order,
'is_order_slip' => true
)); ));
return $this->smarty->fetch($this->getTemplate('invoice.tax-tab')); return $this->smarty->fetch($this->getTemplate('invoice.tax-tab'));
pdf/invoice.tax-tab.tpl
+6 -6
View File
@@ -50,10 +50,10 @@
<td style="width: 20%; text-align: right;">{$rate} %</td> <td style="width: 20%; text-align: right;">{$rate} %</td>
{if !$use_one_after_another_method} {if !$use_one_after_another_method}
<td style="width: 20%; text-align: right;"> <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> </td>
{/if} {/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> </tr>
{/foreach} {/foreach}
{/if} {/if}
@@ -64,9 +64,9 @@
<td style="width: 30%">{l s='Shipping' pdf='true'}</td> <td style="width: 30%">{l s='Shipping' pdf='true'}</td>
<td style="width: 20%; text-align: right;">{$shipping_tax_infos.rate} %</td> <td style="width: 20%; text-align: right;">{$shipping_tax_infos.rate} %</td>
{if !$use_one_after_another_method} {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} {/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> </tr>
{/foreach} {/foreach}
{/if} {/if}
@@ -78,9 +78,9 @@
<td style="width: 30%">{l s='Ecotax' pdf='true'}</td> <td style="width: 30%">{l s='Ecotax' pdf='true'}</td>
<td style="width: 20%; text-align: right;">{$ecotax_tax_infos.rate } %</td> <td style="width: 20%; text-align: right;">{$ecotax_tax_infos.rate } %</td>
{if !$use_one_after_another_method} {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} {/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> </tr>
{/if} {/if}
{/foreach} {/foreach}