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

// Removed line from merge

Browse Source
This commit is contained in:
Jerome Nadaud
2013-10-29 10:30:59 +01:00
parent 1d90218e0d
commit d2e475dd3a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/mailalerts/config.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<module> <module>
<name>mailalerts</name> <name>mailalerts</name>
<displayName><![CDATA[Mail alerts]]></displayName> <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> <description><![CDATA[Sends e-mail notifications to customers and merchants.]]></description>
<author><![CDATA[PrestaShop]]></author> <author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[administration]]></tab> <tab><![CDATA[administration]]></tab>
modules/mailalerts/mailalerts.php
+2 -1
View File
@@ -46,7 +46,7 @@ class MailAlerts extends Module
{ {
$this->name = 'mailalerts'; $this->name = 'mailalerts';
$this->tab = 'administration'; $this->tab = 'administration';
$this->version = '2.6'; $this->version = '2.7';
$this->author = 'PrestaShop'; $this->author = 'PrestaShop';
$this->need_instance = 0; $this->need_instance = 0;
@@ -393,6 +393,7 @@ class MailAlerts extends Module
'{total_products}' => Tools::displayPrice($order->getTotalProductsWithTaxes(), $currency), '{total_products}' => Tools::displayPrice($order->getTotalProductsWithTaxes(), $currency),
'{total_discounts}' => Tools::displayPrice($order->total_discounts, $currency), '{total_discounts}' => Tools::displayPrice($order->total_discounts, $currency),
'{total_shipping}' => Tools::displayPrice($order->total_shipping, $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), '{total_wrapping}' => Tools::displayPrice($order->total_wrapping, $currency),
'{currency}' => $currency->sign, '{currency}' => $currency->sign,
'{message}' => $message '{message}' => $message