Need to remove tax from Discount in Order Confirmation?

[Kent88z]

In the order confirmation email (order_conf.html) the discount amount includes tax. In the US tax should be determined after the discount is deducted. The cart and invoice properly do this but the order confirmation email still doesn't.

 

For example, if a $50.00 product is ordered with a 5% tax rate and a 20% voucher is applied then the discount will compute and display as $10.50 when it should be $10.00.

 

Using this example I want my Order Confirmation email to show the following amounts:

Products (excl tax) $50.00

Discounts $10.00

Tax $ 2.00

Shipping $6.00

Total Paid $48.00

 

But it currently appears like this since the discount amount includes tax:

Products (excl tax) $50.00

Discounts $10.50

Tax $ 2.50

Shipping $6.00

Total Paid $48.00

 

I made these code changes to PaymentModule.php so the Products total excludes tax and I created a separate variable for the Tax amount.

 

'{total_products}' => Tools::displayPrice($order->total_products, $currency, false),

'{total_tax}' => Tools::displayPrice($order->total_paid - $order->total_shipping - $order->total_wrapping + $order->total_discounts - $order->total_products, $currency, false),

 

If I could figure out how to get the {total_discounts} amount to exclude tax (i.e. - not computed from the pre discount, after tax total) then it would show a $10.00 discount and my Tax line would also be correct and show $2.00.

 

Any ideas what code needs to be revised to fix this?

 

Thanks.