// MERGE with 1.4 r7770

modules/mailalerts/de.php

@@ -2,18 +2,6 @@
 
 global $_MODULE;
 $_MODULE = array();
-$_MODULE['<{mailalerts}prestashop>my-account_4edfd10d0bb5f51e0fd2327df608b5a8'] = 'Meine Benachrichtigungen';
-$_MODULE['<{mailalerts}prestashop>my-account_abca7cba75e5a9ff86b1490f32891f82'] = 'Benachrichtigungen';
-$_MODULE['<{mailalerts}prestashop>myalerts_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'Mein Konto';
-$_MODULE['<{mailalerts}prestashop>myalerts_4edfd10d0bb5f51e0fd2327df608b5a8'] = 'Meine Benachrichtigungen';
-$_MODULE['<{mailalerts}prestashop>myalerts_deb10517653c255364175796ace3553f'] = 'Produkt';
-$_MODULE['<{mailalerts}prestashop>myalerts_f2a6c498fb90ee345d997f888fce3b18'] = 'Löschen';
-$_MODULE['<{mailalerts}prestashop>myalerts_074c07016d3e5a9f011aa8e62abe4517'] = 'Sie haben keine Benachrichtigungen abonniert.';
-$_MODULE['<{mailalerts}prestashop>myalerts_0b3db27bc15f682e92ff250ebb167d4b'] = 'Zurück zu Ihrem Konto';
-$_MODULE['<{mailalerts}prestashop>myalerts_8cf04a9734132302f96da8e113e80ce5'] = 'Startseite';
-$_MODULE['<{mailalerts}prestashop>product_61172eb93737ebf095d3fa02119ce1df'] = 'Anfragenachricht registriert';
-$_MODULE['<{mailalerts}prestashop>product_900f8551b29793ecb604a545b2059cc1'] = 'Ihre E-Mail-Adresse ist ungültig';
-$_MODULE['<{mailalerts}prestashop>product_546e02eaa9a986c83cc347e273269f2c'] = 'Mich bei Verfügbarkeit benachrichtigen';
 $_MODULE['<{mailalerts}prestashop>mailalerts_fd30254803e8db32521d3390131a44da'] = 'Mail-Benachrichtigungen';
 $_MODULE['<{mailalerts}prestashop>mailalerts_2d51f4a7ab8a12c4f35b507019523b8c'] = 'Sendet E-Mail-Benachrichtigungen an Kunden und Händler.';
 $_MODULE['<{mailalerts}prestashop>mailalerts_8fd3b84964bd6dfec8095f658d200b29'] = 'Sind Sie sicher, dass alle Kundenmitteilungen löschen wollen?';
@@ -39,5 +27,15 @@ $_MODULE['<{mailalerts}prestashop>mailalerts_f4d1ea475eaa85102e2b4e6d95da84bd']
 $_MODULE['<{mailalerts}prestashop>mailalerts_c888438d14855d7d96a2724ee9c306bd'] = 'Einstellungen aktualisiert';
 $_MODULE['<{mailalerts}prestashop>mailalerts_ce241f25e003bafeb9fce6857d8f027f'] = 'Bitte geben Sie eine (oder mehrere) E-Mail Adressen ein';
 $_MODULE['<{mailalerts}prestashop>mailalerts_29aae9c646337554f4de7ae29050c39f'] = 'Ungültige E-Mail:';
-
-?>
+$_MODULE['<{mailalerts}prestashop>my-account_4edfd10d0bb5f51e0fd2327df608b5a8'] = 'Meine Benachrichtigungen';
+$_MODULE['<{mailalerts}prestashop>my-account_abca7cba75e5a9ff86b1490f32891f82'] = 'Benachrichtigungen';
+$_MODULE['<{mailalerts}prestashop>myalerts_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'Mein Konto';
+$_MODULE['<{mailalerts}prestashop>myalerts_4edfd10d0bb5f51e0fd2327df608b5a8'] = 'Meine Benachrichtigungen';
+$_MODULE['<{mailalerts}prestashop>myalerts_deb10517653c255364175796ace3553f'] = 'Produkt';
+$_MODULE['<{mailalerts}prestashop>myalerts_f2a6c498fb90ee345d997f888fce3b18'] = 'Löschen';
+$_MODULE['<{mailalerts}prestashop>myalerts_074c07016d3e5a9f011aa8e62abe4517'] = 'Sie haben keine Benachrichtigungen abonniert.';
+$_MODULE['<{mailalerts}prestashop>myalerts_0b3db27bc15f682e92ff250ebb167d4b'] = 'Zurück zu Ihrem Konto';
+$_MODULE['<{mailalerts}prestashop>myalerts_8cf04a9734132302f96da8e113e80ce5'] = 'Startseite';
+$_MODULE['<{mailalerts}prestashop>product_61172eb93737ebf095d3fa02119ce1df'] = 'Anfragenachricht registriert';
+$_MODULE['<{mailalerts}prestashop>product_900f8551b29793ecb604a545b2059cc1'] = 'Ihre E-Mail-Adresse ist ungültig';
+$_MODULE['<{mailalerts}prestashop>product_546e02eaa9a986c83cc347e273269f2c'] = 'Mich bei Verfügbarkeit benachrichtigen';

modules/mailalerts/img/index.php

@@ -0,0 +1,36 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;

modules/mailalerts/index.php

@@ -0,0 +1,36 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;

modules/mailalerts/mailalerts.php

@@ -119,7 +119,7 @@ class MailAlerts extends Module
 			return;
 
 		// Getting differents vars
-		$id_lang = (int)(Configuration::get('PS_LANG_DEFAULT'));
+		$id_lang = (int)Configuration::get('PS_LANG_DEFAULT');
 	 	$currency = $params['currency'];
 		$configuration = Configuration::getMultiple(array('PS_SHOP_EMAIL', 'PS_MAIL_METHOD', 'PS_MAIL_SERVER', 'PS_MAIL_USER', 'PS_MAIL_PASSWD', 'PS_SHOP_NAME'));
 		$order = $params['order'];
@@ -134,9 +134,10 @@ class MailAlerts extends Module
 
 		$itemsTable = '';
 		
+		$products = $params['order']->getProducts();
 		$customizedDatas = Product::getAllCustomizedDatas(intval($params['cart']->id));
 		Product::addCustomizationPrice($products, $customizedDatas);
-		foreach ($params['order']->getProducts() AS $key => $product)
+		foreach ($products AS $key => $product)
 		{
 			$unit_price = $product['product_price_wt'];
 			$price = $product['total_price'];
@@ -184,11 +185,21 @@ class MailAlerts extends Module
 
 		// Filling-in vars for email
 		$template = 'new_order';
-		$subject = $this->l('New order');
+		$subject = $this->l('New order', $id_lang);
 		$templateVars = array(
 			'{firstname}' => $customer->firstname,
 			'{lastname}' => $customer->lastname,
 			'{email}' => $customer->email,
+			'{delivery_block_txt}' => $this->_getFormatedAddress($delivery, "\n"),
+			'{invoice_block_txt}' => $this->_getFormatedAddress($invoice, "\n"),
+			'{delivery_block_html}' => $this->_getFormatedAddress($delivery, "<br />", 
+						array(
+							'firstname'	=> '<span style="color:#DB3484; font-weight:bold;">%s</span>', 
+							'lastname'	=> '<span style="color:#DB3484; font-weight:bold;">%s</span>')),
+			'{invoice_block_html}' => $this->_getFormatedAddress($invoice, "<br />", 
+						array(
+							'firstname'	=> '<span style="color:#DB3484; font-weight:bold;">%s</span>',
+							'lastname'	=> '<span style="color:#DB3484; font-weight:bold;">%s</span>')),
 			'{delivery_company}' => $delivery->company,
 			'{delivery_firstname}' => $delivery->firstname,
 			'{delivery_lastname}' => $delivery->lastname,
@@ -230,6 +241,15 @@ class MailAlerts extends Module
 			Mail::Send($id_lang, $template, $subject, $templateVars, explode(self::__MA_MAIL_DELIMITOR__, $this->_merchant_mails), NULL, $configuration['PS_SHOP_EMAIL'], $configuration['PS_SHOP_NAME'], NULL, NULL, dirname(__FILE__).'/mails/');
 	}
 
+
+	/*
+	** Generate correctly the address for an email
+	*/
+	private function _getFormatedAddress(Address $the_address, $line_sep, $fields_style = array())
+	{
+		return AddressFormat::generateAddress($the_address, array('avoid' => array()), $line_sep, ' ', $fields_style);
+	}
+
 	public function hookProductOutOfStock($params)
 	{
 		global $smarty, $cookie;
@@ -291,10 +311,13 @@ class MailAlerts extends Module
 				'{product}' => strval($params['product']['name']).(isset($params['product']['attributes_small']) ? ' '.$params['product']['attributes_small'] : ''));
 			$id_lang = (is_object($cookie) AND isset($cookie->id_lang)) ? (int)$cookie->id_lang : (int)Configuration::get('PS_LANG_DEFAULT');
 			$iso = Language::getIsoById((int)$id_lang);
+			
+		    if ($params['product']['active'] == 1)
+		    {
 			if (file_exists(dirname(__FILE__).'/mails/'.$iso.'/productoutofstock.txt') AND file_exists(dirname(__FILE__).'/mails/'.$iso.'/productoutofstock.html'))
 				Mail::Send((int)Configuration::get('PS_LANG_DEFAULT'), 'productoutofstock', Mail::l('Product out of stock'), $templateVars, explode(self::__MA_MAIL_DELIMITOR__, $this->_merchant_mails), NULL, strval(Configuration::get('PS_SHOP_EMAIL')), strval(Configuration::get('PS_SHOP_NAME')), NULL, NULL, dirname(__FILE__).'/mails/');
 		}
-
+		}
 		if ($this->_customer_qty AND $params['product']['quantity'] > 0)
 			$this->sendCustomerAlert((int)$params['product']['id'], 0);
 	}
@@ -470,7 +493,7 @@ class MailAlerts extends Module
 		$this->_refreshProperties();
 	}
 
-	static public function getProductsAlerts($id_customer, $id_lang)
+	public static function getProductsAlerts($id_customer, $id_lang)
 	{
 		if (!Validate::isUnsignedId($id_customer) OR
 			!Validate::isUnsignedId($id_lang)
@@ -482,8 +505,10 @@ class MailAlerts extends Module
 				JOIN `'._DB_PREFIX_.'product` p ON p.`id_product` = ma.`id_product`
 				JOIN `'._DB_PREFIX_.'product_lang` pl ON pl.`id_product` = ma.`id_product` AND pl.`id_lang` = '.$id_lang.Context::getContext()->shop->sqlLang('pl').'
 				'.Product::sqlStock('p', 0).'
-				WHERE ma.`id_customer` = '.$id_customer;
+				WHERE p.`active` = 1
+					ma.`id_customer` = '.$id_customer;
 		$products = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql);
+
 		if (empty($products) === true OR !sizeof($products))
 			return array();
 		for ($i = 0; $i < sizeof($products); ++$i)
@@ -537,7 +562,7 @@ class MailAlerts extends Module
 		return ($products);
 	}
 
-	static public function deleteAlert($id_customer, $customer_email, $id_product, $id_product_attribute)
+	public static function deleteAlert($id_customer, $customer_email, $id_product, $id_product_attribute)
 	{
 		return Db::getInstance()->Execute('
 			DELETE FROM `'._DB_PREFIX_.'mailalert_customer_oos` 

modules/mailalerts/mails/de/index.php

@@ -0,0 +1,36 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;

modules/mailalerts/mails/de/new_order.html

@@ -85,8 +85,12 @@
 <th style="text-align: left; padding: 0.3em 1em;">LIEFERadressE</th><th style="text-align: left; padding: 0.3em 1em;">RECHNUNGSadressE</th>
 </tr>
 <tr>
-<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{delivery_company} <br /><span style="color: #db3484; font-weight: bold;">{delivery_firstname} {delivery_lastname}</span> <br />{delivery_address1} <br />{delivery_address2} <br />{delivery_city} {delivery_postal_code} <br />{delivery_country} {delivery_state} <br />{delivery_phone} <br />{delivery_other}</td>
-<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{invoice_company} <br /><span style="color: #db3484; font-weight: bold;">{invoice_firstname} {invoice_lastname}</span> <br />{invoice_address1} <br />{invoice_address2} <br />{invoice_city} {invoice_postal_code} <br />{invoice_country} {invoice_state} <br />{invoice_phone} <br />{invoice_other}</td>
+<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">
+{delivery_block_html}
+</td>
+<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">
+{invoice_block_html}
+</td>
 </tr>
 </tbody>
 </table>
@@ -113,4 +117,4 @@
 </tbody>
 </table>
 </body>
-</html>
+</html>

modules/mailalerts/mails/de/new_order.txt

@@ -14,23 +14,11 @@ Gesamt bezahlt: {total_paid}
 
 Lieferadresse:
 
-{delivery_company}
-{delivery_firstname} {delivery_lastname}
-{delivery_address1}
-{delivery_address2}
-{delivery_postal_code} {delivery_city}
-{delivery_country} {delivery_state}
-{delivery_other}
+{invoice_other}
 
 Rechnungsadresse:
 
-{invoice_company}
-{invoice_firstname} {invoice_lastname}
-{invoice_address1}
-{invoice_address2}
-{invoice_postal_code} {invoice_city}
-{invoice_country} {invoice_state}
-{invoice_other}
+{invoice_block_txt}
 
 Kundennachricht:
 

modules/mailalerts/mails/en/index.php

@@ -0,0 +1,36 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;

modules/mailalerts/mails/en/new_order.html

@@ -81,24 +81,10 @@
 					</tr>
 					<tr>
 						<td style="padding:0.5em 0 0.5em 0.5em; background-color:#EBECEE;">
-							{delivery_company}
-							<br><span style="color:#DB3484; font-weight:bold;">{delivery_firstname} {delivery_lastname}</span>
-							<br>{delivery_address1}
-							<br>{delivery_address2}
-							<br>{delivery_city} {delivery_postal_code}
-							<br>{delivery_country} {delivery_state}
-							<br>{delivery_phone}
-							<br>{delivery_other}
+							{delivery_block_html}
 						</td>
 						<td style="padding:0.5em 0 0.5em 0.5em; background-color:#EBECEE;">
-							{invoice_company}
-							<br><span style="color:#DB3484; font-weight:bold;">{invoice_firstname} {invoice_lastname}</span>
-							<br>{invoice_address1}
-							<br>{invoice_address2}
-							<br>{invoice_city} {invoice_postal_code}
-							<br>{invoice_country} {invoice_state}
-							<br>{invoice_phone}
-							<br>{invoice_other}
+							{invoice_block_html}
 						</td>
 					</tr>
 				</table>

modules/mailalerts/mails/en/new_order.txt

@@ -14,23 +14,11 @@ Total paid: {total_paid}
 
 Delivery address:
 
-{delivery_company}
-{delivery_firstname} {delivery_lastname}
-{delivery_address1}
-{delivery_address2}
-{delivery_postal_code} {delivery_city}
-{delivery_country} {delivery_state}
-{delivery_other}
+{delivery_block_txt}
 
 Billing address:
 
-{invoice_company}
-{invoice_firstname} {invoice_lastname}
-{invoice_address1}
-{invoice_address2}
-{invoice_postal_code} {invoice_city}
-{invoice_country} {invoice_state}
-{invoice_other}
+{invoice_block_txt}
 
 Customer message:
 

modules/mailalerts/mails/es/index.php

@@ -0,0 +1,36 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;

modules/mailalerts/mails/es/new_order.html

@@ -86,8 +86,12 @@
 <th style="text-align: left; padding: 0.3em 1em;">Direcci&oacute;n de entrega</th><th style="text-align: left; padding: 0.3em 1em;">Direcci&oacute;n de facturaci&oacute;n</th>
 </tr>
 <tr>
-<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{delivery_company} <br /><span style="color: #db3484; font-weight: bold;">{delivery_firstname} {delivery_lastname}</span> <br />{delivery_address1} <br />{delivery_address2} <br />{delivery_city} {delivery_postal_code} <br />{delivery_country} {delivery_state} <br />{delivery_phone} <br />{delivery_other}</td>
-<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{invoice_company} <br /><span style="color: #db3484; font-weight: bold;">{invoice_firstname} {invoice_lastname}</span> <br />{invoice_address1} <br />{invoice_address2} <br />{invoice_city} {invoice_postal_code} <br />{invoice_country} {invoice_state} <br />{invoice_phone} <br />{invoice_other}</td>
+<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">
+{delivery_block_html} 
+</td>
+<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">
+{invoice_block_html} 
+</td>
 </tr>
 </tbody>
 </table>
@@ -115,4 +119,4 @@
 </table>
 
 </body>
-</html>
+</html>

modules/mailalerts/mails/es/new_order.txt

@@ -14,23 +14,11 @@ Total pagado: {total_paid}
 
 Dirección de entrega:
 
-{delivery_company}
-{delivery_firstname} {delivery_lastname}
-{delivery_address1}
-{delivery_address2}
-{delivery_postal_code} {delivery_city}
-{delivery_country} {delivery_state}
-{delivery_other}
+{delivery_block_txt}
 
 Dirección de facturación:
 
-{invoice_company}
-{invoice_firstname} {invoice_lastname}
-{invoice_address1}
-{invoice_address2}
-{invoice_postal_code} {invoice_city}
-{invoice_country} {invoice_state}
-{invoice_other}
+{invoice_block_txt}
 
 Mensaje al cliente:
 

modules/mailalerts/mails/fr/index.php

@@ -0,0 +1,36 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;

modules/mailalerts/mails/fr/new_order.html

@@ -81,24 +81,10 @@
 					</tr>
 					<tr>
 						<td style="padding:0.5em 0 0.5em 0.5em; background-color:#EBECEE;">
-							{delivery_company}
-							<br><span style="color:#DB3484; font-weight:bold;">{delivery_firstname} {delivery_lastname}</span>
-							<br>{delivery_address1}
-							<br>{delivery_address2}
-							<br>{delivery_city} {delivery_postal_code}
-							<br>{delivery_country} {delivery_state}
-							<br>{delivery_phone}
-							<br>{delivery_other}
+							{delivery_block_html}
 						</td>
 						<td style="padding:0.5em 0 0.5em 0.5em; background-color:#EBECEE;">
-							{invoice_company}
-							<br><span style="color:#DB3484; font-weight:bold;">{invoice_firstname} {invoice_lastname}</span>
-							<br>{invoice_address1}
-							<br>{invoice_address2}
-							<br>{invoice_city} {invoice_postal_code}
-							<br>{invoice_country} {invoice_state}
-							<br>{invoice_phone}
-							<br>{invoice_other}
+							{invoice_block_html}
 						</td>
 					</tr>
 				</table>

modules/mailalerts/mails/fr/new_order.txt

@@ -13,24 +13,10 @@ Emballage cadeau: {total_wrapping}
 Total TTC : {total_paid}
 
 Adresse de livraison :
-
-{delivery_company}
-{delivery_firstname} {delivery_lastname}
-{delivery_address1}
-{delivery_address2}
-{delivery_postal_code} {delivery_city}
-{delivery_country} {delivery_state}
-{delivery_other}
+	{delivery_block_txt}
 
 Adresse de facturation :
-
-{invoice_company}
-{invoice_firstname} {invoice_lastname}
-{invoice_address1}
-{invoice_address2}
-{invoice_postal_code} {invoice_city}
-{invoice_country} {invoice_state}
-{invoice_other}
+	{invoice_block_txt}
 
 Message client :
 

modules/mailalerts/mails/index.php

@@ -0,0 +1,36 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+			    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+	
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+	
+header("Location: ../");
+exit;

modules/mailalerts/mails/it/index.php

@@ -0,0 +1,36 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;

modules/mailalerts/mails/it/new_order.html

@@ -85,8 +85,12 @@
 <th style="text-align: left; padding: 0.3em 1em;">INDIRIZZO DI CONSEGNA</th> <th style="text-align: left; padding: 0.3em 1em;">INDIRIZZO DI FATTURAZIONE</th>
 </tr>
 <tr>
-<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{delivery_company} 							<br /><span style="color: #db3484; font-weight: bold;">{delivery_firstname} {delivery_lastname}</span> <br />{delivery_address1} 							<br />{delivery_address2} 							<br />{delivery_city} {delivery_postal_code} 							<br />{delivery_country} {delivery_state} 							<br />{delivery_phone} 							<br />{delivery_other}</td>
-<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{invoice_company} 							<br /><span style="color: #db3484; font-weight: bold;">{invoice_firstname} {invoice_lastname}</span> <br />{invoice_address1} 							<br />{invoice_address2} 							<br />{invoice_city} {invoice_postal_code} 							<br />{invoice_country} {invoice_state} 							<br />{invoice_phone} 							<br />{invoice_other}</td>
+<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">
+{delivery_block_html}
+</td>
+<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">
+{invoice_block_html}
+</td>
 </tr>
 </tbody>
 </table>
@@ -113,4 +117,4 @@
 </tbody>
 </table>
 </body>
-</html>
+</html>

modules/mailalerts/mails/it/new_order.txt

@@ -14,23 +14,11 @@ Totale pagato: {total_paid}
 
 Indirizzo di consegna:
 
-{delivery_company}
-{delivery_firstname} {delivery_lastname}
-{delivery_address1}
-{delivery_address2}
-{delivery_postal_code} {delivery_city}
-{delivery_country} {delivery_state}
-{delivery_other}
+{delivery_block_txt} 
 
 Indirizzo di fatturazione:
 
-{invoice_company}
-{invoice_firstname} {invoice_lastname}
-{invoice_address1}
-{invoice_address2}
-{invoice_postal_code} {invoice_city}
-{invoice_country} {invoice_state}
-{invoice_other}
+{invoice_block_txt} 
 
 Messaggio del cliente: