From d2e475dd3a19b637fc6690a6efca6062fffc2214 Mon Sep 17 00:00:00 2001
From: Jerome Nadaud <jerome.nadaud@prestashop.com>
Date: Tue, 29 Oct 2013 10:30:59 +0100
Subject: [PATCH] // Removed line from merge

---
 modules/mailalerts/config.xml     | 2 +-
 modules/mailalerts/mailalerts.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/mailalerts/config.xml b/modules/mailalerts/config.xml
index 5cf97756c..98984a992 100755
--- a/modules/mailalerts/config.xml
+++ b/modules/mailalerts/config.xml
@@ -2,7 +2,7 @@
         <module>
             <name>mailalerts</name>
             <displayName><![CDATA[Mail alerts]]></displayName>
-            <version><![CDATA[2.6]]></version>
+            <version><![CDATA[2.7]]></version>
             <description><![CDATA[Sends e-mail notifications to customers and merchants.]]></description>
             <author><![CDATA[PrestaShop]]></author>
             <tab><![CDATA[administration]]></tab>
diff --git a/modules/mailalerts/mailalerts.php b/modules/mailalerts/mailalerts.php
index c622d8f97..57ed8cb91 100644
--- a/modules/mailalerts/mailalerts.php
+++ b/modules/mailalerts/mailalerts.php
@@ -46,7 +46,7 @@ class MailAlerts extends Module
 	{
 		$this->name = 'mailalerts';
 		$this->tab = 'administration';
-		$this->version = '2.6';
+		$this->version = '2.7';
 		$this->author = 'PrestaShop';
 		$this->need_instance = 0;
 
@@ -393,6 +393,7 @@ class MailAlerts extends Module
 			'{total_products}' => Tools::displayPrice($order->getTotalProductsWithTaxes(), $currency),
 			'{total_discounts}' => Tools::displayPrice($order->total_discounts, $currency),
 			'{total_shipping}' => Tools::displayPrice($order->total_shipping, $currency),
+			'{total_tax_paid}' => Tools::displayPrice(($order->total_products_wt - $order->total_products) + ($order->total_shipping_tax_incl - $order->total_shipping_tax_excl), $currency, false),
 			'{total_wrapping}' => Tools::displayPrice($order->total_wrapping, $currency),
 			'{currency}' => $currency->sign,
 			'{message}' => $message