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

[-] BO : FixBug #PSCFV-7824 No total tax not show in order email confirmation

Browse Source
This commit is contained in:
jeromenadaud
2013-08-01 19:09:34 +02:00
parent ac48c1b786
commit d8f5caee7b
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
classes/PaymentModule.php
View File

@@ -605,7 +605,8 @@ abstract class PaymentModuleCore extends Module
'{total_products}' => Tools::displayPrice($order->total_paid - $order->total_shipping - $order->total_wrapping + $order->total_discounts, $this->context->currency, false),
'{total_discounts}' => Tools::displayPrice($order->total_discounts, $this->context->currency, false),
'{total_shipping}' => Tools::displayPrice($order->total_shipping, $this->context->currency, false),
'{total_wrapping}' => Tools::displayPrice($order->total_wrapping, $this->context->currency, false));
'{total_wrapping}' => Tools::displayPrice($order->total_wrapping, $this->context->currency, false),
'{total_tax_paid}' => Tools::displayPrice(($order->total_products_wt - $order->total_products) + ($order->total_shipping_tax_incl - $order->total_shipping_tax_excl), $this->context->currency, false));
if (is_array($extra_vars))
$data = array_merge($data, $extra_vars);

5
mails/en/order_conf.html
View File

@@ -72,6 +72,11 @@
</tr>
<tr style="text-align: right; font-weight: bold;">
<td>&nbsp;</td>
<td style="background-color: #dde2e6; padding: 0.6em 0.4em;" colspan="3">Total Tax paid</td>
<td style="background-color: #dde2e6; padding: 0.6em 0.4em;">{total_tax_paid}</td>
</tr>
<tr style="text-align: right; font-weight: bold;">
<td>&nbsp;</td>
<td style="background-color: #f1aecf; padding: 0.6em 0.4em;" colspan="3">Total paid</td>
<td style="background-color: #f1aecf; padding: 0.6em 0.4em;">{total_paid}</td>
</tr>

1
mails/en/order_conf.txt
View File

@@ -9,6 +9,7 @@ Thank you for your order on {shop_name}!
Discounts: {total_discounts}
Shipping: {total_shipping}
Gift-wrapping: {total_wrapping}
Total Tax paid: {total_tax_paid}
Total paid: {total_paid}
Carrier: {carrier}