Merge remote-tracking branch 'origin/ticket-14739-PackLogistic'

Conflicts:
	.gitignore
	mails/es/account.html
	mails/es/account.txt

.gitignore

@@ -80,6 +80,7 @@ mails/*
 !mails/en
 !mails/fr
 !mails/es
+!mails/it
 modules/*/mails/*
 !modules/*/mails/en
 
@@ -109,7 +110,6 @@ modules/lapostews/mpdf/*
 modules/landingpages/img/*
 modules/privatesales/img/*
 modules/privatesales_logistique/*
-modules/stats_logistic/*
 modules/privatesales_logistique/files/*
 modules/emarsys_rss/flux.xml
 modules/emarsys_rss/*.xml
@@ -120,5 +120,6 @@ modules/product_vouchers/*.csv
 modules/labelgenerate/img/*
 modules/purchaseguide/img/*
 !modules/purchaseguide/img/index.php
+modules/ant_wp/export/*
 
 /.user.ini

adm/ajax.php

@@ -125,22 +125,43 @@ if (isset($_GET['ajaxDiscountCustomers']))
 	$currentIndex = 'index.php?tab=AdminDiscounts';
 	$jsonArray = array();
 	$filter = Tools::getValue('filter');
-
-	if (Validate::isBool_Id($filter))
+	
+	$filterWithIdCustomer = false;
+	if (strpos($filter, '0_') === 0) {
 		$filterArray = explode('_', $filter);
-
-	$customers = Db::getInstance()->ExecuteS('
-	SELECT `id_customer`, `email`, CONCAT(`lastname`, \' \', `firstname`) as name
-	FROM `'._DB_PREFIX_.'customer`
-	WHERE `deleted` = 0 AND is_guest = 0
-	AND '.(Validate::isUnsignedInt($filter) ? '`id_customer` = '.(int)($filter) : '(`email` LIKE "%'.pSQL($filter).'%"
-	'.((Validate::isBool_Id($filter) AND $filterArray[0] == 0) ? 'OR `id_customer` = '.(int)($filterArray[1]) : '').'
-	'.(Validate::isUnsignedInt($filter) ? '`id_customer` = '.(int)($filter) : '').'
-	OR CONCAT(`firstname`, \' \', `lastname`) LIKE "%'.pSQL($filter).'%"
-	OR CONCAT(`lastname`, \' \', `firstname`) LIKE "%'.pSQL($filter).'%")').'
-	ORDER BY CONCAT(`lastname`, \' \', `firstname`) ASC
-	LIMIT 50');
-
+		$filter = $filterArray[1];
+		$filterWithIdCustomer = true;
+	}
+	
+	// Filter
+	if ($filterWithIdCustomer === true) {
+		$customerSql = 'SELECT `id_customer`, `email`, CONCAT(`lastname`, \' \', `firstname`) as name
+			FROM `'._DB_PREFIX_.'customer`
+			WHERE `deleted` = 0 AND is_guest = 0 AND `id_customer` = '.(int)($filter).'
+			ORDER BY CONCAT(`lastname`, \' \', `firstname`) ASC
+			LIMIT 50';
+	}
+	// Detect email address
+	elseif (strpos($filter, '@')) {
+		$customerSql = 'SELECT `id_customer`, `email`, CONCAT(`lastname`, \' \', `firstname`) as name
+			FROM `'._DB_PREFIX_.'customer`
+			WHERE `deleted` = 0 AND is_guest = 0 AND `email` LIKE "%'.pSQL($filter).'%"
+			ORDER BY CONCAT(`lastname`, \' \', `firstname`) ASC
+			LIMIT 50';
+	}
+	// Default
+	else {
+		$customerSql = 'SELECT `id_customer`, `email`, CONCAT(`lastname`, \' \', `firstname`) as name
+			FROM `'._DB_PREFIX_.'customer`
+			WHERE `deleted` = 0 AND is_guest = 0 AND (
+				CONCAT(`firstname`, \' \', `lastname`) LIKE "%'.pSQL($filter).'%"
+				OR CONCAT(`lastname`, \' \', `firstname`) LIKE "%'.pSQL($filter).'%"
+			)
+			ORDER BY CONCAT(`lastname`, \' \', `firstname`) ASC
+			LIMIT 50';
+	}
+	$customers = Db::getInstance()->ExecuteS($customerSql);
+	
 	$groups = Db::getInstance()->ExecuteS('
 	SELECT g.`id_group`, gl.`name`
 	FROM `'._DB_PREFIX_.'group` g
@@ -150,15 +171,19 @@ if (isset($_GET['ajaxDiscountCustomers']))
 	ORDER BY gl.`name` ASC
 	LIMIT 50');
 
+	// JSON
 	$json = '{"customers" : ';
-	foreach ($customers AS $customer)
+	foreach ($customers AS $customer) {
 		$jsonArray[] = '{"value":"0_'.(int)($customer['id_customer']).'", "text":"'.addslashes($customer['name']).' ('.addslashes($customer['email']).')"}';
+	}
 	$json .= '['.implode(',', $jsonArray).'],
 		"groups" : ';
 	$jsonArray = array();
-	foreach ($groups AS $group)
+	foreach ($groups AS $group) {
 		$jsonArray[] = '{"value":"1_'.(int)($group['id_group']).'", "text":"'.addslashes($group['name']).'"}';
+	}
 	$json .= '['.implode(',', $jsonArray).']}';
+	
 	die($json);
 }
 
@@ -705,4 +730,3 @@ if (Tools::isSubmit('getChildrenCategories') && Tools::getValue('id_category_par
 	$children_categories = Category::getChildrenWithNbSelectedSubCat(Tools::getValue('id_category_parent'), Tools::getValue('selectedCat'), $cookie->id_lang);
 	die(Tools::jsonEncode($children_categories));
 }
-

adm/helpers/HelperFormBootstrap.php

@@ -817,13 +817,14 @@ class HelperFormBootstrap{
 
     public function inputCheckbox($p = array()){
         $checked = ((isset($p['checked']) && $p['checked']) ? $p['checked'] : false);
-        if ($this->_object)
+        if ($this->_object) {
             $checked = $this->_object->{$p['name']};
-        $this->_html .= '<label' . (isset($p['class']) && $p['class'] ? ' class="' . $p['class'] . '"' : '') . '>'.$p['label'].'</label>
-            <div class="margin-form checkbox' . (isset($p['class']) && $p['class'] ? ' ' . $p['class'] : '') . '">
-                <input type="checkbox" id="'.$p['name'].'" name="'.$p['name'].'" value="1" id="'.$p['name'].'"'.($checked ? ' checked="checked"' : '').'/>
-                ' . (isset($p['text']) && $p['text'] ? '<label class="checkbox_label" for="'.$p['name'].'">'.$p['text'].'</label>' : '') . '
-                <div class="clear"></div>
+        }
+        $this->_html .='
+            <div class="checkbox '.(isset($p['class-group'])?$p['class-group']:'').'">                
+                ' . (isset($p['text']) && $p['text'] ? ' <label class="control-label '.(isset($p['label-class']) ? $p['label-class'] : '').'" for="'.(isset($p['id']) ? $p['id'] : $p['name']).'">': '') .
+                '<input type="checkbox" id="'.$p['name'].'" name="'.$p['name'].'" value="1" id="'.$p['name'].'"'.($checked ? ' checked="checked"' : '').'/>' .
+                (isset($p['text']) && $p['text'] ? $p['text'].'</label>' : '') . '
                 ' . ((isset($p['hint']) && $p['hint']) ? '<p class="small">'.$p['hint'].'</p>' : '') . '
                 ' . ((isset($p['html']) && $p['html']) ? $p['html'] : '') . '
                 <div class="clear"></div>

adm/tabs/AdminCustomerThreads.php

@@ -38,17 +38,21 @@ class AdminCustomerThreads extends AdminTab
 	 	$this->view = true;
 	 	$this->delete = true;
 
- 		$this->_select = 'CONCAT(c.firstname," ",c.lastname) as customer, cl.name as contact, l.name as language, group_concat(message) as messages, (
-			SELECT IFNULL(CONCAT(LEFT(e.firstname, 1),". ",e.lastname), "--")
-			FROM '._DB_PREFIX_.'customer_message cm2 INNER JOIN '._DB_PREFIX_.'employee e ON e.id_employee = cm2.id_employee
-			WHERE cm2.id_employee > 0 AND cm2.`id_customer_thread` = a.`id_customer_thread`
-			ORDER BY cm2.date_add DESC LIMIT 1) as employee';
+ 		$this->_select = '
+			CONCAT(c.firstname, " ", c.lastname) as customer, cl.name as contact,
+			l.name as language, group_concat(message) as messages,
+			(SELECT IFNULL(CONCAT(LEFT(e.firstname, 1), ". ", e.lastname), "--")
+				FROM '._DB_PREFIX_.'customer_message cm2 INNER JOIN '._DB_PREFIX_.'employee e ON e.id_employee = cm2.id_employee
+				WHERE cm2.id_employee > 0 AND cm2.`id_customer_thread` = a.`id_customer_thread`
+				ORDER BY cm2.date_add DESC LIMIT 1
+			) as employee';
+ 		
 		$this->_group = 'GROUP BY cm.id_customer_thread';
 		$this->_join = '
-		LEFT JOIN `'._DB_PREFIX_.'customer` c ON c.`id_customer` = a.`id_customer`
-		LEFT JOIN `'._DB_PREFIX_.'customer_message` cm ON cm.`id_customer_thread` = a.`id_customer_thread`
-		LEFT JOIN `'._DB_PREFIX_.'lang` l ON l.`id_lang` = a.`id_lang`
-		LEFT JOIN `'._DB_PREFIX_.'contact_lang` cl ON (cl.`id_contact` = a.`id_contact` AND cl.`id_lang` = '.(int)$cookie->id_lang.')';
+			LEFT JOIN `'._DB_PREFIX_.'customer` c ON c.`id_customer` = a.`id_customer`
+			LEFT JOIN `'._DB_PREFIX_.'customer_message` cm ON cm.`id_customer_thread` = a.`id_customer_thread`
+			LEFT JOIN `'._DB_PREFIX_.'lang` l ON l.`id_lang` = a.`id_lang`
+			LEFT JOIN `'._DB_PREFIX_.'contact_lang` cl ON (cl.`id_contact` = a.`id_contact` AND cl.`id_lang` = '.(int)$cookie->id_lang.')';
 
 		$contactArray = array();
 		$contacts = Contact::getContacts($cookie->id_lang);
@@ -267,7 +271,7 @@ class AdminCustomerThreads extends AdminTab
 			SELECT cl.*
 			FROM '._DB_PREFIX_.'contact ct
 			LEFT JOIN '._DB_PREFIX_.'contact_lang cl ON (cl.id_contact = ct.id_contact AND cl.id_lang = '.$cookie->id_lang.')
-			WHERE ct.customer_service = 1');
+			ORDER BY ct.`position` ASC');
 		$dim = count($categories);
 
 		echo '<div style="float:left;border:0;width:640px;" class="tab_customer_thread">';

adm/tabs/AdminDiscounts.php

@@ -381,10 +381,11 @@ class AdminDiscounts extends AdminTab
 						function fillCustomersAjax()
 						{
 							var filterValue = \''.(($value = (int)($this->getFieldValue($obj, 'id_customer'))) ? '0_'.$value : (($value = (int)($this->getFieldValue($obj, 'id_group'))) ? '1_'.$value : '')).'\';
-							if ($(\'#filter\').val())
+							if ($(\'#filter\').val()) {
 								filterValue = $(\'#filter\').val();
-
-							$.getJSON("'.dirname($currentIndex).'/ajax.php",{ajaxDiscountCustomers:1,filter:filterValue},
+							}
+							$.ajaxSetup({ cache: false });
+							$.getJSON("'.dirname($currentIndex).'/ajax.php", {ajaxDiscountCustomers:1, filter:filterValue},
 								function(obj) {
 									var groups_length = obj.groups.length;
 									if (obj.groups.length == 0)

adm/tabs/AdminOrders.php

@@ -462,9 +462,8 @@ class AdminOrders extends AdminTab
             header('Location: '.$_SERVER['REQUEST_URI']);
             exit;
         }
-
-
-        /* Change order state, add a new entry in order history and send an e-mail to the customer if needed */
+        
+        // Change order state, add a new entry in order history and send an e-mail to the customer if needed
         elseif (Tools::isSubmit('submitState') AND ($id_order = (int)(Tools::getValue('id_order'))) AND Validate::isLoadedObject($order = new Order($id_order)))
         {
             if ($this->tabAccess['edit'] === '1')
@@ -507,7 +506,7 @@ class AdminOrders extends AdminTab
                 $this->_errors[] = Tools::displayError('You do not have permission to edit here.');
         }
 
-        /* Add a new message for the current order and send an e-mail to the customer if needed */
+        // Add a new message for the current order and send an e-mail to the customer if needed
         elseif (isset($_POST['submitMessage']))
         {
             $_GET['view'.$this->table] = true;
@@ -562,8 +561,7 @@ class AdminOrders extends AdminTab
             else
                 $this->_errors[] = Tools::displayError('You do not have permission to delete here.');
         }
-
-        /* Cancel product from order */
+        // Cancel product from order
         elseif (Tools::isSubmit('cancelProduct') AND Validate::isLoadedObject($order = new Order((int)(Tools::getValue('id_order')))))
         {
             if ($this->tabAccess['delete'] === '1')
@@ -609,6 +607,7 @@ class AdminOrders extends AdminTab
 
                         }
                     }
+                    
                     if ($customizationList)
                     {
                         $customization_quantities = Customization::retrieveQuantitiesFromIds(array_keys($customizationList));
@@ -627,6 +626,7 @@ class AdminOrders extends AdminTab
                     }
 
                     if (!sizeof($this->_errors) AND $productList)
+                    {
                         foreach ($productList AS $key => $id_order_detail)
                         {
                             $qtyCancelProduct = abs($qtyList[$key]);
@@ -648,21 +648,20 @@ class AdminOrders extends AdminTab
                             );
 
                             // Reinject product
-                            if (
-                                !$order->hasBeenDelivered()
-                                OR ($order->hasBeenDelivered() AND Tools::isSubmit('reinjectQuantities') AND !$is_philea AND !$is_braderie)
-                            ){
-                                if(
-                                    (($is_philea || $is_braderie) && !$order->hasBeenShipped() && !$order->hasBeenDelivered())
-                                    || (!$is_philea && !$is_braderie)
-                                ){
+                            if (!$order->hasBeenDelivered() || ($order->hasBeenDelivered()
+                                && Tools::isSubmit('reinjectQuantities')
+                                && !$is_philea && !$is_braderie) ) {
+
+                                if ( (($is_philea || $is_braderie) && !$order->hasBeenShipped() && !$order->hasBeenDelivered())
+                                    || (!$is_philea && !$is_braderie) ){
+                                    
                                     $reinjectableQuantity = (int)($orderDetail->product_quantity) - (int)($orderDetail->product_quantity_reinjected);
                                     $quantityToReinject = $qtyCancelProduct > $reinjectableQuantity ? $reinjectableQuantity : $qtyCancelProduct;
 
-                                    if (!Product::reinjectQuantities($orderDetail, $quantityToReinject))
+                                    if (!Product::reinjectQuantities($orderDetail, $quantityToReinject)) {
                                         $this->_errors[] = Tools::displayError('Cannot re-stock product').' <span class="bold">'.$orderDetail->product_name.'</span>';
-                                    else
-                                    {
+                                    }
+                                    else {
                                         $updProductAttributeID = !empty($orderDetail->product_attribute_id) ? (int)($orderDetail->product_attribute_id) : NULL;
                                         $newProductQty = Product::getQuantity((int)($orderDetail->product_id), $updProductAttributeID);
                                         $product = get_object_vars(new Product((int)($orderDetail->product_id), false, (int)($cookie->id_lang)));
@@ -682,44 +681,48 @@ class AdminOrders extends AdminTab
                             }
 
                             // Delete product
-                            if (!$order->deleteProduct($order, $orderDetail, $qtyCancelProduct))
+                            if (!$order->deleteProduct($order, $orderDetail, $qtyCancelProduct)) {
                                 $this->_errors[] = Tools::displayError('An error occurred during deletion of the product.').' <span class="bold">'.$orderDetail->product_name.'</span>';
+                            }
+                            
                             Module::hookExec('cancelProduct', array('order' => $order, 'id_order_detail' => $id_order_detail));
                         }
-
-                    if (!sizeof($this->_errors) AND $customizationList)
-                        foreach ($customizationList AS $id_customization => $id_order_detail)
-                        {
+                    }
+                    
+                    if (!sizeof($this->_errors) AND $customizationList) {
+                        foreach ($customizationList AS $id_customization => $id_order_detail) {
                             $orderDetail = new OrderDetail((int)($id_order_detail));
                             $qtyCancelProduct = abs($customizationQtyList[$id_customization]);
-                            if (!$order->deleteCustomization($id_customization, $qtyCancelProduct, $orderDetail))
+                            if (!$order->deleteCustomization($id_customization, $qtyCancelProduct, $orderDetail)) {
                                 $this->_errors[] = Tools::displayError('An error occurred during deletion of product customization.').' '.$id_customization;
+                            }
                         }
+                    }
+                    
+                    // Remboursement, Bon de réduction
+                    if (!sizeof($this->_errors) && (isset($_POST['generateCreditSlip'])
+                        || isset($_POST['generateDiscount'])
+                        || isset($_POST['generateDiscount2']))) {
 
-                    // E-mail params
-                    if ((isset($_POST['generateCreditSlip']) OR isset($_POST['generateDiscount']) OR isset($_POST['generateDiscount2'])) AND !sizeof($this->_errors))
-                    {
                         $customer = new Customer((int)($order->id_customer));
                         $params['{lastname}'] = $customer->lastname;
                         $params['{firstname}'] = $customer->firstname;
                         $params['{id_order}'] = $order->id;
 
-                        /* PRODUIT REMBOURSE */
+                        // Refund products
                         $products_refund = "";
                         $total_refund = 0;
                         foreach ($productList as $key => $id_order_detail) {
                             $details_refund = new OrderDetail($id_order_detail);
-
                             $tprice = $details_refund->product_price * (1 - $details_refund->reduction_percent / 100) - $details_refund->reduction_amount;
-                            $tprice = $tprice * ( 1+ $details_refund->tax_rate / 100 );
-
+                            $tprice = $tprice * ( 1 + $details_refund->tax_rate / 100 );
                             $products_refund .= "
-                                    <tr>
-                                        <td>". $details_refund->product_name . "</td>
-                                        <td style='text-align:right;'>" . Tools::displayPrice($tprice) . " </td>
-                                        <td style='text-align:right;'>". (int)$full_quantity_list[$id_order_detail] ."</td>
-                                        <td style='text-align:right;'>" . Tools::displayPrice(($tprice * (int)$full_quantity_list[$id_order_detail])) . "</td>
-                                    </tr>
+								<tr>
+									<td>". $details_refund->product_name . "</td>
+                                	<td style='text-align:right;'>" . Tools::displayPrice($tprice) . " </td>
+                                    <td style='text-align:right;'>". (int)$full_quantity_list[$id_order_detail] ."</td>
+                                    <td style='text-align:right;'>" . Tools::displayPrice(($tprice * (int)$full_quantity_list[$id_order_detail])) . "</td>
+								</tr>
                             ";
                             $total_refund = $total_refund + ($tprice * (int)$full_quantity_list[$id_order_detail]);
                         }
@@ -728,62 +731,52 @@ class AdminOrders extends AdminTab
                         $params['{total_products}'] = Tools::displayPrice($total_refund);
 
                         $fraisport = "";
-                        if(isset($_POST['shippingBack']))
-                        {
+                        if (isset($_POST['shippingBack'])) {
                             $order = new Order($details_refund->id_order);
-                            Module::hookExec('cancelShipping', array('order' => $order));
                             $fraisport .= "
-                                    <tr style='text-align:right;'>
-                                        <td colspan='3' style='background-color:#e2e2e1; padding:0.6em 0.4em;'>Frais de port</td>
-                                        <td style='background-color:#e2e2e1; padding:0.6em 0.4em;'>" . Tools::displayPrice($order->total_shipping) . "</td>
-                                    </tr>
+								<tr style='text-align:right;'>
+                                	<td colspan='3' style='background-color:#e2e2e1; padding:0.6em 0.4em;'>Frais de port</td>
+									<td style='background-color:#e2e2e1; padding:0.6em 0.4em;'>" . Tools::displayPrice($order->total_shipping) . "</td>
+								</tr>
                             ";
+                            // Remboursement frais de port
+                            Module::hookExec('cancelShipping', array('order' => $order));
                         }
-
                         $params['{fraisport}'] = $fraisport;
-
                     }
 
                     // Generate voucher
                     if (isset($_POST['generateDiscount']) AND !sizeof($this->_errors))
                     {
-                        if (!$voucher = Discount::createOrderDiscount($order, $full_product_list, $full_quantity_list, $this->l('Geste commercial concernant la commande '), isset($_POST['shippingBack'])))
+                        if (!$voucher = Discount::createOrderDiscount($order, $full_product_list, $full_quantity_list, $this->l('Geste commercial concernant la commande '), isset($_POST['shippingBack']))) {
                             $this->_errors[] = Tools::displayError('Cannot generate voucher');
-                        else
-                        {
-                            // $currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
-                            // $params['{voucher_amount}'] = Tools::displayPrice($voucher->value, $currency, false);
-                            // $params['{voucher_num}'] = $voucher->name;
-                            // @Mail::Send((int)($order->id_lang), 'voucher', Mail::l('New voucher regarding your order'),
-                            // $params, $customer->email, $customer->firstname.' '.$customer->lastname, NULL, NULL, NULL,
-                            // NULL, _PS_MAIL_DIR_, true);
-
-                            /* MODIF MAIL ANTADIS */
-
+                        }
+                        else {
+                            // Modif ANTADIS
                             $currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
                             $params['{voucher_amount}'] = Tools::displayPrice($voucher->value, $currency, false);
                             $params['{voucher_num}'] = $voucher->name;
                             $params['{voucher_value}'] = $voucher->value;
                             @Mail::Send((int)($order->id_lang), 'refundorder', Mail::l('New voucher regarding your order'),
-                            $params, $customer->email, $customer->firstname.' '.$customer->lastname, NULL, NULL, NULL,
-                            NULL, _PS_MAIL_DIR_, true);
+                                $params, $customer->email, $customer->firstname.' '.$customer->lastname, NULL, NULL, NULL,
+                                NULL, _PS_MAIL_DIR_, true);
                         }
                     }
 
                     // Generate voucher 2 @Addition Antadis
                     if (isset($_POST['generateDiscount2']) AND !sizeof($this->_errors))
                     {
-                        if (!$voucher = Discount::createOrderDiscount($order, $full_product_list, $full_quantity_list, $this->l('Geste commercial concernant la commande '), isset($_POST['shippingBack']),0,0,5))
+                        if (!$voucher = Discount::createOrderDiscount($order, $full_product_list, $full_quantity_list, $this->l('Geste commercial concernant la commande '), isset($_POST['shippingBack']),0,0,5)) {
                             $this->_errors[] = Tools::displayError('Cannot generate voucher');
-                        else
-                        {
+                        }
+                        else {
                             $currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
                             $params['{voucher_amount}'] = Tools::displayPrice($voucher->value, $currency, false);
                             $params['{voucher_num}'] = $voucher->name;
                             $params['{voucher_value}'] = $voucher->value;
                             @Mail::Send((int)($order->id_lang), 'refundorder', Mail::l('New voucher regarding your order'),
-                            $params, $customer->email, $customer->firstname.' '.$customer->lastname, NULL, NULL, NULL,
-                            NULL, _PS_MAIL_DIR_, true);
+                                $params, $customer->email, $customer->firstname.' '.$customer->lastname, NULL, NULL, NULL,
+                                NULL, _PS_MAIL_DIR_, true);
                         }
                     }
 
@@ -805,9 +798,36 @@ class AdminOrders extends AdminTab
                                 _PS_MAIL_DIR_, true);
                         }
                     }
+                    
+                    // Auto refund state
+                    if ($order->getCurrentState() != (int)Configuration::get('PS_OS_REFUND')) {
+                    	$refundIsFull = false;
+                    	$orderSlip = OrderSlip::getOrdersSlip($order->id_customer, $order->id);
+                    	if (count($orderSlip) == 1) {
+                    		$slip = $orderSlip[0];
+                    		if ($slip['shipping_cost'] == 1) {
+		                    	$orderProducts = $order->getProductsDetail();
+		                    	$refundIsFull = true;
+		                    	foreach ($orderProducts as $k => $line) {
+		                    		if ($line['product_quantity'] != $line['product_quantity_refunded']) {
+		                    			$refundIsFull = false;
+		                    			break;
+		                    		}
+		                    	}
+                    		}
+                    	}
+                    	// Change order state
+                    	if ($refundIsFull === true) {
+							$history = new OrderHistory();
+		                    $history->id_order = (int)($order->id);
+		                    $history->id_employee = (int)($cookie->id_employee);
+							$history->changeIdOrderState((int)Configuration::get('PS_OS_REFUND'), (int)($order->id));
+							$history->add();
+			            }
+                    }
 
-                    // update order state if it's partial
-                    if($order->getCurrentState() == 17) {
+                    // Update order state if it's partial
+                    if ($order->getCurrentState() == 17) {
                         $partial = true;
 
                         $to_send = Db::getInstance()->ExecuteS('
@@ -817,14 +837,15 @@ class AdminOrders extends AdminTab
                             AND (`product_quantity` - IF(`product_quantity_return` > 0, `product_quantity_return`, `product_quantity_refunded`)) > 0
                         ');
 
-                        if(count($to_send) == 0) {
+                        if (count($to_send) == 0) {
                             $partial = false;
-                        } else {
+                        }
+                        else {
                             include_once dirname(__FILE__).'/../../modules/privatesales/Sale.php';
                             $quantities_sent = array();
 
                             $product_ids = array();
-                            foreach(Db::getInstance()->ExecuteS('
+                            foreach (Db::getInstance()->ExecuteS('
                                 SELECT `product_id`
                                 FROM `'._DB_PREFIX_.'order_detail`
                                 WHERE `id_order` = '.(int) $order->id.'
@@ -832,15 +853,13 @@ class AdminOrders extends AdminTab
                                 $product_ids[] = (int) $row['product_id'];
                             }
 
-                            /**
-                            * @Override Philea
-                            */
-                            if(Db::getInstance()->getRow('
+                            // @Override Philea
+                            if (Db::getInstance()->getRow('
                                 SELECT *
                                 FROM `'._DB_PREFIX_.'philea_parcel`
                                 WHERE `id_order` = '.(int) $order->id.'
                             ')) {
-                                foreach(Db::getInstance()->ExecuteS('
+                                foreach (Db::getInstance()->ExecuteS('
                                     SELECT c.`id_product`
                                     FROM `'._DB_PREFIX_.'product_ps_cache` c
                                     WHERE c.`id_product` IN ('.implode(', ', $products_ids).')
@@ -856,7 +875,7 @@ class AdminOrders extends AdminTab
                                 }
                             }
 
-                            if(count($parcel_quantities) > 0) {
+                            if (count($parcel_quantities) > 0) {
                                 $partial = false;
                                 $sent_logistics = array();
 
@@ -887,7 +906,7 @@ class AdminOrders extends AdminTab
                                     $sent_logistics[(int) $row['id_order_detail']] = (int) $row['quantity'];
                                 }
 
-                                if(count($sent_logistics) == 0) {
+                                if (count($sent_logistics) == 0) {
                                     $partial = true;
                                 } else {
                                     foreach($parcel_quantities as $k => $v) {
@@ -906,7 +925,7 @@ class AdminOrders extends AdminTab
                                 $partial = false;
                             }
 
-                            if(!$partial) {
+                            if (!$partial) {
                                 global $cookie;
                                 Db::getInstance()->ExecuteS('
                                     INSERT INTO `'._DB_PREFIX_.'order_history`
@@ -930,25 +949,32 @@ class AdminOrders extends AdminTab
                                     `date_upd` = NOW()
                                 ');
                                 $newOS = new OrderState((int)(Configuration::get('PS_OS_SHIPPING')), $order->id_lang);
-                                Module::hookExec('updateOrderStatus', array('newOrderStatus' => $newOS, 'id_order' => (int)($order->id)));
+                                Module::hookExec('updateOrderStatus', array(
+                                	'newOrderStatus' => $newOS,
+                                	'id_order' => (int)$order->id
+                                ));
                             }
                         }
                     }
+                    
                 }
-                else
+                else {
                     $this->_errors[] = Tools::displayError('No product or quantity selected.');
+                }
 
                 // Redirect if no errors
-                if (!sizeof($this->_errors))
+                if (!sizeof($this->_errors)) {
                     Tools::redirectAdmin($currentIndex.'&id_order='.$order->id.'&vieworder&conf=24&token='.$this->token);
+                }
             }
-            else
+            else {
                 $this->_errors[] = Tools::displayError('You do not have permission to delete here.');
+            }
         }
-        elseif (isset($_GET['messageReaded']))
-        {
+        elseif (isset($_GET['messageReaded'])) {
             Message::markAsReaded((int)($_GET['messageReaded']), (int)($cookie->id_employee));
         }
+        
         parent::postProcess();
     }
 
@@ -1579,7 +1605,7 @@ class AdminOrders extends AdminTab
                                         $html .= '
                                         </div>
                                     </form>';
-                                    if($order->module && $order->module=="paypal"){
+                                    if($order->module && $order->module == "paypal"){
                                         $html.='
                                         <form style="margin-top:10px;" action="" method="post" id="form_refund_paypal">
                                             <div class="form-horizontal text-right col-md-offset-9 col-md-3">
@@ -1624,42 +1650,28 @@ class AdminOrders extends AdminTab
                                             </div>';
                                         }
                                         $html .= '<div style="padding:10px 20px;background:#efefef;font-size: 12px;" '.(sizeof($slips)?'class="col-md-8"':'').'>';
-                                        if($order->module && $order->module=="paybox"){
+                                        $refundsMethod = array();
+                                        if ($order->module == "paybox") {
                                             require_once dirname(__FILE__).'/../../modules/paybox/paybox.php';
-                                            $refundsPaybox = Paybox::getAllRefundbyOrder($order->id);
-                                            if (sizeof($refundsPaybox))
-                                            {
-                                                $html .='<table class="table table-condensed" width="100%;" cellspacing="0" cellpadding="0">';
-                                                foreach ($refundsPaybox as $refund) {
-                                                    $html .='
+                                            $refundsMethod = Paybox::getAllRefundbyOrder($order->id);
+                                        } elseif ($order->module == "paypal") {
+                                        	require_once dirname(__FILE__).'/../../modules/paypal/paypal.php';
+                                        	$refundsMethod = Paypal::getAllRefundbyOrder($order->id);
+                                        }
+                                        if (count($refundsMethod) > 0) {
+											$html .='<table class="table table-condensed" width="100%;" cellspacing="0" cellpadding="0">';
+											foreach ($refundsMethod as $refund) {
+												$html .='
                                                     <tr>
-                                                        <td><b>'.(!empty($refund['product_name'])?$refund['product_name']:'Frais de port').'</b></td>
+                                                        <td><b>'.(!empty($refund['product_name']) ? $refund['product_name'] : 'Frais de port').'</b></td>
                                                         <td>'. $refund['amount'] / 100 . '€</td>
                                                     </tr>';
-                                                }
-                                                $html .='</table>';
-                                            } else {
-                                                $html .= '<p class="text-center">Pas de remboursement</p>';
-                                            }
-                                        } elseif($order->module && $order->module=="paypal") {
-                                            $paypal_messages = Db::getInstance()->ExecuteS('
-                                                SELECT `message`, `date_add`
-                                                FROM `ps_message`
-                                                WHERE `id_order` = '.$order->id.'
-                                                AND (`message` LIKE "%Refund operation%" || `message` LIKE "%Cancel products%")
-                                                ORDER BY `date_add` DESC
-                                            ');
-                                            if($paypal_messages && !empty($paypal_message)) {
-                                                foreach ($paypal_message as $message) {
-                                                    $html .= '<p>('.date('d/m/Y',strtotime($message['message'])).'):<br>'.$message['message'].'</p>';
-                                                }
-                                            }
-                                            if(empty($paypal_messages)){
-                                                $html .= '<p class="text-center">Pas de remboursement</p>';
-                                            }
-
-                                        }
-                                    $html .='</div>
+											}
+											$html .='</table>';
+										} else {
+											$html .= '<p class="text-center">Pas de remboursement</p>';
+										}
+                                    	$html .='</div>
                                     </div>
                                 </div>
                             </div>
@@ -1715,8 +1727,7 @@ class AdminOrders extends AdminTab
                     </div>
                     <div class="panel-content">';
                     if (sizeof($messages)) {
-                        foreach ($messages as $message)
-                        {
+                        foreach ($messages as $message) {
                             $html.= '<div style="background:#efefef;padding:5px;margin-bottom:10px;overflow:auto;" '.($message['is_new_for_me'] ?'class="new_message"':'').'>';
                                 if ($message['is_new_for_me']){
                                     $html.= '<a class="new_message" title="'.$this->l('Mark this message as \'viewed\'').'" href="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'&token='.$this->token.'&messageReaded='.(int)($message['id_message']).'"><img src="../img/admin/enabled.gif" alt="" /></a>';
@@ -3007,12 +3018,24 @@ class AdminOrders extends AdminTab
                     AND `MR_Selected_Num` IS NOT NULL
                 ');
                 if($mr) {
+                	switch ($mr['MR_Selected_Pays']) {
+						case 'FR':
+							$mr['MR_Selected_Pays_Display'] = 'FRANCE';
+							break;
+						case 'ES':
+							$mr['MR_Selected_Pays_Display'] = 'ESPAGNE';
+							break;
+						default:
+							$mr['MR_Selected_Pays_Display'] = '..';
+							break;
+					}
+
                     $order_address = nl2br(preg_replace("/(\r\n){2,}/", "\r\n", implode("\r\n", array(
                         $mr['MR_Selected_LgAdr1'],
                         $mr['MR_Selected_LgAdr2'],
                         $mr['MR_Selected_LgAdr3'] . ' ' . $mr['MR_Selected_LgAdr4'],
                         $mr['MR_Selected_CP'] . ' ' . $mr['MR_Selected_Ville'],
-                        'FRANCE',
+                        $mr['MR_Selected_Pays_Display'],
                         'Point Relais : '.$mr['MR_Selected_Num']
                     ))));
                 } else {

classes/Order.php

@@ -184,7 +184,7 @@ class OrderCore extends ObjectModel
 	/* MySQL does not allow 'order' for a table name */
 	protected 	$table = 'orders';
 	protected 	$identifier = 'id_order';
-	protected		$_taxCalculationMethod = PS_TAX_EXC;
+	protected	$_taxCalculationMethod = PS_TAX_EXC;
 
 	protected static $_historyCache = array();
 
@@ -449,9 +449,9 @@ class OrderCore extends ObjectModel
 		if ($row['group_reduction'] > 0)
 		{
 			if ($this->_taxCalculationMethod == PS_TAX_EXC)
-				$row['product_price'] = $row['product_price'] * $group_reduction; 
+				$row['product_price'] = $row['product_price'] * $group_reduction;
 			else
-				$row['product_price_wt'] = Tools::ps_round($row['product_price_wt'] * $group_reduction , 2); 
+				$row['product_price_wt'] = Tools::ps_round($row['product_price_wt'] * $group_reduction , 2);
 		}
 
 		if (($row['reduction_percent'] OR $row['reduction_amount'] OR $row['group_reduction']) AND $this->_taxCalculationMethod == PS_TAX_EXC)
@@ -526,7 +526,7 @@ class OrderCore extends ObjectModel
 
 	/**
 	* Check if order contains (only) virtual products
-	* 
+	*
 	* @param boolean $strict If false return true if there are at least one product virtual
 	* @return boolean true if is a virtual order or false
 	*
@@ -922,7 +922,7 @@ class OrderCore extends ObjectModel
 				// I use mysql 4, I can't make sub query in FROM
 			$number = Order::getLastInvoiceNumber() + 1;
 			}
-			else 
+			else
 			$number = '(SELECT `invoice_number`
 						FROM (
 							SELECT MAX(`invoice_number`) + 1 AS `invoice_number`

classes/Tax.php

@@ -281,26 +281,26 @@ class TaxCore extends ObjectModel
 	 */
 	public static function getProductTaxRate($id_product, $id_address = NULL)
 	{
-  	      $id_country = (int)Country::getDefaultCountryId();
-         $id_state = 0;
-         $id_county = 0;
-         $rate = 0;
-         if (!empty($id_address))
-         {
-             $address_infos = Address::getCountryAndState($id_address);
-         	 if ($address_infos['id_country'])
-             {
-	          		$id_country = (int)($address_infos['id_country']);
-	               $id_state = (int)$address_infos['id_state'];
-	               $id_county = (int)County::getIdCountyByZipCode($address_infos['id_state'], $address_infos['postcode']);
+		$id_country = (int)Country::getDefaultCountryId();
+		$id_state = 0;
+		$id_county = 0;
+		$rate = 0;
+		if (!empty($id_address)) {
+			$address_infos = Address::getCountryAndState($id_address);
+			if ($address_infos['id_country']) {
+				$id_country = (int)($address_infos['id_country']);
+				$id_state = (int)$address_infos['id_state'];
+				$id_county = (int)County::getIdCountyByZipCode($address_infos['id_state'], $address_infos['postcode']);
              }
 
-		    if (!empty($address_infos['vat_number']) AND $address_infos['id_country'] != Configuration::get('VATNUMBER_COUNTRY') AND Configuration::get('VATNUMBER_MANAGEMENT'))
-				    return 0;
+             if (!empty($address_infos['vat_number']) AND $address_infos['id_country'] != Configuration::get('VATNUMBER_COUNTRY') AND Configuration::get('VATNUMBER_MANAGEMENT')) {
+             	return 0;
+             }
 		}
 
-	    if ($rate = Tax::getProductTaxRateViaRules((int)$id_product, (int)$id_country, (int)$id_state, (int)$id_county))
-	        return $rate;
+		if ($rate = Tax::getProductTaxRateViaRules((int)$id_product, (int)$id_country, (int)$id_state, (int)$id_county)) {
+			return $rate;
+		}
 
 		return $rate;
 	}

config/autoload.php

@@ -34,6 +34,9 @@ function __autoload($className)
         return true;
     }
 
+    if (function_exists('MathCaptcha\mathcaptchaAutoload') && MathCaptcha\mathcaptchaAutoload($className)) {
+    	return true;
+    }
 
 	$className = str_replace(chr(0), '', $className);
 	$classDir = dirname(__FILE__).'/../classes/';
@@ -42,24 +45,23 @@ function __autoload($className)
 	$file_in_classes = file_exists($classDir.$className.'.php');
 
 	// This is a Core class and its name is the same as its declared name
-	if (substr($className, -4) == 'Core')
+	if (substr($className, -4) == 'Core') {
 		require_once($classDir.substr($className, 0, -4).'.php');
-	else
-	{
-		if ($file_in_override && $file_in_classes)
-		{
+	}
+	else {
+		if ($file_in_override && $file_in_classes) {
 			require_once($classDir.str_replace(chr(0), '', $className).'.php');
 			require_once($overrideDir.$className.'.php');
 		}
-		elseif (!$file_in_override && $file_in_classes)
-		{
+		elseif (!$file_in_override && $file_in_classes) {
 			require_once($classDir.str_replace(chr(0), '', $className).'.php');
 			$classInfos = new ReflectionClass($className.((interface_exists($className, false) or class_exists($className, false)) ? '' : 'Core'));
 			if (!$classInfos->isInterface() && substr($classInfos->name, -4) == 'Core')
 				eval(($classInfos->isAbstract() ? 'abstract ' : '').'class '.$className.' extends '.$className.'Core {}');
 		}
-		elseif ($file_in_override && !$file_in_classes)
+		elseif ($file_in_override && !$file_in_classes) {
 			require_once($overrideDir.$className.'.php');
+		}
 	}
 }
 

controllers/CategoryController.php

@@ -59,10 +59,18 @@ class CategoryControllerCore extends FrontController
 			$currentURL = preg_replace('/[?&].*$/', '', self::$link->getCategoryLink($this->category));
 			if (!preg_match('/^'.Tools::pRegexp($currentURL, '/').'([&?].*)?$/', Tools::getProtocol().$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']))
 			{
+    			$params = '';
+    			$excludedKey = array('isolang', 'id_lang', 'id_category');
+    			foreach($_GET as $key => $value) {
+    			    if(!in_array($key, $excludedKey)) {
+    			        $params .= ($params == '' ? '?' : '&').$key.'='.rawurlencode($value);
+    			    }
+    			}
+    			if (defined('_PS_MODE_DEV_') AND _PS_MODE_DEV_ ) {
+				    die('[Debug] This page has moved<br />Please use the following URL instead: <a href="'.$currentURL.$params.'">'.$currentURL.$params.'</a>');
+				}
 				header('HTTP/1.0 301 Moved');
-				if (defined('_PS_MODE_DEV_') AND _PS_MODE_DEV_ )
-					die('[Debug] This page has moved<br />Please use the following URL instead: <a href="'.$currentURL.'">'.$currentURL.'</a>');
-				Tools::redirectLink($currentURL);
+                Tools::redirectLink($currentURL.$params);
 			}
 		}
 	}
@@ -118,7 +126,7 @@ class CategoryControllerCore extends FrontController
 
 				$this->category->description = nl2br2($this->category->description);
 				$subCategories = $this->category->getSubCategories((int)self::$cookie->id_lang);
-				self::$smarty->assign('category', $this->category);	
+				self::$smarty->assign('category', $this->category);
 				
 				if (isset($subCategories) AND !empty($subCategories) AND $subCategories)
 				{

controllers/IdentityController.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -40,18 +40,20 @@ class IdentityControllerCore extends FrontController
 
 		if (sizeof($_POST))
 		{
-			$exclusion = array('secure_key', 
-									'old_passwd', 
-									'passwd', 
-									'active', 
-									'date_add', 
-									'date_upd', 
-									'last_passwd_gen', 
-									'newsletter_date_add', 
-									'id_default_group', 
-									'ip_registration_newsletter',
-									'note',
-									'is_guest');
+			$exclusion = array(
+			    'secure_key',
+				'old_passwd',
+				'passwd',
+				'active',
+				'date_add',
+				'date_upd',
+				'last_passwd_gen',
+				'newsletter_date_add',
+				'id_default_group',
+				'ip_registration_newsletter',
+				'note',
+				'is_guest'
+			);
 			$fields = $customer->getFields();
 			foreach ($fields AS $key => $value)
 				if (!in_array($key, $exclusion))

controllers/OrderDetailController.php

@@ -145,7 +145,7 @@ class OrderDetailControllerCore extends FrontController
 					'messages' => Message::getMessagesByOrderId((int)($order->id)),
 					'CUSTOMIZE_FILE' => _CUSTOMIZE_FILE_,
 					'CUSTOMIZE_TEXTFIELD' => _CUSTOMIZE_TEXTFIELD_,
-			'isRecyclable' => Configuration::get('PS_RECYCLABLE_PACK'),
+                    'isRecyclable' => Configuration::get('PS_RECYCLABLE_PACK'),
 					'use_tax' => Configuration::get('PS_TAX'),
 					'group_use_tax' => (Group::getPriceDisplayMethod($customer->id_default_group) == PS_TAX_INC),
 					'customizedDatas' => $customizedDatas));

controllers/PasswordController.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -35,71 +35,78 @@ class PasswordControllerCore extends FrontController
 	{
 		parent::process();
 
-		if (Tools::isSubmit('email'))
-		{
-			if (!($email = Tools::getValue('email')) OR !Validate::isEmail($email))
-				$this->errors[] = Tools::displayError('Invalid e-mail address');
-			else
-			{
-				$customer = new Customer();
-				$customer->getByemail($email);
-				if (!Validate::isLoadedObject($customer))
-					$this->errors[] = Tools::displayError('There is no account registered to this e-mail address.');
-				else
-				{
-					if ((strtotime($customer->last_passwd_gen.'+'.(int)($min_time = Configuration::get('PS_PASSWD_TIME_FRONT')).' minutes') - time()) > 0)
-						$this->errors[] = Tools::displayError('You can regenerate your password only every').' '.(int)($min_time).' '.Tools::displayError('minute(s)');
-					else
-					{	
-						if (Mail::Send((int)(self::$cookie->id_lang), 'password_query', Mail::l('Password query confirmation'), 
-						array('{email}' => $customer->email, 
-							  '{lastname}' => $customer->lastname, 
-							  '{firstname}' => $customer->firstname,
-							  '{url}' => self::$link->getPageLink('password.php', true).'?token='.$customer->secure_key.'&id_customer='.(int)$customer->id),
-						$customer->email, 
-						$customer->firstname.' '.$customer->lastname))
-							self::$smarty->assign(array('confirmation' => 2, 'email' => $customer->email));
-						else
-							$this->errors[] = Tools::displayError('Error occurred when sending the e-mail.');
-					}
-				}
-			}
+		// Check User Agent - no bot
+		$userAgent = $_SERVER['HTTP_USER_AGENT'];
+		if (strstr(strtolower($userAgent), 'bot')) {
+			$this->errors[] = Tools::displayError("Who are you ?");
 		}
-		elseif (($token = Tools::getValue('token')) && ($id_customer = (int)(Tools::getValue('id_customer'))))
-		{
-			$email = Db::getInstance()->getValue('SELECT `email` FROM '._DB_PREFIX_.'customer c WHERE c.`secure_key` = \''.pSQL($token).'\' AND c.id_customer = '.(int)$id_customer);
-			if ($email)
-			{
-				$customer = new Customer();
-				$customer->getByemail($email);
-				if ((strtotime($customer->last_passwd_gen.'+'.(int)($min_time = Configuration::get('PS_PASSWD_TIME_FRONT')).' minutes') - time()) > 0)
-					Tools::redirect('authentication.php?error_regen_pwd');
-				else
-				{
-					$customer->passwd = Tools::encrypt($password = Tools::passwdGen((int)MIN_PASSWD_LENGTH,'RANDOM'));
-					$customer->last_passwd_gen = date('Y-m-d H:i:s', time());
-					if ($customer->update())
-					{
-						if (Mail::Send((int)(self::$cookie->id_lang), 'password', Mail::l('Your password'), 
-						array('{email}' => $customer->email, 
-							  '{lastname}' => $customer->lastname, 
-							  '{firstname}' => $customer->firstname, 
-							  '{passwd}' => $password), 
-						$customer->email, 
-						$customer->firstname.' '.$customer->lastname)) 
-							self::$smarty->assign(array('confirmation' => 1, 'email' => $customer->email));
-						else
-							$this->errors[] = Tools::displayError('Error occurred when sending the e-mail.');
+		
+		if (empty($this->errors)) {
+			if (Tools::isSubmit('email')) {
+				if (!($email = Tools::getValue('email')) OR !Validate::isEmail($email)) {
+					$this->errors[] = Tools::displayError('Invalid e-mail address');
+				}
+				else {
+					$customer = new Customer();
+					$customer->getByemail($email);
+					if (!Validate::isLoadedObject($customer)) {
+						$this->errors[] = Tools::displayError('There is no account registered to this e-mail address.');
+					}
+					else {
+						if ((strtotime($customer->last_passwd_gen.'+'.(int)($min_time = Configuration::get('PS_PASSWD_TIME_FRONT')).' minutes') - time()) > 0) {
+							$this->errors[] = Tools::displayError('You can regenerate your password only every').' '.(int)($min_time).' '.Tools::displayError('minute(s)');
+						}
+						else {
+							if (Mail::Send((int)(self::$cookie->id_lang), 'password_query', Mail::l('Password query confirmation'),
+							array('{email}' => $customer->email,
+								  '{lastname}' => $customer->lastname,
+								  '{firstname}' => $customer->firstname,
+								  '{url}' => self::$link->getPageLink('password.php', true).'?token='.$customer->secure_key.'&id_customer='.(int)$customer->id),
+							$customer->email,
+							$customer->firstname.' '.$customer->lastname))
+								self::$smarty->assign(array('confirmation' => 2, 'email' => $customer->email));
+							else
+								$this->errors[] = Tools::displayError('Error occurred when sending the e-mail.');
+						}
 					}
-					else
-						$this->errors[] = Tools::displayError('An error occurred with your account and your new password cannot be sent to your e-mail. Please report your problem using the contact form.');
 				}
 			}
-			else
+			elseif (($token = Tools::getValue('token')) && ($id_customer = (int)(Tools::getValue('id_customer')))) {
+				$email = Db::getInstance()->getValue('SELECT `email` FROM '._DB_PREFIX_.'customer c WHERE c.`secure_key` = \''.pSQL($token).'\' AND c.id_customer = '.(int)$id_customer);
+				if ($email) {
+					$customer = new Customer();
+					$customer->getByemail($email);
+					if ((strtotime($customer->last_passwd_gen.'+'.(int)($min_time = Configuration::get('PS_PASSWD_TIME_FRONT')).' minutes') - time()) > 0) {
+						Tools::redirect('authentication.php?error_regen_pwd');
+					}
+					else {
+						$customer->passwd = Tools::encrypt($password = Tools::passwdGen((int)MIN_PASSWD_LENGTH,'RANDOM'));
+						$customer->last_passwd_gen = date('Y-m-d H:i:s', time());
+						if ($customer->update())
+						{
+							if (Mail::Send((int)(self::$cookie->id_lang), 'password', Mail::l('Your password'),
+							array('{email}' => $customer->email,
+								  '{lastname}' => $customer->lastname,
+								  '{firstname}' => $customer->firstname,
+								  '{passwd}' => $password),
+							$customer->email,
+							$customer->firstname.' '.$customer->lastname))
+								self::$smarty->assign(array('confirmation' => 1, 'email' => $customer->email));
+							else
+								$this->errors[] = Tools::displayError('Error occurred when sending the e-mail.');
+						}
+						else
+							$this->errors[] = Tools::displayError('An error occurred with your account and your new password cannot be sent to your e-mail. Please report your problem using the contact form.');
+					}
+				}
+				else {
+					$this->errors[] = Tools::displayError('We cannot regenerate your password with the data you submitted');
+				}
+			}
+			elseif (($token = Tools::getValue('token')) || ($id_customer = Tools::getValue('id_customer'))) {
 				$this->errors[] = Tools::displayError('We cannot regenerate your password with the data you submitted');
+			}
 		}
-		elseif (($token = Tools::getValue('token')) || ($id_customer = Tools::getValue('id_customer')))
-			$this->errors[] = Tools::displayError('We cannot regenerate your password with the data you submitted');
 	}
 	
 	public function displayContent()

mails/en/in_transit_dropshipping_noinfo.html

@@ -0,0 +1,51 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Message de {shop_name}</title>
+</head>
+<body>
+    <table style="font-family: tahoma,arial,sans-serif; font-size: 12px; color:#000000; width: 550px;">
+        <tr>
+            <td align="left">
+                <a href="{shop_url}" title="{shop_name}"><img alt="{shop_name}" src="{shop_logo}" style="border:none;" ></a>
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="left">Bonjour <strong>{firstname} {lastname}</strong>,</td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="left">
+                Vous avez pass&eacute; commande r&eacute;cemment sur notre site B&eacute;b&eacute; Boutik. 
+                Nous vous informons que le/les produits de la marque {sale} pour votre commande n&#176;{id_order} vient d'être envoy&eacute; directement de chez notre fournisseur.
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="left">
+                Vous recevrez votre commande prochainement.
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="left">
+               A très vite sur B&eacute;b&eacute; Boutik !
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="left">
+               Cordialement,
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="center" style="font-size: 12px; border-top: 1px solid #cccccc; padding-top: 5px;">
+                {shop_name} - <a href="{shop_url}" style="color: #e26ea2;">{shop_url}</a>
+            </td>
+        </tr>
+    </table>
+</body>
+</html>

mails/en/in_transit_dropshipping_noinfo.txt

@@ -0,0 +1,11 @@
+Bonjour {firstname} {lastname}
+
+Vous avez passé commande récemment sur notre site Bébé Boutik. Nous vous informons que le/les produits de la marque {sale} pour votre commande n°{id_order} vient d'être envoyé directement de chez notre fournisseur.
+
+Vous recevrez votre commande prochainement.
+
+A très vite sur Bébé Boutik !
+
+Cordialement,
+
+{shop_name} - {shop_url}

mails/es/account.html

@@ -1,52 +1,82 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>Mensaje desde {shop_name}</title>
-</head>
-<body>
-	<table style="font-family: tahoma,arial,sans-serif; font-size: 12px; color:#000000; width: 550px;">
-<tbody>
-<tr>
-<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
-</tr>
-<tr>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td align="left">Hola <strong>{firstname} {lastname}</strong>,</td>
-</tr>
-<tr>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td style="background-color: #514c8c; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Detalles de tu cuenta</td>
-</tr>
-<tr>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td align="left">Email: <strong><span>{email}</span></strong> <br />Contrase&ntilde;a: <strong>{passwd}</strong></td>
-</tr>
-<tr>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td align="left"><strong>Consejos de Seguridad:</strong> <br /><br />Mant&eacute;n los datos de tu cuenta en un lugar seguro. <br />No des los detalles de tu cuenta a nadie. <br />Cambia tu contrase&ntilde;a regularmente. <br />Si sospechas que alguien está usando ilegalmente tu cuenta, av&iacute;sanos inmediatamente.</td>
-</tr>
-<tr>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td align="left">Ahora podr&aacute;s guardar y consultar tus pedidos en nuestra web: <a href="{shop_url}" style="color:#e26ea2">{shop_name}</a>.</td>
-</tr>
-<tr><td>&nbsp;</td></tr>
-	<tr>
-		<td align="center" style="font-size: 12px; border-top: 1px solid #cccccc; padding-top: 5px;">
-			{shop_name} - <a href="{shop_url}" style="color: #e26ea2;">{shop_url}</a>
-		</td>
-	</tr>
-</tbody>
-</table>
-</body>
-</html>
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Mensage de {shop_name}</title>
+	<style>
+		img { float: left; line-height: 0; font-size: 0; }
+	</style>
+</head>
+<body>
+<table style="font-family: tahoma,arial,sans-serif; font-size: 12px; color:#4d4b7d; width: 650px; border-collapse: collapse" border="0" cellpadding="0" cellspacing="0">
+	<tr>
+		<td align="left" colspan="3">
+			<a href="{shop_url}" title="{shop_name}"><img alt="{shop_name}" src="{shop_url}img/mails/bienvenue-ES_01.jpg" style="border:none;" ></a>
+		</td>
+	</tr>
+	<tr>
+		<td align="left" colspan="3">
+			<img alt="Bienvenudo" src="{shop_url}img/mails/bienvenue-ES_02.jpg" style="border:none;" />
+		</td>
+	</tr>		
+	<tr style="font-style: 0; border:none;">
+		<td width="112" align="left" style="width:112px;"><img src="{shop_url}img/mails/bienvenue-ES_05.jpg" style="border:none;" /></td>
+		<td  align="center" valign="middle"  style=" font-size: 13px; color: #4d4b7d;">
+			<font face="Open-sans, sans-serif">
+			Hola {firstname},<br/><br/>
+			Tu cuenta ha sido creada correctamente: ya eres miembro de Bebé Boutik, ¡el club de ventas privadas para bebés y niños de hasta 12 años!<br/><br/>
+			Aprovecha a partir de ahora de las mejores marcas ¡hasta -70%!
+			<br/><br/>
+			<a href="{shop_url}" style="text-transform: uppercase; color: #fff; text-decoration: none; background-color: #fb66a9; border-radius: 5px;padding: 3px 20px;">¡DESCUBRE! &gt;</a>
+			</font>
+		</td>
+		<td align="left" style="width:123px;"><img src="{shop_url}img/mails/bienvenue-ES_04.jpg" style="border:none;"/></td>
+	</tr>
+	<tr>
+		<td align="left" colspan="3"><img alt="4 buenas rezonas" src="{shop_url}img/mails/bienvenue-ES_08.jpg" style="border:none;"/></td>
+	</tr>
+	<tr>
+		<td colspan="3" align="center"><span style="color: #615e93; font-size: 20px;" >para aprovechar de las ventas privadas Bebé Boutik</span></td>
+	</tr>
+	<tr>
+		<td colspan="3" align="center" height="10"><span style="color: #615e93; font-size: 20px;">&nbsp;</td>
+	</tr>
+	<tr>
+		<td colspan="3"><img alt="reasura" src="{shop_url}img/mails/bienvenue-ES_12.jpg" style="border:none;" /></td>
+	</tr>
+	<tr>
+		<td colspan="3">
+			<table style="font-size: 12px;">
+				<tr align="center">
+					<td width="25">&nbsp;</td>
+					<td width="110"><span>Ofertas de <br/> hasta <strong color="#fb66a9" style="color: #fb66a9">-70%</strong></span></td>
+					<td width="185"><strong color="#fb66a9" style="color: #fb66a9">Devoluciones gratis </strong>: <br/>¡Hasta 14 días si cambias de opinión!</td>
+					<td width="130">Pago <strong color="#fb66a9" style="color: #fb66a9">seguro</strong> <br/>PayPal & Tarjeta</td>
+					<td width="150"><strong color="#fb66a9" style="color: #fb66a9">Un Servicio al <br/>Cliente</strong> disponible</td>
+					<td width="25">&nbsp;</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="3">&nbsp;</td>
+	</tr>
+	<tr>
+		<td colspan="3" align="center"><img alt="Apadrina a tus amigos..." src="{shop_url}img/mails/bienvenue-ES_18.jpg" style="border:none;" /></td>
+	</tr>
+	<tr>
+		<td colspan="3" align="center">
+			<a href="{shop_url}modules/invite/invite-program.php" style="text-decoration: none;" title="Apadrina">
+				<img alt="y gana 10€" src="{shop_url}img/mails/bienvenue-ES_20.jpg" style="border:none;" />
+			</a>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			&nbsp;
+		</td>
+	</tr>
+
+</table>
+</body>
+</html>

mails/es/account.txt

@@ -5,7 +5,6 @@ Gracias por crear tu cuenta en {shop_name}.
 Detalles de tu cuenta:
 
 Email: {email}
-Contraseña: {passwd}
  
 Ahora podrás guardar y consultar tus pedidos en nuestra web: {shop_url}
 

mails/es/in_transit_dropshipping_noinfo.html

@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Message de {shop_name}</title>
+</head>
+<body>
+    <table style="font-family: tahoma,arial,sans-serif; font-size: 12px; color:#000000; width: 550px;">
+        <tr>
+            <td align="left">
+                <a href="{shop_url}" title="{shop_name}"><img alt="{shop_name}" src="{shop_logo}" style="border:none;" ></a>
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="left">Buenos días <strong>{firstname} {lastname},</strong>,</td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="left">
+                Te informamos de que el/los producto(s) de la marca {sale} de tu pedido nº{id_order}, te los ha enviado directamente el proveedor a la dirección que nos has indicado.
+            </td>
+        </tr>        
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="left">
+                Recibirás tu pedido en breve.
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="left">
+               ¡Hasta pronto! ¡Nos vemos en Bébé Boutik!
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="center" style="font-size: 12px; border-top: 1px solid #cccccc; padding-top: 5px;">
+                {shop_name} - <a href="{shop_url}" style="color: #e26ea2;">{shop_url}</a>
+            </td>
+        </tr>
+    </table>
+</body>
+</html>

mails/es/in_transit_dropshipping_noinfo.txt

@@ -0,0 +1,11 @@
+Buenos días {firstname} {lastname},
+
+Recientemente has pasado pedido en Bébé Boutik y te damos las gracias.
+
+Te informamos de que el/los producto(s) de la marca {sale} de tu pedido nº{id_order}, te los ha enviado directamente el proveedor a la dirección que nos has indicado.
+
+Recibirás tu pedido en breve.
+
+¡Hasta pronto! ¡Nos vemos en Bébé Boutik!
+
+{shop_name} - {shop_url}

mails/es/lang.php

@@ -10,12 +10,11 @@ $_LANGMAIL['Virtual product to download'] = 'Producto virtual a descargar';
 $_LANGMAIL['Fwd: Customer message'] = 'Fw: Mensaje de cliente';
 $_LANGMAIL['Your guest account has been transformed to customer account'] = 'Su cuenta de invitado se transformo en cuenta de cliente';
 $_LANGMAIL['Package in transit'] = 'Paquete en transito';
-$_LANGMAIL['[Log'] = '[Log';
 $_LANGMAIL['Order confirmation'] = 'Confirmación de pedido';
 $_LANGMAIL['Message from a customer'] = 'Mensaje de un cliente';
 $_LANGMAIL['New message regarding your order'] = 'Nuevo mensaje en su orden';
 $_LANGMAIL['Your order return state has changed'] = 'El estado de retorno de su orden ha cambiado';
-$_LANGMAIL['Your password'] = 'Tu contrase<EFBFBD>a';
+$_LANGMAIL['Your password'] = 'Tu contraseña';
 $_LANGMAIL['Password query confirmation'] = 'Confirmación de password';
 $_LANGMAIL['An answer to your message is available'] = 'Hay una respuesta a su mensaje ';
 $_LANGMAIL['New voucher regarding your order'] = 'Nuevo cupon correspondiente a su orden';
@@ -24,7 +23,6 @@ $_LANGMAIL['Newsletter confirmation'] = 'Confirmación de newsletter';
 $_LANGMAIL['Newsletter voucher'] = 'Cupon de newsletter';
 $_LANGMAIL['Your wishlist\\\'s link'] = 'Su enlace de Lista de deseos';
 $_LANGMAIL['Message from '] = 'Mensaje de';
-$_LANGMAIL['$subject'] = '$subject';
 $_LANGMAIL['Your cart and your discount'] = 'Su cesta y su descuento';
 $_LANGMAIL['Thanks for your order'] = 'Gracias por su pedido';
 $_LANGMAIL['You are one of our best customers'] = 'Usted es uno de nuestros mejores clientes';
@@ -35,10 +33,6 @@ $_LANGMAIL['Error reporting from your PayPal module'] = 'Error desde el modulo p
 $_LANGMAIL['Congratulations!'] = 'Felicitaciones!';
 $_LANGMAIL['Referral Program'] = 'Programa de referidos';
 $_LANGMAIL['A friend sent you a link to'] = 'Un amigo te ha enviado un link';
-$_LANGMAIL['Log: You have a new alert from your shop'] = 'Log: Tiene un nuevo alerta desde su tienda';
-$_LANGMAIL['Message from \').$customer->lastname.\' '] = 'Mensaje de \').$customer->lastname.\'';
-$_LANGMAIL[' $subject'] = '$subject';
-$_LANGMAIL['A friend sent you a link to\').\' '] = 'Un amigo le envio un enlace a\').\'';
 $_LANGMAIL['New voucher after refund'] = 'Nuevo código de reducción tras su devolución';
 $_LANGMAIL['Your loyalty credits'] = 'Mi crédito de fidelidad';
 

mails/es/order_return_2.html

@@ -40,7 +40,7 @@
             <br /><br /><br />
             El dep&oacute;sito del paquete debe hacerse en uno de los 4 500 Puntos de Recogida&reg; de España.
             <br />
-            Encuentre la lista de puntos de recogida cerca de su casa haciendo <a href="http://www.puntopack.es/buscar-el-punto-pack-más-cercano/" target="_blank" style="color: #5082f5; text-decoration: none;">click aquí</a>
+            Encuentre la lista de puntos de recogida cerca de su casa haciendo <a href="https://www.puntopack.es/buscar-el-punto-pack-mas-cercano/" target="_blank" style="color: #5082f5; text-decoration: none;">click aquí</a>
             <br />
             El comerciante le entregará un comprobante que deberá conservar para justificar el dep&oacute;sito en caso de ser necesario.
             </td>

mails/es/order_return_2.txt

@@ -24,7 +24,7 @@ Pegue la etiqueta proporcionada por Mondial Relay en una de las caras visibles d
 El depósito del paquete debe hacerse en uno de los 4 500 Puntos de Recogida de España.
 Encuentre la lista de puntos de recogida cerca de su casa haciendo click aquí:
 
-http://www.puntopack.es/buscar-el-punto-pack-más-cercano/
+https://www.puntopack.es/buscar-el-punto-pack-mas-cercano/
 
 El comerciante le entregará un comprobante que deberá conservar para justificar el depósito
 en caso de ser necesario.

mails/fr/account.html

@@ -1,43 +1,108 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<!DOCTYPE html>
 <html>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<title>Message de {shop_name}</title>
+	<style>
+		img { float: left; line-height: 0; font-size: 0; }
+	</style>
 </head>
 <body>
-	<table style="font-family: tahoma,arial,sans-serif; font-size: 12px; color:#000000; width: 550px;">
-		<tr>
-			<td align="left">
-				<a href="{shop_url}" title="{shop_name}"><img alt="{shop_name}" src="{shop_logo}" style="border:none;" ></a>
-			</td>
-		</tr>
-		<tr><td>&nbsp;</td></tr>
-		<tr>
-			<td align="left">Bonjour <strong>{firstname} {lastname}</strong>,</td>
-		</tr>
-		<tr><td>&nbsp;</td></tr>
-		<tr>
-			<td align="left" style="background: #514c8c; color:#ffffff; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Merci d'avoir cr&eacute;&eacute; un compte sur {shop_name}. Voici un rappel de vos codes d'acc&egrave;s</td>
-		</tr>
-		<tr><td>&nbsp;</td></tr>
-		<tr>
-			<td align="left">
-				Adresse e-mail : <strong><span>{email}</span></strong>
-				<br >Mot de passe : <strong>{passwd}</strong>
-			</td>
-		</tr>
-		<tr><td>&nbsp;</td></tr>
-		<tr>
-			<td align="left">
-				Vous pouvez d&egrave;s &agrave; pr&eacute;sent passer commande sur notre site internet <a href="{shop_url}" style="color: #e26ea2;">{shop_name}</a>.
-			</td>
-		</tr>
-		<tr><td>&nbsp;</td></tr>
-		<tr>
-			<td align="center" style="font-size: 12px; border-top: 1px solid #cccccc; padding-top: 5px;">
-				{shop_name} - <a href="{shop_url}" style="color: #e26ea2;">{shop_url}</a>
-			</td>
-		</tr>
-	</table>
+<table style="font-family: tahoma,arial,sans-serif; font-size: 12px; color:#4d4b7d; width: 650px; border-collapse: collapse" border="0" cellpadding="0" cellspacing="0">
+	<tr>
+		<td align="left" colspan="3">
+			<a href="{shop_url}" title="{shop_name}"><img alt="{shop_name}" src="{shop_url}img/mails/bienvenue-FR_01.jpg" style="border:none;" ></a>
+		</td>
+	</tr>
+	<tr>
+		<td align="left" colspan="3">
+			<img alt="Bienvenue" src="{shop_url}img/mails/bienvenue-FR_titre_03.jpg" style="border:none;" />
+		</td>
+	</tr>
+	<tr style="font-style: 0; border:none;">
+		<td width="112" align="left" style="width:112px;"><img src="{shop_url}img/mails/bienvenue-FR_bord1.jpg" style="border:none;" /></td>
+		<td  align="center" valign="middle"  style=" font-size: 13px; color: #4d4b7d;">
+			<br/><br/>
+			<font face="Open-sans, sans-serif">
+			Bonjour {firstname},<br/><br/>
+			Votre compte a bien été créé : vous êtes maintenant membre de Bébé Boutik, le site de ventes privées pour bébés et enfants jusqu'à 12 ans ! <br/><br/>
+			Profitez dès maintenant des meilleures marques jusqu'à -70% !
+			<br/><br/>
+			<a href="{shop_url}" style="text-transform: uppercase; color: #fff; text-decoration: none; background-color: #fb66a9; border-radius: 5px;padding: 3px 20px;">A tout de suite &gt;</a>
+			</font>
+		</td>
+		<td width="121" align="left" style="width:121px;"><img src="{shop_url}img/mails/bienvenue-FR_bord2.jpg" style="border:none;" /></td>
+	</tr>
+	<tr>
+		<td colspan="3"><img alt="4 bonnes raisons" src="{shop_url}img/mails/bienvenue-FR_08.jpg" style="border:none;" /></td>
+	</tr>
+	<tr>
+		<td colspan="3" align="center"><span style="color: #615e93; font-size: 20px;" >de profiter des ventes privées Bébé Boutik</span></td>
+	</tr>
+	<tr>
+		<td colspan="3"><img alt="réassurance" src="{shop_url}img/mails/bienvenue-FR_10.jpg" style="border:none;" /></td>
+	</tr>
+	<tr>
+		<td colspan="3">
+			<table>
+				<tr align="center">
+					<td width="25">&nbsp;</td>
+					<td><font face="Open-sans, sans-serif"><span>Jusqu'à <strong color="#fb66a9" style="color: #fb66a9">-70%</strong> de réduction</span></font></td>
+					<td><font face="Open-sans, sans-serif"><strong color="#fb66a9" style="color: #fb66a9">Retours gratuits </strong>: 14 jours pour changer d'avis !</font></td>
+					<td><font face="Open-sans, sans-serif">Paiement <strong color="#fb66a9" style="color: #fb66a9">100% sécurisé </strong> Paypal & CB</font></td>
+					<td><font face="Open-sans, sans-serif">Un <strong color="#fb66a9" style="color: #fb66a9">Service Client </strong> à votre écoute</font></td>
+					<td width="25">&nbsp;</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="3">&nbsp;</td>
+	</tr>
+	<tr>
+		<td colspan="3">&nbsp;</td>
+	</tr>
+	<tr>
+		<td colspan="3"><img alt="L'appli Bébé Boutik" src="{shop_url}img/mails/bienvenue-FR_12.jpg" style="border:none;"/></td>
+	</tr>
+	<tr>
+		<td colspan="3" align="center"><span style="color: #615e93; font-size: 20px;" >Les meilleures offres dans votre poche !</span></td>
+	</tr>
+	<tr>
+		<td colspan="3">&nbsp;</td>
+	</tr>
+	<tr>
+		<td colspan="3">
+			<table cellpadding="0" cellspacing="0" style="border-collapse: collapse">
+				<tr align="center">
+					<td rowspan="2"><img src="{shop_url}img/mails/bienvenue-FR_phone2_14.jpg" style="border:none;" /></td>
+					<td>
+						<a href="https://itunes.apple.com/fr/app/b%C3%A9b%C3%A9-boutik/id1287943233?mt=8" style="text-decoration: none;" title="App Store"><img alt="App Store" src="{shop_url}img/mails/bienvenue-FR_appli_15.jpg" style="border:none;" /></a>
+					</td>
+				</tr>
+				<tr align="center">
+					<td>
+						<a href="https://play.google.com/store/apps/details?id=com.bebeboutik" style="text-decoration: none;" title="App Store"><img alt="Google Play" src="{shop_url}img/mails/bienvenue-FR_appli_17.jpg" style="border:none;" /></a>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="3" align="center"><img alt="Parrainez vos amis" src="{shop_url}img/mails/bienvenue-FR_18.jpg" style="border:none;" /></td>
+	</tr>
+	<tr>
+		<td colspan="3" align="center">
+			<a href="{shop_url}modules/invite/invite-program.php" style="text-decoration: none;" title="Parrainage">
+				<img alt="Et gagne 10€" src="{shop_url}img/mails/bienvenue-FR_20.jpg" style="border:none;" />
+			</a>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			&nbsp;
+		</td>
+	</tr>
+</table>
 </body>
 </html>

mails/fr/account.txt

@@ -3,7 +3,6 @@ Merci d'avoir créé votre compte client sur {shop_name}, vous trouverez dans ce
 Vos codes d'accès :
 
 Adresse électronique : {email}
-Mot de passe : {passwd}
 
 Vous pouvez dès à présent passer commande sur notre site Internet :
 {shop_url}

mails/fr/in_transit_dropshipping.html

@@ -18,7 +18,8 @@
         <tr><td>&nbsp;</td></tr>
         <tr>
             <td align="left">
-                Vous avez pass&eacute; commande r&eacute;cemment sur notre site B&eacute;b&eacute; Boutik. Nous vous informons que le/les produits de la marque {sale} pour votre commande n&#176;{id_order} vient d'être envoy&eacute; directement de chez notre fournisseur par le transporteur {carrier}.
+                Vous avez pass&eacute; commande r&eacute;cemment sur notre site B&eacute;b&eacute; Boutik. 
+                Nous vous informons que le/les produits de la marque {sale} pour votre commande n&#176;{id_order} vient d'être envoy&eacute; directement de chez notre fournisseur par le transporteur {carrier}.
             </td>
         </tr>
         <tr><td>&nbsp;</td></tr>
@@ -30,7 +31,7 @@
         <tr><td>&nbsp;</td></tr>
         <tr>
             <td align="left">
-                Vous pourrez consulter l'acheminnement de votre colis à l'adresse suivante : <a href="{followup}" style="color: #e26ea2;">{followup}</a>
+                Vous pourrez consulter l'acheminement de votre colis à l'adresse suivante : <a href="{followup}" style="color: #e26ea2;">{followup}</a>
             </td>
         </tr>
         <tr><td>&nbsp;</td></tr>

mails/fr/in_transit_dropshipping.txt

@@ -4,7 +4,7 @@ Vous avez passé commande récemment sur notre site Bébé Boutik. Nous vous inf
 
 Voici votre numéro de suivi : {tracking_number}
 
-Vous pourrez consulter l'acheminnement de votre colis à l'adresse suivante : {followup}
+Vous pourrez consulter l'acheminement de votre colis à l'adresse suivante : {followup}
 
 A très vite sur Bébé Boutik !
 

mails/fr/in_transit_dropshipping_noinfo.html

@@ -0,0 +1,51 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Message de {shop_name}</title>
+</head>
+<body>
+    <table style="font-family: tahoma,arial,sans-serif; font-size: 12px; color:#000000; width: 550px;">
+        <tr>
+            <td align="left">
+                <a href="{shop_url}" title="{shop_name}"><img alt="{shop_name}" src="{shop_logo}" style="border:none;" ></a>
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="left">Bonjour <strong>{firstname} {lastname}</strong>,</td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="left">
+                Vous avez pass&eacute; commande r&eacute;cemment sur notre site B&eacute;b&eacute; Boutik. 
+                Nous vous informons que le/les produits de la marque {sale} pour votre commande n&#176;{id_order} vient d'être envoy&eacute; directement de chez notre fournisseur.
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="left">
+                Vous recevrez votre commande prochainement.
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="left">
+               A très vite sur B&eacute;b&eacute; Boutik !
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="left">
+               Cordialement,
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="center" style="font-size: 12px; border-top: 1px solid #cccccc; padding-top: 5px;">
+                {shop_name} - <a href="{shop_url}" style="color: #e26ea2;">{shop_url}</a>
+            </td>
+        </tr>
+    </table>
+</body>
+</html>

mails/fr/in_transit_dropshipping_noinfo.txt

@@ -0,0 +1,11 @@
+Bonjour {firstname} {lastname}
+
+Vous avez passé commande récemment sur notre site Bébé Boutik. Nous vous informons que le/les produits de la marque {sale} pour votre commande n°{id_order} vient d'être envoyé directement de chez notre fournisseur.
+
+Vous recevrez votre commande prochainement.
+
+A très vite sur Bébé Boutik !
+
+Cordialement,
+
+{shop_name} - {shop_url}

mails/fr/lang.php

@@ -10,7 +10,6 @@ $_LANGMAIL['Virtual product to download'] = 'Produit virtuel à télécharger';
 $_LANGMAIL['Fwd: Customer message'] = 'TR: Message d\'un client';
 $_LANGMAIL['Your guest account has been transformed to customer account'] = 'Votre compte invité a été transformé en compte client';
 $_LANGMAIL['Package in transit'] = 'Livraison en cours';
-$_LANGMAIL['[Log'] = '[Log';
 $_LANGMAIL['Order confirmation'] = 'Confirmation de commande';
 $_LANGMAIL['Message from a customer'] = 'Message d\'un client';
 $_LANGMAIL['New message regarding your order'] = 'Nouveau message concernant votre commande';
@@ -24,7 +23,6 @@ $_LANGMAIL['Newsletter confirmation'] = 'Confirmation newsletter';
 $_LANGMAIL['Newsletter voucher'] = 'Bon de réduction newsletter';
 $_LANGMAIL['Your wishlist\\\'s link'] = '';
 $_LANGMAIL['Message from '] = 'Message de ';
-$_LANGMAIL['$subject'] = '';
 $_LANGMAIL['Your cart and your discount'] = 'Votre panier et votre bon de réduction';
 $_LANGMAIL['Thanks for your order'] = 'Merci pour votre commande';
 $_LANGMAIL['You are one of our best customers'] = 'Vous êtes l\'un de nos meilleurs clients';

mails/fr/loyalty_discount_reminder.html

@@ -24,7 +24,7 @@
 Nous vous informons que vous avez dans votre compte un crédit de fidélité non utilisé suite à votre commande {commandenum}. 
 Celui-ci expire dans 1 mois. 
 
-Venez nous rendre visite sur le site : https://wwww.bebeboutik.com et profiter de nos offres jusqu'à -70% !
+Venez nous rendre visite sur le site : https://www.bebeboutik.com et profiter de nos offres jusqu'à -70% !
 </td>
 </tr>
 <tr>

mails/fr/loyalty_discount_reminder.txt

@@ -3,6 +3,6 @@ Bonjour {firstname} {lastname},
 Nous vous informons que vous avez dans votre compte un crédit de fidélité non utilisé suite à votre commande {commandenum}. 
 Celui-ci expire dans 1 mois. 
 
-Venez nous rendre visite sur le site : https://wwww.bebeboutik.com et profiter de nos offres jusqu'à -70% !
+Venez nous rendre visite sur le site : https://www.bebeboutik.com et profiter de nos offres jusqu'à -70% !
 
 L'équipe Bébé Boutik,

mails/it/account.html

@@ -0,0 +1,52 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Messaggio da {shop_name}</title>
+</head>
+<body>
+	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+<tbody>
+<tr>
+<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Salve&nbsp;<strong style="color: #db3484;">{firstname} {lastname}</strong>,</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">I tuoi dati di login dell&#039;account</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Indirizzo e-mail: <strong><span style="color: #db3484;">{email}</span></strong> <br />Password: <strong>{passwd}</strong></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left"><strong>Consigli di sicurezza:</strong> <br /><br />Tieni al sicuro i dati del tuo account. 				<br />Non far sapere a nessuno i tuoi dati di login. 				<br />Cambia regolarmente la tua password. 				<br />Se sospetti che qualcuno stia utilizzando illegalmente il tuoaccount, avvertici immediatamente.</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Adesso puoi effettuare ordini nel nostro sito web: <a href="{shop_url}">{shop_name}</a>.</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+</tr>
+</tbody>
+</table>
+</body>
+</html>

mails/it/account.txt

@@ -0,0 +1,20 @@
+Salve {firstname} {lastname},
+
+Grazie di aver creato un account con {shop_name}.
+
+I tuoi dati di login dell'account:
+
+Indirizzo e-mail: {email}
+Password: {passwd}
+ 
+Adesso puoi effettuare ordini nel nostro sito web: {shop_url}
+
+Consigli di sicurezza:
+
+* Tieni al sicuro i dati del tuo account.
+* Non far sapere a nessuno i tuoi dati di login.
+* Cambia regolarmente la tua password.
+* Se sospetti che qualcuno stia utilizzando illegalmente il tuo account, avvertici immediatamente.
+
+
+{shop_url} powered by PrestaShop™

mails/it/bankwire.html

@@ -0,0 +1,55 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Messaggio da {shop_name}</title>
+</head>
+<body>
+	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+<tbody>
+<tr>
+<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Salve&nbsp;<strong style="color: #db3484;">{firstname} {lastname}</strong>,</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">La cronologia del tuo ordine n.{id_order}</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Il tuo ordine &egrave; stato eseguito con successo, e sar&agrave; inviato appena ricevuto il pagamento.</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Ricorda che hai scelto di pagare con bonifico bancario. Invia il pagamento a: 				<br /><br /> <strong>{bankwire_owner}</strong> <br /><br /> {bankwire_details} 				<br /><br /> {bankwire_address} 				<br /><br /> Order total amount is {total_paid}</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Puoi rivedere l&#039;ordine e scaricare la fattura dalla sezione&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}history.php">"Cronologia ordine"</a> del tuo account clicando su&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}my-account.php">"Il mio account"</a> nel nostro sito web.</td>
+</tr>
+<tr>
+<td align="left">Se hai un account ospite, puoi seguire il tuo ordine nella sezione&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}guest-tracking.php">"Controllo ordine ospite"</a>nel nostro sito web.</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+</tr>
+</tbody>
+</table>
+</body>
+</html>

mails/it/bankwire.txt

@@ -0,0 +1,23 @@
+Salve {firstname} {lastname},
+
+Il tuo ordine n.{id_order} è stato eseguito con successo, e sarà inviato appena ricevuto il pagamento.
+
+Ricorda che hai scelto di pagare con bonifico bancario. Invia il pagamento a:
+
+{bankwire_owner}
+
+{bankwire_details}
+
+{bankwire_address}
+
+Importo totale dell'ordine {total_paid}
+
+Puoi rivedere l'ordine e scaricare la fattura dalla sezione "Cronologia ordini" del tuo account cliccando su "Il mio account" nel nostro sito web.
+Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {shop_url}guest-tracking.php
+
+Grazie di aver acquistato con {shop_name}.
+
+{shop_name} - {shop_url}
+
+
+{shop_url} powered by PrestaShop™

mails/it/cheque.html

@@ -0,0 +1,55 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Messaggio da {shop_name}</title>
+</head>
+<body>
+	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+<tbody>
+<tr>
+<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Salve&nbsp;<strong style="color: #db3484;">{firstname} {lastname}</strong>,</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">La cronologia del tuo ordine {order_name}</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Il tuo ordine &egrave; stato eseguito con successo, e sar&agrave; inviato appena ricevuto il pagamento.</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Ricorda che hai scelto di pagare con assegno. Invia il pagamento: 				<br /><br /> - dell&#039;importo di&nbsp;<strong>{total_paid}</strong> <br /><br /> - pagabile all&#039;ordine di&nbsp;<strong>{cheque_name}</strong> <br /><br /> - inviato a&nbsp;<strong>{cheque_address_html}</strong></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Puoi rivedere l&#039;ordine e scaricare la fattura dalla sezione<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}history.php">"Cronologia ordine"</a> del tuo account cliccando su <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}my-account.php">"Il mio account"</a> nel nostro sito web.</td>
+</tr>
+<tr>
+<td align="left">Se hai un account ospite, puoi seguire il tuo ordine nella sezione&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}guest-tracking.php">"Controllo ordine ospite"</a> del nostro sito web.</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+</tr>
+</tbody>
+</table>
+</body>
+</html>

mails/it/cheque.txt

@@ -0,0 +1,22 @@
+Salve {firstname} {lastname},
+
+Il tuo ordine {order_name} è stato eseguito con successo, e sarà inviato appena ricevuto il pagamento.
+
+Ricorda che hai scelto di pagare con assegno. Invia il pagamento:
+
+- dell'importo di {total_paid}
+
+- pagabile all'ordine di {cheque_name}
+
+- inviato a {cheque_address}
+
+Puoi rivedere l'ordine e scaricare la fattura dalla sezione "Cronologia ordini" del tuo account cliccando su "Il mio account" nel nostro sito web.
+Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {shop_url}guest-tracking.php
+
+Grazie di aver acquistato con {shop_name}.
+
+
+{shop_name} - {shop_url}
+
+
+{shop_url} powered by PrestaShop™

mails/it/contact.html

@@ -0,0 +1,34 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Messaggio da {shop_name}</title>
+</head>
+<body>
+	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+<tbody>
+<tr>
+<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Messaggio dal tuo negozio {shop_name}</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Indirizzo e-mail: <a href="mailto:{email}"><strong>{email}</strong></a> <br /><br /> Messaggio: {message}</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+</tr>
+</tbody>
+</table>
+</body>
+</html>

mails/it/contact.txt

@@ -0,0 +1,11 @@
+Hai ricevuto un messaggio da un cliente tramite il tuo negozio: {shop_name}
+
+Dettagli del messaggio:
+
+Indirizzo e-mail: {email}
+
+Messaggio:
+
+{message}
+
+{shop_url} powered by PrestaShop™

mails/it/contact_form.html

@@ -0,0 +1,40 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Messaggio da {shop_name}</title>
+</head>
+<body>
+	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+<tbody>
+<tr>
+<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Il tuo messaggio &egrave; stato correttamente inviato al nostro Servizio Clienti.</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Il tuo messaggio: {message}</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Risponderemo quanto prima.</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+</tr>
+</tbody>
+</table>
+</body>
+</html>

mails/it/contact_form.txt

@@ -0,0 +1,12 @@
+Il tuo messaggio è stato correttamente inviato al nostro Servizio Clienti.
+
+Il tuo messaggio:
+
+{message}
+
+
+Risponderemo quanto prima.
+
+Cordialmente,
+
+{shop_url} powered by PrestaShop™

mails/it/credit_slip.html

@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Messaggio da {shop_name}</title>
+</head>
+<body>
+	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+<tbody>
+<tr>
+<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Salve&nbsp;<strong style="color: #db3484;">{firstname} {lastname}</strong>,</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">La cronologia del tuo ordine n.{id_order}</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Vogliamo informarti della creazione di una nota di credito a tuo nome dell&#039;ordine n.{id_order}.</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Puoi rivedere questa nota di credito e scaricare la fattura dalla sezione&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}order-follow.php">"Controllo ordini"</a>del tuo&nbsp;account cliccando su&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}my-account.php">"Il mio account"</a> nel nostro sito web.</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+</tr>
+</tbody>
+</table>
+</body>
+</html>

mails/it/credit_slip.txt

@@ -0,0 +1,12 @@
+Salve {firstname} {lastname},
+
+Vogliamo informarti della creazione di una nota di credito a tuo nome dell'ordine n.{id_order}.
+
+Puoi rivedere questa nota di credito e scaricare la fattura dalla sezione "Controllo ordini" del tuo account cliccando su "Il mio account" nel nostro sito web.
+
+Grazie di aver acquistato con {shop_name}.
+
+{shop_name} - {shop_url}
+
+
+{shop_url} powered by PrestaShop™

mails/it/download-product.tpl

@@ -0,0 +1,13 @@
+<ul>
+{foreach from=$virtualProducts item=product}
+	<li>
+		<a href="{$product.link}">{$product.name}</a>
+		{if isset($product.deadline)}
+			expires on {$product.deadline}
+		{/if}
+		{if isset($product.downloadable)}
+			downloadable {$product.downloadable} times
+		{/if}
+	</li>
+{/foreach}
+</ul>

mails/it/download_product.html

@@ -0,0 +1,55 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Messaggio da {shop_name}</title>
+</head>
+<body>
+	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+<tbody>
+<tr>
+<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Salve&nbsp;<strong style="color: #db3484;">{firstname} {lastname}</strong>, grazie di aver acquistato con&nbsp;<strong>{shop_name}</strong>.</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Prodotto/i da scaricare</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Hai {nbProducts} prodotto/i da scaricare.</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Qui di seguito trovarai i link per questi prodotti: 				{virtualProducts}</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Puoi rivedere questo ordine e scaricare la fattura dalla sezione&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}history.php">"Cronologia ordine"</a> del tuo account cliccando su&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}my-account.php">"Il mio account"</a> nel nostro sito web.</td>
+</tr>
+<tr>
+<td align="left">Se hai un account ospite, puoi seguire il tuo ordine nella sezione&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}guest-tracking.php">"Controllo ordini ospite"</a>del nostro sito web.</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+</tr>
+</tbody>
+</table>
+</body>
+</html>

mails/it/download_product.txt

@@ -0,0 +1,11 @@
+{firstname} {lastname}, grazie del tuo ordine su {shop_name}!
+
+Hai {nbProducts} prodotto/i da scaricare.
+
+Qui di seguito troverai i link per questi prodotti:
+{virtualProducts}
+
+Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordini" del tuo account cliccando su "Il mio account" nel nostro sito web. 
+Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {shop_url}guest-tracking.php
+
+{shop_url} powered by PrestaShop™

mails/it/employee_password.html

@@ -0,0 +1,40 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Messaggio da {shop_name}</title>
+</head>
+<body>
+	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+<tbody>
+<tr>
+<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Salve&nbsp;<strong style="color: #db3484;">{firstname} {lastname}</strong>,</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">I tuoi dati personali di login</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left"><strong>Nome</strong>: {firstname}<br /> <strong>Cognome</strong>: {lastname}<br /> <strong>Password</strong>: {passwd}<br /> <strong>Indirizzo e-mail</strong>: {email}</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+</tr>
+</tbody>
+</table>
+</body>
+</html>

mails/it/employee_password.txt

@@ -0,0 +1,14 @@
+Salve {firstname} {lastname},
+
+I dati personali di login del tuo negozio {shop_name}:
+
+* Nome: {firstname}
+* Cognome: {lastname}
+* Password: {passwd}
+* Indirizzo e-mail: {email}
+
+{shop_name} - {shop_url}
+
+
+
+{shop_url} powered by PrestaShop™

mails/it/forward_msg.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Messaggio da {shop_name}</title>
+</head>
+<body>
+	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+<tbody>
+<tr>
+<td style="border: 1px solid #CCCCCC; background-color: #ffffff; padding: 10px; color: #383838; font-size: 12px;">{employee} desidera inviarti questa chat. 				<br /><br /> {messages} 				<br /><br /> {employee} ha aggiunto "{comment}".</td>
+</tr>
+</tbody>
+</table>
+</body>
+</html>

mails/it/forward_msg.txt

@@ -0,0 +1,4 @@
+{employee} desidera inviarti questa chat.
+Commento: {comment}
+ 
+{messages}

mails/it/guest_to_customer.html

@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Message from {shop_name}</title>
+</head>
+<body>
+	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+<tbody>
+<tr>
+<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Salve&nbsp;<strong style="color: #db3484;">{firstname} {lastname}</strong>,</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Il tuo account ospite &egrave; stato trasformato in account cliente</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left"><strong>Indirizzo e-mail:</strong> {email}<br /> <strong>Password:</strong> {passwd}</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Fai attenzione a non condividere con altri i tuoi dati di login. 				<br /><br />Puoi accedere al tuo account nel nostro sito web: {shop_url}</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+</tr>
+</tbody>
+</table>
+</body>
+</html>

mails/it/guest_to_customer.txt

@@ -0,0 +1,15 @@
+	Salve {firstname} {lastname},
+		
+	Il tuo account ospite è stato trasformato in account cliente:
+	
+	Indirizzo e-mail: {email}
+	Password: {passwd}
+	
+	
+	Puoi accedere al tuo account nel nostro sito web: {shop_url}
+
+	Fai attenzione a non condividere con altri i tuoi dati di login.
+
+
+
+	{shop_url} powered by PrestaShop™

mails/it/in_transit.html

@@ -0,0 +1,55 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Messaggio da {shop_name}</title>
+</head>
+<body>
+	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+<tbody>
+<tr>
+<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Salve&nbsp;<strong style="color: #db3484;">{firstname} {lastname}</strong>,</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">La cronologia del tuo ordine n.{id_order}</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left"><strong>Il tuo ordine &egrave; attualmente in viaggio.</strong></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Puoi controllare la posizione del tuo pacco cliccando nel link seguente: <a href="{followup}">{followup}</a></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Puoi rivedere questo ordine e scaricare la fattura dalla sezione&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}history.php">"Cronologia ordine"</a> del tuo account cliccando su&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}my-account.php">"Il mio account"</a> nel nostro sito web.</td>
+</tr>
+<tr>
+<td align="left">Se hai un account ospite, puoi seguire il tuo ordine nella sezione&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}guest-tracking.php">"Controllo ordini ospite</a>" del nostro sito web.</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+</tr>
+</tbody>
+</table>
+</body>
+</html>

mails/it/in_transit.txt

@@ -0,0 +1,16 @@
+Salve {firstname} {lastname},
+
+Il tuo ordine è attualmente in viaggio.
+
+Puoi controllare la posizione del tuo pacco cliccando nel link seguente: {followup}
+
+Puoi anche rivedere questo ordine e scaricare la tua fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. 
+Se hai un account ospite, puoi seguire l'ordine in questa pagina: {shop_url}guest-tracking.php
+
+Grazie per aver acquistato con {shop_name}!
+
+{shop_name} - {shop_url}
+
+
+
+{shop_url} powered by PrestaShop™

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: 10436 $
+*  @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;

mails/it/lang.php

@@ -0,0 +1,43 @@
+<?php
+
+global $_LANGMAIL;
+$_LANGMAIL = array();
+$_LANGMAIL['Welcome!'] = 'Benvenuti!';
+$_LANGMAIL['Message from contact form'] = 'Messaggio da modulo di contatto';
+$_LANGMAIL['Your message has been correctly sent'] = 'Il tuo messaggio è stato inviato correttamente';
+$_LANGMAIL['New credit slip regarding your order'] = 'Nuova nota di credito riguardo al tuo ordine';
+$_LANGMAIL['Virtual product to download'] = 'Prodotto virtuale da scaricare';
+$_LANGMAIL['Fwd: Customer message'] = 'Messaggio cliente';
+$_LANGMAIL['Your guest account has been transformed to customer account'] = 'Il tuo account ospite è stato trasformato in account cliente';
+$_LANGMAIL['Package in transit'] = 'Pacco in viaggio';
+$_LANGMAIL['[Log'] = '[Log';
+$_LANGMAIL['Order confirmation'] = 'Conferma ordine';
+$_LANGMAIL['Message from a customer'] = 'Messaggio da un cliente';
+$_LANGMAIL['New message regarding your order'] = 'Nuovo messaggio riguardo al tuo ordine';
+$_LANGMAIL['Your order return state has changed'] = 'Nuovo status dell\'ordine';
+$_LANGMAIL['Your password'] = 'La tua password';
+$_LANGMAIL['Password query confirmation'] = 'Conferma richiesta password';
+$_LANGMAIL['An answer to your message is available'] = 'E\' disponibile una risposta al tuo messaggio';
+$_LANGMAIL['New voucher regarding your order'] = 'Nuovo buono sconto riguardo al tuo ordine';
+$_LANGMAIL['Happy birthday!'] = 'Buon compleanno!';
+$_LANGMAIL['Newsletter confirmation'] = 'Conferma newsletter';
+$_LANGMAIL['Newsletter voucher'] = 'Buono sconto newsletter';
+$_LANGMAIL['Your wishlist\\\'s link'] = 'Il tuo collegamento alla lista dei desideri';
+$_LANGMAIL['Message from '] = 'Messaggio da';
+$_LANGMAIL['$subject'] = '$soggetto';
+$_LANGMAIL['Your cart and your discount'] = 'Il tuo carrello e il tuo sconto';
+$_LANGMAIL['Thanks for your order'] = 'Grazie dell\'ordine';
+$_LANGMAIL['You are one of our best customers'] = 'Sei uno dei nostri clienti migliori';
+$_LANGMAIL['We miss you'] = 'Ci manchi';
+$_LANGMAIL['Product available'] = 'Prodotto disponibile';
+$_LANGMAIL['Product out of stock'] = 'Prodotto esaurito';
+$_LANGMAIL['Error reporting from your PayPal module'] = 'Errore dal tuo modulo PayPal';
+$_LANGMAIL['Congratulations!'] = 'Congratulazioni!';
+$_LANGMAIL['Referral Program'] = 'Programma di presentazione';
+$_LANGMAIL['A friend sent you a link to'] = 'Un amico ti ha inviato un link per';
+$_LANGMAIL['Log: You have a new alert from your shop'] = 'Log: Hai un nuovo Avviso dal tuo negozio';
+$_LANGMAIL['Message from \').$customer->lastname.\' '] = 'Messaggio da:';
+$_LANGMAIL[' $subject'] = 'Oggetto';
+$_LANGMAIL['A friend sent you a link to\').\' '] = 'Un amico ti ha mandato il link';
+
+?>

mails/it/log_alert.html

@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Messaggio da {shop_name}</title>
+</head>
+<body>
+	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+<tbody>
+<tr>
+<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Salve,</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Nuovo messaggio di avviso</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left"><strong>Purtroppo &egrave; stato registrato un nuovo messaggio di avviso.</strong></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Puoi controllarlo nel tuo Back office &gt; Strumenti&gt; Log del nostro sito.</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+</tr>
+</tbody>
+</table>
+</body>
+</html>

mails/it/log_alert.txt

@@ -0,0 +1,11 @@
+Salve,
+		
+Nuovo messaggio di avviso 
+	
+Purtroppo è stato registrato un nuovo messaggio di avviso.
+
+Puoi controllarlo nel tuo Back office > Strumenti > Log del nostro sito.
+		
+{shop_name} - {shop_url}
+
+{shop_url} powered by PrestaShop™

mails/it/newsletter.html

@@ -0,0 +1,34 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Messaggio da {shop_name}</title>
+</head>
+<body>
+	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+<tbody>
+<tr>
+<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Newsletter da {shop_name}</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">{message}</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+</tr>
+</tbody>
+</table>
+</body>
+</html>

mails/it/newsletter.txt

@@ -0,0 +1,9 @@
+Newsletter da {shop_name}
+
+Messaggio
+
+{message}
+
+
+
+{shop_url} powered by PrestaShop™

mails/it/order_canceled.html

@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Messaggio da {shop_name}</title>
+</head>
+<body>
+	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+<tbody>
+<tr>
+<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Salve&nbsp;<strong style="color: #db3484;">{firstname} {lastname}</strong>,</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Riguardo al tuo ordine n.{id_order}</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left"><strong>Il tuo ordine &egrave; stato cancellato.</strong></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Puoi rivedere questo ordine e scaricare la fattura dalla sezione&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}history.php">"Cronologia ordine"</a> del tuo account cliccando su <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}my-account.php">"Il mio account"</a> nel nostro sito web.</td>
+</tr>
+<tr>
+<td align="left">Se hai un account ospite, puoi seguire il tuo ordine nella sezione <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}guest-tracking.php">"Controllo ordini ospite"</a> nel nostro sito web.</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+</tr>
+</tbody>
+</table>
+</body>
+</html>

mails/it/order_canceled.txt

@@ -0,0 +1,14 @@
+Salve {firstname} {lastname},
+
+Riguardo al tuo ordine n.{id_order}:
+
+Il tuo ordine è stato cancellato.
+
+Puoi rivedere questo ordine e scaricare la tua fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. 
+Se hai un account ospite, puoi seguire l'ordine in questa pagina: {shop_url}guest-tracking.php
+
+{shop_name} - {shop_url}
+
+
+
+{shop_url} powered by PrestaShop™

mails/it/order_conf.html

@@ -0,0 +1,124 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Messaggio da {shop_name}</title>
+</head>
+<body>
+	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+<tbody>
+<tr>
+<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Salve&nbsp;<strong style="color: #db3484;">{firstname} {lastname}</strong>, grazie di aver acquistato con&nbsp;<strong>{shop_name}</strong>.</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Dati dell&#039;ordine</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Ordine: <strong><span style="color: #db3484;">{order_name}</span> effettuato il {date}</strong> <br />Pagamento: <strong>{payment}</strong></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">{products} 						{discounts} 					                          
+<table style="width: 100%; font-family: Verdana,sans-serif; font-size: 11px; color: #374953;">
+<!-- Title --> 
+<tbody>
+<tr style="background-color: #b9babe; text-align: center;">
+<th style="width: 15%; padding: 0.6em 0;">Riferimento</th> <th style="width: 35%; padding: 0.6em 0;">Prodotto</th> <th style="width: 15%; padding: 0.6em 0;">Prezzo unitario</th> <th style="width: 15%; padding: 0.6em 0;">Quantit&agrave;</th> <th style="width: 20%; padding: 0.6em 0;">Prezzo totale</th>
+</tr>
+<!-- Products --><!-- Footer: prices --> 
+<tr style="text-align: right;">
+<td></td>
+<td style="background-color: #b9babe; padding: 0.6em 0.4em;" colspan="3">Prodotti</td>
+<td style="background-color: #b9babe; padding: 0.6em 0.4em;">{total_products}</td>
+</tr>
+<tr style="text-align: right;">
+<td></td>
+<td style="background-color: #ebecee; padding: 0.6em 0.4em;" colspan="3">Sconti</td>
+<td style="background-color: #ebecee; padding: 0.6em 0.4em;">{total_discounts}</td>
+</tr>
+<tr style="text-align: right;">
+<td></td>
+<td style="background-color: #ebecee; padding: 0.6em 0.4em;" colspan="3">Carta regalo</td>
+<td style="background-color: #ebecee; padding: 0.6em 0.4em;">{total_wrapping}</td>
+</tr>
+<tr style="text-align: right;">
+<td></td>
+<td style="background-color: #dde2e6; padding: 0.6em 0.4em;" colspan="3">Spedizione</td>
+<td style="background-color: #dde2e6; padding: 0.6em 0.4em;">{total_shipping}</td>
+</tr>
+<tr style="text-align: right; font-weight: bold;">
+<td></td>
+<td style="background-color: #f1aecf; padding: 0.6em 0.4em;" colspan="3">Totale pagato</td>
+<td style="background-color: #f1aecf; padding: 0.6em 0.4em;">{total_paid}</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Spedizione</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Mezzo di spedizione:&nbsp;<strong>{carrier}</strong></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td>
+<table style="width: 100%; font-family: Verdana,sans-serif; font-size: 11px; color: #374953;">
+<tbody>
+<tr style="background-color: #b9babe; text-transform: uppercase;">
+<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_block_html}
+</td>
+<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">
+{invoice_block_html}
+</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Puoi rivedere l&#039;ordine e scaricare la fattura dalla sezione&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}history.php">"Cronologia ordine"</a> del tuo account cliccando su&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}my-account.php">"Il mio account"</a> nel nostro sito web.</td>
+</tr>
+<tr>
+<td align="left">Se hai un account ospite, puoi seguire il tuo ordine nella sezione&nbsp;<a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}guest-tracking.php">"Controllo ordini ospite"</a> del nostro sito web.</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+</tr>
+</tbody>
+</table>
+</body>
+</html>

mails/it/order_conf.txt

@@ -0,0 +1,30 @@
+Salve {firstname} {lastname}, grazie del tuo ordine su {shop_name}!
+
+Dettagli dell'ordine
+
+	Ordine: {order_name} eseguito il {date}
+	Pagamento: {payment}
+
+	Prodotti: {total_products}
+	Sconti: {total_discounts}
+	Spedizione: {total_shipping}
+	Carta regalo: {total_wrapping}
+	Totale: {total_paid}
+
+
+Spedizione
+
+	Mezzo di spedizione: {carrier}
+
+	Indirizzo di consegna:
+
+	{delivery_block_html} 
+
+	Indirizzo di fatturazione:
+
+	{delivery_block_html}
+
+Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. 
+Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {shop_url}guest-tracking.php
+
+{shop_url} powered by PrestaShop™

mails/it/order_customer_comment.html

@@ -0,0 +1,40 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Messaggio da un cliente da {shop_name}</title>
+</head>
+<body>
+	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+<tbody>
+<tr>
+<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left">Hi,</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Messaggio da {firstname} {lastname} ({email})</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td align="left"><strong>Hai ricevuto un nuovo messaggio riguardo all&#039;ordine n.{id_order}:</strong> <br /><br /> {message}</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+</tr>
+</tbody>
+</table>
+</body>
+</html>