Rajout du nb de points fidélité dans le mail envoyé au statut "Livré"

Retour arrière sur évo 0000030 (le client s'est trompé de site)
Evolution #000033 (rajout du RIB au bas de la facture)
2020-09-30 11:51:54 +02:00 · 2020-06-17 12:18:40 +02:00 · 2020-06-17 09:25:42 +02:00 · 2020-06-07 12:22:25 +02:00 · 2020-03-29 10:02:08 +02:00 · 2020-03-29 09:59:40 +02:00
19 changed files with 720 additions and 684 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /ssl/
 /tmp/
 /webdav/
+/web/modules/*/log/
--- a/web/.eslintignore
+++ b/web/.eslintignore
@@ -1,6 +0,0 @@
-/vendor/
-/modules/
-/admin-dev/filemanager/
-/themes/classic/assets/js/
-js/*
-themes/core.js
--- a/web/.eslintrc.js
+++ b/web/.eslintrc.js
@@ -1,35 +0,0 @@
-// http://eslint.org/docs/user-guide/configuring
-
-module.exports = {
-  env: {
-    browser: true,
-    node: true,
-    es6: true,
-  },
-  globals: {
-    google: true,
-    document: true,
-    navigator: false,
-    window: true,
-  },
-  parserOptions: {
-    ecmaVersion: 6,
-    sourceType: "module"
-  },
-  root: true,
-  extends: 'airbnb-base',
-  plugins: [
-    'import',
-    'html',
-  ],
-  rules: {
-    'indent': ['error', 2, {'SwitchCase': 1}],
-    'import/no-unresolved': 0,
-    'no-use-before-define': 0,
-    'function-paren-newline': ['off', 'never'],
-    'object-curly-spacing': ['error', 'never'],
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
-    'no-console': process.env.NODE_ENV === 'production' ? 2 : 0,
-    'import/extensions': ['off', 'never'],
-  }
-};
--- a/web/app/Resources/translations/fr-FR/ShopPdf.fr-FR.xlf
+++ b/web/app/Resources/translations/fr-FR/ShopPdf.fr-FR.xlf
@@ -190,7 +190,7 @@
    <body>
      <trans-unit id="b602e0d0c6a72053d0a5be60cb2f8126" approved="yes">
        <source>Total Tax</source>
-        <target xml:lang="fr" state="translated">Taxe totale</target>
+        <target xml:lang="fr" state="translated">TVA totale</target>
        <note>Line: 40</note>
      </trans-unit>
      <trans-unit id="ad0d28cdd9113d3ce911bc064b137cde" approved="yes">
@@ -244,17 +244,17 @@
    <body>
      <trans-unit id="b0f79042ac83c64f3ccc42268c8ade26" approved="yes">
        <source>Total Products</source>
-        <target xml:lang="fr" state="translated">Total produits</target>
+        <target xml:lang="fr" state="translated">Total produits (TTC)</target>
        <note>Line: 29</note>
      </trans-unit>
      <trans-unit id="dd704458c6b79d0e86d171f1523918c3" approved="yes">
        <source>Total Discounts</source>
-        <target xml:lang="fr" state="translated">Total Réductions</target>
+        <target xml:lang="fr" state="translated">Réductions TTC</target>
        <note>Line: 40</note>
      </trans-unit>
      <trans-unit id="f54bdce4ab4d26c259216da67b9d6431" approved="yes">
        <source>Shipping Costs</source>
-        <target xml:lang="fr" state="translated">Frais de livraison</target>
+        <target xml:lang="fr" state="translated">Frais de port TTC</target>
        <note>Line: 51</note>
      </trans-unit>
      <trans-unit id="b00b85425e74ed2c85dc3119b78ff2c3" approved="yes">
@@ -272,6 +272,11 @@
        <target xml:lang="fr" state="translated">Total (HT)</target>
        <note>Line: 74</note>
      </trans-unit>
+      <trans-unit id="eed1808b8206c5a62cc6407f85cf95bc" approved="yes">
+        <source>Total (Tax incl.)</source>
+        <target xml:lang="fr" state="translated">Total (TTC)</target>
+        <note></note>
+      </trans-unit>
      <trans-unit id="96b0141273eabab320119c467cdcaf17" approved="yes">
        <source>Total</source>
        <target xml:lang="fr" state="translated">Total</target>
@@ -322,7 +327,7 @@
      </trans-unit>
      <trans-unit id="03ab340b3f99e03cff9e84314ead38c0" approved="yes">
        <source>Qty</source>
-        <target xml:lang="fr" state="translated">Quantité</target>
+        <target xml:lang="fr" state="translated">Qté</target>
        <note>Line: 31</note>
      </trans-unit>
      <trans-unit id="adcf8d924285bef43f517d8f6c040e97" approved="yes">
--- a/web/classes/pdf/HTMLTemplateInvoice.php
+++ b/web/classes/pdf/HTMLTemplateInvoice.php
@@ -114,19 +114,19 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
                'width' => 15,
            ),
            'product' => array(
-                'width' => 40,
+                'width' => 42,
            ),
            'quantity' => array(
-                'width' => 8,
+                'width' => 4,
            ),
            'tax_code' => array(
-                'width' => 8,
+                'width' => 7,
            ),
            'unit_price_tax_excl' => array(
-                'width' => 0,
+                'width' => 11,
            ),
            'total_tax_excl' => array(
-                'width' => 0,
+                'width' => 10,
            ),
        );

--- a/web/override/classes/order/OrderHistory.php
+++ b/web/override/classes/order/OrderHistory.php
@@ -1,5 +1,105 @@
 <?php
-use PrestaShop\PrestaShop\Core\Stock\StockManager;
+
+
 class OrderHistory extends OrderHistoryCore
 {
+    protected function _getFormatedAddress(Address $the_address, $line_sep, $fields_style = array())
+    {
+        return AddressFormat::generateAddress($the_address, array('avoid' => array()), $line_sep, ' ', $fields_style);
+    }
+
+    public function sendEmail($order, $template_vars = false)
+    {
+        $carrier = new Carrier((int) $order->id_carrier, $order->id_lang);
+        $delivery = new Address((int)$order->id_address_delivery);
+
+        $result = Db::getInstance()->getRow('
+            SELECT osl.`template`, c.`lastname`, c.`firstname`, osl.`name` AS osname, c.`email`, os.`module_name`, os.`id_order_state`, os.`pdf_invoice`, os.`pdf_delivery`
+            FROM `' . _DB_PREFIX_ . 'order_history` oh
+                LEFT JOIN `' . _DB_PREFIX_ . 'orders` o ON oh.`id_order` = o.`id_order`
+                LEFT JOIN `' . _DB_PREFIX_ . 'customer` c ON o.`id_customer` = c.`id_customer`
+                LEFT JOIN `' . _DB_PREFIX_ . 'order_state` os ON oh.`id_order_state` = os.`id_order_state`
+                LEFT JOIN `' . _DB_PREFIX_ . 'order_state_lang` osl ON (os.`id_order_state` = osl.`id_order_state` AND osl.`id_lang` = o.`id_lang`)
+            WHERE oh.`id_order_history` = ' . (int) $this->id . ' AND os.`send_email` = 1');
+        if (isset($result['template']) && Validate::isEmail($result['email'])) {
+            ShopUrl::cacheMainDomainForShop($order->id_shop);
+
+            $topic = $result['osname'];
+            $data = array(
+                '{lastname}' => $result['lastname'],
+                '{firstname}' => $result['firstname'],
+                '{id_order}' => (int) $this->id_order,
+                '{order_name}' => $order->getUniqReference(),
+                '{followup}' => str_replace('@', $this->tracking_number, $carrier->url),
+                '{delivery_block_html}' => $this->_getFormatedAddress($delivery, '<br />', array(
+                    'firstname'    => '<span style="font-weight:bold;">%s</span>',
+                    'lastname'    => '<span style="font-weight:bold;">%s</span>'
+                )),
+            );
+
+            if ($result['module_name']) {
+                $module = Module::getInstanceByName($result['module_name']);
+                if (Validate::isLoadedObject($module) && isset($module->extra_mail_vars) && is_array($module->extra_mail_vars)) {
+                    $data = array_merge($data, $module->extra_mail_vars);
+                }
+            }
+
+            if (is_array($template_vars)) {
+                $data = array_merge($data, $template_vars);
+            }
+
+            $data['{total_paid}'] = Tools::displayPrice((float) $order->total_paid, new Currency((int) $order->id_currency), false);
+
+            $customerId = new Customer((int) $delivery->id_customer);
+            $data['{totalPoints}'] = (int)LoyaltyModuleAdvanced::getPointsByCustomer($customerId->id);
+            $data['{totalEuros}'] = (int)LoyaltyModuleAdvanced::getVoucherValue($data['{totalPoints}']);
+
+            if (Validate::isLoadedObject($order)) {
+                // Attach invoice and / or delivery-slip if they exists and status is set to attach them
+                if (($result['pdf_invoice'] || $result['pdf_delivery'])) {
+                    $context = Context::getContext();
+                    $invoice = $order->getInvoicesCollection();
+                    $file_attachement = array();
+
+                    if ($result['pdf_invoice'] && (int) Configuration::get('PS_INVOICE') && $order->invoice_number) {
+                        Hook::exec('actionPDFInvoiceRender', array('order_invoice_list' => $invoice));
+                        $pdf = new PDF($invoice, PDF::TEMPLATE_INVOICE, $context->smarty);
+                        $file_attachement['invoice']['content'] = $pdf->render(false);
+                        $file_attachement['invoice']['name'] = Configuration::get('PS_INVOICE_PREFIX', (int) $order->id_lang, null, $order->id_shop) . sprintf('%06d', $order->invoice_number) . '.pdf';
+                        $file_attachement['invoice']['mime'] = 'application/pdf';
+                    }
+                    if ($result['pdf_delivery'] && $order->delivery_number) {
+                        $pdf = new PDF($invoice, PDF::TEMPLATE_DELIVERY_SLIP, $context->smarty);
+                        $file_attachement['delivery']['content'] = $pdf->render(false);
+                        $file_attachement['delivery']['name'] = Configuration::get('PS_DELIVERY_PREFIX', Context::getContext()->language->id, null, $order->id_shop) . sprintf('%06d', $order->delivery_number) . '.pdf';
+                        $file_attachement['delivery']['mime'] = 'application/pdf';
+                    }
+                } else {
+                    $file_attachement = null;
+                }
+
+                if (!Mail::Send(
+                    (int) $order->id_lang,
+                    $result['template'],
+                    $topic,
+                    $data,
+                    $result['email'],
+                    $result['firstname'] . ' ' . $result['lastname'],
+                    null,
+                    null,
+                    $file_attachement,
+                    null,
+                    _PS_MAIL_DIR_,
+                    false,
+                    (int) $order->id_shop
+                )) {
+                    return false;
+                }
+            }
+
+            ShopUrl::resetMainDomainCache();
+        }
+
+        return true;
+    }
 }
--- a/web/override/controllers/admin/AdminOrdersController.php
+++ b/web/override/controllers/admin/AdminOrdersController.php
@@ -16,11 +16,10 @@ class AdminOrdersController extends AdminOrdersControllerCore
 		
 		AdminController::__construct();
 		
-$this->_select = '
+		$this->_select = '
        a.id_currency,
        a.id_order AS id_pdf,
-        a.id_carrier,
-        carrier.name as crname,
+        ca.name as crname,
        CONCAT(LEFT(c.`firstname`, 1), \'. \', c.`lastname`) AS `customer`,
        osl.`name` AS `osname`,
        os.`color`,
@@ -32,7 +31,7 @@ $this->_select = '
        LEFT JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = a.`id_customer`)
        INNER JOIN `'._DB_PREFIX_.'address` address ON address.id_address = a.id_address_delivery

-        INNER JOIN `'._DB_PREFIX_.'carrier` carrier ON carrier.id_carrier = a.id_carrier
+        INNER JOIN `'._DB_PREFIX_.'carrier` ca ON ca.id_carrier = a.id_carrier

        INNER JOIN `'._DB_PREFIX_.'country` country ON address.id_country = country.id_country
        INNER JOIN `'._DB_PREFIX_.'country_lang` country_lang ON (country.`id_country` = country_lang.`id_country` AND country_lang.`id_lang` = '.(int)$this->context->language->id.')
@@ -41,7 +40,6 @@ $this->_select = '
        $this->_orderBy = 'id_order';
        $this->_orderWay = 'DESC';
        $this->_use_found_rows = true;
-		

        $statuses = OrderState::getOrderStates((int)$this->context->language->id);
        foreach ($statuses as $status) {
@@ -146,23 +144,23 @@ $this->_select = '

        if (Country::isCurrentlyUsed('carrier', true)) {
            $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
-			SELECT DISTINCT c.id_carrier, c.`name`
+			SELECT DISTINCT c.`name`
 			FROM `'._DB_PREFIX_.'carrier` c
 			WHERE active = 1 and deleted=0
 			ORDER BY c.name ASC');

            $carrier_array = array();
            foreach ($result as $row) {
-                $carrier_array[$row['id_carrier']] = $row['name'];
+                $carrier_array[$row['name']] = $row['name'];
            }
            $part1 = array_slice($this->fields_list, 0, 3);
            $part2 = array_slice($this->fields_list, 3);
-            $part1['crname'] = array(
+             $part1['crname'] = array(
                'title' => $this->trans('Carrier', array(), 'Admin.Global'),
                'type' => 'select',
                'list' => $carrier_array,
-                'filter_key' => 'carrier!id_carrier',
-                'filter_type' => 'int',
+                'filter_key' => 'ca!name',
+                'filter_type' => 'string',
                'order_key' => 'crname'
            );
            $this->fields_list = array_merge($part1, $part2);
--- a/web/pdf/invoice.product-tab.tpl
+++ b/web/pdf/invoice.product-tab.tpl
@@ -22,21 +22,20 @@
 * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
 * International Registered Trademark & Property of PrestaShop SA
 *}
-<table class="product" width="100%" cellpadding="4" cellspacing="0">
+<table class="product" width="100%" cellpadding="2" cellspacing="0">

 	<thead>
 	<tr>
 		<th class="product header small" width="{$layout.reference.width}%">{l s='Reference' d='Shop.Pdf' pdf='true'}</th>
 		<th class="product header small" width="{$layout.product.width}%">{l s='Product' d='Shop.Pdf' pdf='true'}</th>
+		<th class="product header small" width="{$layout.unit_price_tax_excl.width}%">{l s='Unit Price' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax excl.)' d='Shop.Pdf' pdf='true'}</th>
 		<th class="product header small" width="{$layout.tax_code.width}%">{l s='Tax Rate' d='Shop.Pdf' pdf='true'}</th>
-
 		{if isset($layout.before_discount)}
 			<th class="product header small" width="{$layout.unit_price_tax_excl.width}%">{l s='Base price' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax excl.)' d='Shop.Pdf' pdf='true'}</th>
 		{/if}
-
-		<th class="product header-right small" width="{$layout.unit_price_tax_excl.width}%">{l s='Unit Price' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax excl.)' d='Shop.Pdf' pdf='true'}</th>
+		<th class="product header small" width="{$layout.unit_price_tax_excl.width}%">{l s='Unit Price' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax Incl.)' d='Shop.Pdf' pdf='true'}</th>
 		<th class="product header small" width="{$layout.quantity.width}%">{l s='Qty' d='Shop.Pdf' pdf='true'}</th>
-		<th class="product header-right small" width="{$layout.total_tax_excl.width}%">{l s='Total' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax excl.)' d='Shop.Pdf' pdf='true'}</th>
+		<th class="product header small" width="{$layout.total_tax_excl.width}%">{l s='Total' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax Incl.)' d='Shop.Pdf' pdf='true'}</th>
 	</tr>
 	</thead>

@@ -60,7 +59,7 @@
 								{/if}
 							</td>
 							<td width="5%">&nbsp;</td>
-							<td width="80%">
+							<td width="75">
 								{$order_detail.product_name}
 							</td>
 						</tr>
@@ -68,12 +67,19 @@
 				{else}
 					{$order_detail.product_name}
 				{/if}
-
 			</td>
+			<!--      Prix unitaire (HT)    //-->
+			<td class="product center">
+				{displayPrice currency=$order->id_currency price=$order_detail.unit_price_tax_excl_including_ecotax}
+				{if $order_detail.ecotax_tax_excl > 0}
+					<br>
+					<small>{{displayPrice currency=$order->id_currency price=$order_detail.ecotax_tax_excl}|string_format:{l s='ecotax: %s' d='Shop.Pdf' pdf='true'}}</small>
+				{/if}
+			</td>
+			<!--      Taux de taxe    //-->
 			<td class="product center">
 				{$order_detail.order_detail_tax_label}
 			</td>
-
 			{if isset($layout.before_discount)}
 				<td class="product center">
 					{if isset($order_detail.unit_price_tax_excl_before_specific_price)}
@@ -83,19 +89,21 @@
 					{/if}
 				</td>
 			{/if}
-
-			<td class="product right">
-				{displayPrice currency=$order->id_currency price=$order_detail.unit_price_tax_excl_including_ecotax}
-				{if $order_detail.ecotax_tax_excl > 0}
+			<!--      Prix unitaire (TTC)    //-->
+			<td class="product center">
+				{displayPrice currency=$order->id_currency price=$order_detail.unit_price_tax_incl_including_ecotax}
+				{if $order_detail.ecotax_tax_incl > 0}
 					<br>
-					<small>{{displayPrice currency=$order->id_currency price=$order_detail.ecotax_tax_excl}|string_format:{l s='ecotax: %s' d='Shop.Pdf' pdf='true'}}</small>
+					<small>{{displayPrice currency=$order->id_currency price=$order_detail.ecotax_tax_incl}|string_format:{l s='ecotax: %s' d='Shop.Pdf' pdf='true'}}</small>
 				{/if}
 			</td>
+			<!--      Quantité    //-->
 			<td class="product center">
 				{$order_detail.product_quantity}
 			</td>
+			<!--      Total (TTC)    //-->
 			<td  class="product right">
-				{displayPrice currency=$order->id_currency price=$order_detail.total_price_tax_excl_including_ecotax}
+				{displayPrice currency=$order->id_currency price=$order_detail.total_price_tax_incl_including_ecotax}
 			</td>
 		</tr>

@@ -132,7 +140,7 @@
 						({if $customization.quantity == 0}1{else}{$customization.quantity}{/if})
 					</td>

-					{assign var=end value=($layout._colCount-3)}
+					{assign var=end value=($layout._colCount-2)}
 					{for $var=0 to $end}
 						<td class="center">
 							--
@@ -143,26 +151,26 @@
 				<!--if !$smarty.foreach.custo_foreach.last-->
 			{/foreach}
 		{/foreach}
+
 	{/foreach}
 	<!-- END PRODUCTS -->

 	<!-- CART RULES -->
-
 	{assign var="shipping_discount_tax_incl" value="0"}
 	{foreach from=$cart_rules item=cart_rule name="cart_rules_loop"}
 		{if $smarty.foreach.cart_rules_loop.first}
 		<tr class="discount">
-			<th class="header" colspan="{$layout._colCount}">
-				{l s='Discounts' d='Shop.Pdf' pdf='true'}
+			<th class="header" colspan="{$layout._colCount + 1}">
+				{l s='Total Discounts' d='Shop.Pdf' pdf='true'}
 			</th>
 		</tr>
 		{/if}
 		<tr class="discount">
-			<td class="white right" colspan="{$layout._colCount - 1}">
+			<td class="white right" colspan="{$layout._colCount - 2}">
 				{$cart_rule.name}
 			</td>
-			<td class="right white">
-				- {displayPrice currency=$order->id_currency price=$cart_rule.value_tax_excl}
+			<td class="right white" colspan=2>
+				- {displayPrice currency=$order->id_currency price=$footer.product_discounts_tax_incl}
 			</td>
 		</tr>
 	{/foreach}
--- a/web/pdf/invoice.summary-tab.tpl
+++ b/web/pdf/invoice.summary-tab.tpl
@@ -25,18 +25,18 @@
 <table id="summary-tab" width="100%">
 	<tr>
 		<th class="header small" valign="middle">{l s='Invoice Number' d='Shop.Pdf' pdf='true'}</th>
-		<th class="header small" valign="middle">{l s='Invoice Date' d='Shop.Pdf' pdf='true'}</th>
-		<th class="header small" valign="middle">{l s='Order Reference' d='Shop.Pdf' pdf='true'}</th>
 		<th class="header small" valign="middle">{l s='Order date' d='Shop.Pdf' pdf='true'}</th>
+		<th class="header small" valign="middle">{l s='Order Reference' d='Shop.Pdf' pdf='true'}</th>
+		<th class="header small" valign="middle">{l s='Invoice Date' d='Shop.Pdf' pdf='true'}</th>
 		{if $addresses.invoice->vat_number}
 			<th class="header small" valign="middle">{l s='VAT Number' d='Shop.Pdf' pdf='true'}</th>
 		{/if}
 	</tr>
 	<tr>
 		<td class="center small white">{$title|escape:'html':'UTF-8'}</td>
-		<td class="center small white">{dateFormat date=$order->invoice_date full=0}</td>
-		<td class="center small white">{$order->getUniqReference()}</td>
 		<td class="center small white">{dateFormat date=$order->date_add full=0}</td>
+		<td class="center small white">{$order->getUniqReference()}</td>
+		<td class="center small white">{dateFormat date=$order->invoice_date full=0}</td>
 		{if $addresses.invoice->vat_number}
 			<td class="center small white">
 				{$addresses.invoice->vat_number}
--- a/web/pdf/invoice.total-tab.tpl
+++ b/web/pdf/invoice.total-tab.tpl
@@ -24,15 +24,49 @@
 *}
 <table id="total-tab" width="100%">

+	<tr>
+		<td class="grey">
+			{l s='Total (Tax excl.)' d='Shop.Pdf' pdf='true'}
+		</td>
+		<td class="white">
+			{displayPrice currency=$order->id_currency price=$footer.products_before_discounts_tax_excl}
+		</td>
+	</tr>
+
+	{if $footer.total_taxes > 0}
+		<tr>
+			<td class="grey">
+				{l s='Total Tax' d='Shop.Pdf' pdf='true'}
+			</td>
+			<td class="white">
+				{displayPrice currency=$order->id_currency price=$footer.total_taxes}
+			</td>
+		</tr>
+	{/if}
 	<tr>
 		<td class="grey" width="50%">
 			{l s='Total Products' d='Shop.Pdf' pdf='true'}
 		</td>
 		<td class="white" width="50%">
-			{displayPrice currency=$order->id_currency price=$footer.products_before_discounts_tax_excl}
+			{displayPrice currency=$order->id_currency price=$footer.products_before_discounts_tax_incl}
 		</td>
 	</tr>

+	{if !$order->isVirtual()}
+		<tr>
+			<td class="grey" width="50%">
+				{l s='Shipping Costs' d='Shop.Pdf' pdf='true'}
+			</td>
+			<td class="white" width="50%">
+				{if $footer.shipping_tax_excl > 0}
+					{displayPrice currency=$order->id_currency price=$footer.shipping_tax_incl}
+				{else}
+					{l s='Free Shipping' d='Shop.Pdf' pdf='true'}
+				{/if}
+			</td>
+		</tr>
+	{/if}
+
 	{if $footer.product_discounts_tax_excl > 0}

 		<tr>
@@ -40,25 +74,11 @@
 				{l s='Total Discounts' d='Shop.Pdf' pdf='true'}
 			</td>
 			<td class="white" width="50%">
-				- {displayPrice currency=$order->id_currency price=$footer.product_discounts_tax_excl}
+				- {displayPrice currency=$order->id_currency price=$footer.product_discounts_tax_incl}
 			</td>
 		</tr>

 	{/if}
-	{if !$order->isVirtual()}
-	<tr>
-		<td class="grey" width="50%">
-			{l s='Shipping Costs' d='Shop.Pdf' pdf='true'}
-		</td>
-		<td class="white" width="50%">
-			{if $footer.shipping_tax_excl > 0}
-				{displayPrice currency=$order->id_currency price=$footer.shipping_tax_excl}
-			{else}
-				{l s='Free Shipping' d='Shop.Pdf' pdf='true'}
-			{/if}
-		</td>
-	</tr>
-	{/if}

 	{if $footer.wrapping_tax_excl > 0}
 		<tr>
@@ -69,30 +89,13 @@
 		</tr>
 	{/if}

-	<tr class="bold">
-		<td class="grey">
-			{l s='Total (Tax excl.)' d='Shop.Pdf' pdf='true'}
-		</td>
-		<td class="white">
-			{displayPrice currency=$order->id_currency price=$footer.total_paid_tax_excl}
-		</td>
-	</tr>
-	{if $footer.total_taxes > 0}
-	<tr class="bold">
-		<td class="grey">
-			{l s='Total Tax' d='Shop.Pdf' pdf='true'}
-		</td>
-		<td class="white">
-			{displayPrice currency=$order->id_currency price=$footer.total_taxes}
-		</td>
-	</tr>
-	{/if}
 	<tr class="bold big">
 		<td class="grey">
-			{l s='Total' d='Shop.Pdf' pdf='true'}
+			{l s='Total (Tax incl.)' d='Shop.Pdf' pdf='true'}
 		</td>
 		<td class="white">
 			{displayPrice currency=$order->id_currency price=$footer.total_paid_tax_incl}
 		</td>
 	</tr>
+
 </table>
--- a/web/pdf/invoice.tpl
+++ b/web/pdf/invoice.tpl
@@ -82,7 +82,7 @@
 		<!-- Code TVA -->
 		<td colspan="6" class="left">

-			{$tax_tab}
+{*			{$tax_tab}*}

 		</td>
 		<td colspan="1">&nbsp;</td>
--- a/web/themes/bioconcept/mails/fr/account.html
+++ b/web/themes/bioconcept/mails/fr/account.html
@@ -53,7 +53,8 @@
 </style>

 	</head>
-	<body style="-webkit-text-size-adjust:none;background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto" >
+	<body style="-webkit-text-size-adjust:none;background-color:#fff;width:650px;font-family:Open-sans, 
+	sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto" >
 <table class="table table-mail" style="width: 100%; margin-top: 10px; -moz-box-shadow: 0 0 5px #afafaf; -webkit-box-shadow: 0 0 5px #afafaf; -o-box-shadow: 0 0 5px #afafaf; box-shadow: 0 0 5px #afafaf; filter: progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5);">
 <tbody>
 <tr>
@@ -67,10 +68,10 @@
 </td>
 </tr>
 <tr>
-<td align="center" class="titleblock" style="padding: 7px 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> <span class="title" style="font-weight: 500; font-size: 28px; text-transform: uppercase; line-height: 33px;">BIENVENUE</span><br /></span></td>
+<td align="center" class="titleblock" style="padding: 7px 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> <span class="title" style="font-weight: 500; font-size: 28px; text-transform: uppercase; line-height: 33px;"> BIENVENUE</span><br /></span></td>
 </tr>
 <tr>
-<td align="center" class="titleblock" style="padding: 7px 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> <span class="title" style="font-weight: 500; font-size: 20px; text-transform: uppercase; line-height: 33px;">Bonjour {firstname},</span><br /><span class="subtitle" style="font-weight: 500; font-size: 16px; line-height: 25px;">Toute l&#039;&eacute;quipe de BioConcept vous souhaite la bienvenue sur notre boutique.</span> </span></td>
+<td align="center" class="titleblock" style="padding: 7px 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> <span class="title" style="font-weight: 500; font-size: 20px; text-transform: uppercase; line-height: 33px;"> Bonjour {firstname},</span><br /><span class="subtitle" style="font-weight: 500; font-size: 16px; line-height: 25px;">Toute l&#039;&eacute;quipe de BioConcept vous souhaite la bienvenue sur notre boutique.</span> </span></td>
 </tr>
 <tr>
 <td class="space_footer" style="padding: 0!important;">&nbsp;</td>
@@ -81,7 +82,7 @@
 <tbody>
 <tr>
 <td align="center" class="titleblock" style="padding: 7px 0;">
-<p><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"><span class="subtitle" style="font-weight: 500; font-size: 16px; line-height: 25px;"><strong>Votre e-mail de connexion :</strong> </span></span></p>
+<p><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"><span class="subtitle" style="font-weight: 500; font-size: 16px; line-height: 25px;">Votre compte Bio Concept a bien &eacute;t&eacute; cr&eacute;&eacute;. Voici votre <strong>e-mail de connexion :</strong> </span></span></p>
 <p><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"><span class="subtitle" style="font-weight: 500; font-size: 16px; line-height: 25px;"><a href="mailto:{email}" style="color: #337ff1;">{email}</a></span> </span></p>
 </td>
 <td width="10" style="padding: 7px 0;">&nbsp;</td>
@@ -94,19 +95,15 @@
 <td class="space_footer" style="padding: 0!important;">&nbsp;</td>
 </tr>
 <tr>
-<td class="box" style="border: 1px solid #D6D4D4; background-color: #f8f8f8; padding: 7px 0;">
+<td class="box" style="border: 1px solid #D6D4D4; padding: 7px 0;">
 <table class="table" style="width: 100%;">
 <tbody>
 <tr>
 <td width="10" style="padding: 7px 0;">&nbsp;</td>
 <td style="padding: 7px 0;">
-<p style="border-bottom: 1px solid #D6D4D4; margin: 3px 0 7px; text-transform: uppercase; font-weight: 500; font-size: 18px; padding-bottom: 10px;">Conseils de s&eacute;curit&eacute; importants :</p>
-<ol style="margin-bottom: 0;">
-<li>Vos informations de compte doivent rester confidentielles.</li>
-<li>Ne les communiquez jamais &agrave; qui que ce soit.</li>
-<li>Changez votre mot de passe r&eacute;guli&egrave;rement.</li>
-<li>Si vous pensez que quelqu&#039;un utilise votre compte ill&eacute;galement, veuillez nous pr&eacute;venir imm&eacute;diatement.</li>
-</ol></td>
+<p style="border-bottom: 1px solid #D6D4D4; margin: 3px 0 7px; font-weight: 500; font-size: 18px; padding-bottom: 10px; text-align: center;">Des questions ?</p>
+<p style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;" face="Open-sans, sans-serif" color="#555454">N&#039;h&eacute;sitez pas &agrave; contacter notre Service Client&egrave;le par t&eacute;l&eacute;phone au 05 49 24 71 42 ou par email &agrave; contact@bio-concept-pharma.com, du lundi au jeudi de 8h &agrave; 12h30 et de 13h15 &agrave; 16h15 et le vendredi de 8h &agrave; 11h30.</p>
+</td>
 <td width="10" style="padding: 7px 0;">&nbsp;</td>
 </tr>
 </tbody>
@@ -117,13 +114,18 @@
 <td class="space_footer" style="padding: 0!important;">&nbsp;</td>
 </tr>
 <tr>
-<td class="linkbelow" style="padding: 7px 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> <span>Vous pouvez d&egrave;s &agrave; pr&eacute;sent passer commande sur notre boutique : <a href="{shop_url}" style="color: #337ff1;">{shop_name}</a></span> </span></td>
+<td class="linkbelow" style="padding: 7px 0; text-align: center;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"><strong>Vous pouvez d&egrave;s &agrave; pr&eacute;sent passer commande sur notre boutique <a href="{shop_url}" style="color: #337ff1;">{shop_name}</a> </strong></span></td>
 </tr>
 <tr>
 <td class="space_footer" style="padding: 0!important;">&nbsp;</td>
 </tr>
 <tr>
-<td class="footer" style="border-top: 4px solid #333333; padding: 7px 0;"><span><a href="{shop_url}" style="color: #337ff1;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color: #337ff1;">PrestaShop&trade;</a></span></td>
+<td class="footer" style="border-top: 2px solid #333333;"></td>
+</tr>
+<tr>
+<td align="center" class="logo">
+<p><img src="https://www.bio-concept-pharma.com/img/cms/bioconcept-cest_1.jpg" alt="Bio Concept c&#039;est" width="598" height="" /></p>
+</td>
 </tr>
 </tbody>
 </table>
--- a/web/themes/bioconcept/mails/fr/cheque.html
+++ b/web/themes/bioconcept/mails/fr/cheque.html
@@ -53,7 +53,8 @@
 </style>

 	</head>
-	<body style="-webkit-text-size-adjust:none;background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto" >
+	<body style="-webkit-text-size-adjust:none;background-color:#fff;width:650px;font-family:Open-sans, 
+	sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto" >
 <table class="table table-mail" style="width: 100%; margin-top: 10px; -moz-box-shadow: 0 0 5px #afafaf; -webkit-box-shadow: 0 0 5px #afafaf; -o-box-shadow: 0 0 5px #afafaf; box-shadow: 0 0 5px #afafaf; filter: progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5);">
 <tbody>
 <tr>
@@ -62,23 +63,58 @@
 <table class="table" bgcolor="#ffffff" style="width: 100%;">
 <tbody>
 <tr>
-<td align="center" class="logo" style="border-bottom: 4px solid #333333; padding: 7px 0;"><a title="{shop_name}" href="{shop_url}" style="color: #337ff1;"> <img src="{shop_logo}" alt="{shop_name}" /> </a></td>
+<td align="center" class="logo" style="border-bottom: 4px solid #333333; padding: 7px 0;">
+<p><a href="https://www.bio-concept-pharma.com"><img src="https://www.bio-concept-pharma.com/img/cms/logo-Bio-Concept-2018-couleur-email.jpg" alt="" width="83" height="100" /></a></p>
+</td>
 </tr>
 <tr>
-<td align="center" class="titleblock" style="padding: 7px 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> <span class="title" style="font-weight: 500; font-size: 28px; text-transform: uppercase; line-height: 33px;">Bonjour {firstname} {lastname},</span><br /> <span class="subtitle" style="font-weight: 500; font-size: 16px; text-transform: uppercase; line-height: 25px;">Merci d&#039;avoir effectu&eacute; vos achats sur {shop_name} !!</span></span></td>
+<td align="center" class="titleblock" style="padding: 7px 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> <span class="title" style="font-weight: 500; font-size: 20px; text-transform: uppercase; line-height: 33px;"> Bonjour {firstname},</span><br /></span></td>
 </tr>
 <tr>
 <td class="space_footer" style="padding: 0!important;">&nbsp;</td>
 </tr>
 <tr>
-<td class="box" style="border: 1px solid #D6D4D4; background-color: #f8f8f8; padding: 7px 0;">
+<td class="box" style="border: 1px solid #D6D4D4; padding: 5px 0;">
+<table class="table" style="width: 100%;">
+<tbody>
+<tr>
+<td align="center" class="titleblock" style="padding: 7px 0;">
+<p><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"><span class="subtitle" style="font-weight: 500; font-size: 16px; line-height: 25px;">Nous avons bien enregistr&eacute; votre <strong>commande {order_name}</strong>. <br />Celle-ci vous sera envoy&eacute;e d&egrave;s r&eacute;ception de votre paiement par ch&egrave;que. </span></span></p>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+<tr>
+<td class="box" style="border: 1px solid #D6D4D4; padding: 5px 0;">
+<table class="table" style="width: 100%;">
+<tbody>
+<tr>
+<td align="center" class="titleblock" style="padding: 7px 0;">
+<p><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"><span class="subtitle" style="font-weight: 500; font-size: 16px; line-height: 25px;">Voici les informations n&eacute;cessaires pour effectuer votre paiement : <br /><strong>Montant</strong> : {total_paid} <br /><strong>&Agrave; l&#039;ordre de</strong> : {check_name} <br /><strong>Veuillez envoyer votre ch&egrave;que &agrave; l&#039;adresse suivante</strong> : <br />{check_address_html} </span></span></p>
+</td>
+</tr>
+<tr>
+<td align="center" class="logo">
+<p><strong>Statut de votre commande</strong> <br /><img src="https://www.bio-concept-pharma.com/img/cms/cde-cheque.png" alt="Commande en cours de pr&eacute;paration" width="598" height="" /></p>
+<p><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"><span class="subtitle" style="font-weight: 500; font-size: 16px; line-height: 25px;">Vous pouvez acc&eacute;der &agrave; tout moment au suivi de votre commande <br />en vous rendant sur votre compte <a href="https://www.bio-concept-pharma.com/mon-compte">BioConcept</a></span></span></p>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+<tr>
+<td class="box" style="border: 1px solid #D6D4D4; padding: 7px 0;">
 <table class="table" style="width: 100%;">
 <tbody>
 <tr>
 <td width="10" style="padding: 7px 0;">&nbsp;</td>
 <td style="padding: 7px 0;">
-<p data-html-only="1" style="border-bottom: 1px solid #D6D4D4; margin: 3px 0 7px; text-transform: uppercase; font-weight: 500; font-size: 18px; padding-bottom: 10px;">Commande {order_name}&nbsp;-&nbsp;En attente du paiement par ch&egrave;que</p>
-<span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"><span style="color: #777;"> Nous avons bien enregistr&eacute; votre commande ayant pour r&eacute;f&eacute;rence <span style="color: #333;"><strong>{order_name}</strong></span>. Celle-ci vous sera <strong>envoy&eacute;e d&egrave;s r&eacute;ception de votre paiement</strong>. </span> </span></td>
+<p style="border-bottom: 1px solid #D6D4D4; margin: 3px 0 7px; font-weight: 500; font-size: 18px; padding-bottom: 10px; text-align: center;">Des questions ?</p>
+<p style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;" face="Open-sans, sans-serif" color="#555454">N&#039;h&eacute;sitez pas &agrave; contacter notre Service Client&egrave;le par t&eacute;l&eacute;phone au 05 49 24 71 42 ou <br />par email &agrave; contact@bio-concept-pharma.com, du lundi au jeudi de 8h &agrave; 12h30 <br />et de 13h15 &agrave; 16h15 et le vendredi de 8h &agrave; 11h30.</p>
+</td>
 <td width="10" style="padding: 7px 0;">&nbsp;</td>
 </tr>
 </tbody>
@@ -89,35 +125,13 @@
 <td class="space_footer" style="padding: 0!important;">&nbsp;</td>
 </tr>
 <tr>
-<td class="box" style="border: 1px solid #D6D4D4; background-color: #f8f8f8; padding: 7px 0;">
-<table class="table" style="width: 100%;">
-<tbody>
-<tr>
-<td width="10" style="padding: 7px 0;">&nbsp;</td>
-<td style="padding: 7px 0;">
-<p style="border-bottom: 1px solid #D6D4D4; margin: 3px 0 7px; text-transform: uppercase; font-weight: 500; font-size: 18px; padding-bottom: 10px;">Vous avez choisi de payer par ch&egrave;que.</p>
-<span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"><span style="color: #777;"> Voici les informations dont vous avez besoin pour effectuer le paiement :<br /> <span style="color: #333;"><strong>Montant :</strong></span> {total_paid}<br /> <span style="color: #333;"><strong>&Agrave; l&#039;ordre de :</strong></span> {check_name}<br /> <span style="color: #333;"><strong>Veuillez envoyer votre ch&egrave;que &agrave; l&#039;adresse suivante :</strong></span> {check_address_html} </span> </span></td>
-<td width="10" style="padding: 7px 0;">&nbsp;</td>
+<td class="footer" style="border-top: 2px solid #333333;"></td>
 </tr>
-</tbody>
-</table>
+<tr>
+<td align="center" class="logo">
+<p><img src="https://www.bio-concept-pharma.com/img/cms/bioconcept-cest_1.jpg" alt="Bio Concept c&#039;est" width="598" height="" /></p>
 </td>
 </tr>
-<tr>
-<td class="space_footer" style="padding: 0!important;">&nbsp;</td>
-</tr>
-<tr>
-<td class="linkbelow" style="padding: 7px 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> <span> Vous pouvez acc&eacute;der &agrave; tout moment au suivi de votre commande et t&eacute;l&eacute;charger votre facture dans <a href="{history_url}" style="color: #337ff1;">"Historique des commandes"</a> de la rubrique <a href="{my_account_url}" style="color: #337ff1;">"Mon compte"</a> sur notre site. </span> </span></td>
-</tr>
-<tr>
-<td class="linkbelow" style="padding: 7px 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> <span> Si vous avez un compte invit&eacute;, vous pouvez suivre votre commande via la section <a href="{guest_tracking_url}" style="color: #337ff1;">"Suivi invit&eacute;"</a> sur notre boutique. </span> </span></td>
-</tr>
-<tr>
-<td class="space_footer" style="padding: 0!important;">&nbsp;</td>
-</tr>
-<tr>
-<td class="footer" style="border-top: 4px solid #333333; padding: 7px 0;"><span><a href="{shop_url}" style="color: #337ff1;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color: #337ff1;">PrestaShop&trade;</a></span></td>
-</tr>
 </tbody>
 </table>
 </td>
--- a/web/themes/bioconcept/mails/fr/order_conf.html
+++ b/web/themes/bioconcept/mails/fr/order_conf.html
@@ -56,344 +56,272 @@

 	</head>
 	<body style="-webkit-text-size-adjust:none;background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto" >
-		<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
-			<tr>
-				<td class="space" style="width:20px;padding:7px 0">&nbsp;</td>
-				<td align="center" style="padding:7px 0">
-					<table class="table" bgcolor="#ffffff" style="width:100%">
-						<tr>
-							<td align="center" class="logo" style="border-bottom:4px solid #333333;padding:7px 0">
-								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
-									<img src="{shop_logo}" alt="{shop_name}" />
-								</a>
-							</td>
-						</tr>
-
+<table class="table table-mail" style="width: 100%; margin-top: 10px; -moz-box-shadow: 0 0 5px #afafaf; -webkit-box-shadow: 0 0 5px #afafaf; -o-box-shadow: 0 0 5px #afafaf; box-shadow: 0 0 5px #afafaf; filter: progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5);">
+<tbody>
 <tr>
-	<td align="center" class="titleblock" style="padding:7px 0">
-		<font size="2" face="Open-sans, sans-serif" color="#555454">
-			<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Bonjour {firstname} {lastname},</span><br/>
-			<span class="subtitle" style="font-weight:500;font-size:16px;text-transform:uppercase;line-height:25px">Merci d&#039;avoir effectu&eacute; vos achats sur {shop_name}!</span>
-		</font>
-	</td>
+<td class="space" style="width: 20px; padding: 7px 0;">&nbsp;</td>
+<td align="center" style="padding: 7px 0;">
+<table class="table" bgcolor="#ffffff" style="width: 100%;">
+<tbody>
+<tr>
+<td align="center" class="logo" style="border-bottom: 4px solid #333333; padding: 7px 0;"><a title="{shop_name}" href="{shop_url}" style="color: #337ff1;"> <img src="{shop_logo}" alt="{shop_name}" /> </a></td>
 </tr>
 <tr>
-	<td class="space_footer" style="padding:0!important">&nbsp;</td>
+<td align="center" class="titleblock" style="padding: 7px 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> <span class="title" style="font-weight: 500; font-size: 28px; text-transform: uppercase; line-height: 33px;">Bonjour {firstname} {lastname},</span><br /> <span class="subtitle" style="font-weight: 500; font-size: 16px; text-transform: uppercase; line-height: 25px;">Merci d&#039;avoir effectu&eacute; vos achats sur {shop_name}!</span> </span></td>
 </tr>
 <tr>
-	<td class="box" style="border:1px solid #D6D4D4;background-color:#f8f8f8;padding:7px 0">
-		<table class="table" style="width:100%">
-			<tr>
-				<td width="10" style="padding:7px 0">&nbsp;</td>
-				<td style="padding:7px 0">
-					<font size="2" face="Open-sans, sans-serif" color="#555454">
-						<p data-html-only="1" style="border-bottom:1px solid #D6D4D4;margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;padding-bottom:10px">
-							D&eacute;tails de la commande						</p>
-						<span style="color:#777">
-							<span style="color:#333"><strong>Commande :</strong></span> {order_name} pass&eacute;e le {date}<br /><br />
-							<span style="color:#333"><strong>Paiement :</strong></span> {payment}
-						</span>
-					</font>
-				</td>
-				<td width="10" style="padding:7px 0">&nbsp;</td>
-			</tr>
-		</table>
-	</td>
+<td class="space_footer" style="padding: 0!important;">&nbsp;</td>
 </tr>
 <tr>
-	<td style="padding:7px 0">
-		<font size="2" face="Open-sans, sans-serif" color="#555454">
-			<table class="table table-recap" bgcolor="#ffffff" style="width:100%;border-collapse:collapse"><!-- Title -->
-				<tr>
-					<th bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;background-color: #fbfbfb;color: #333;font-family: Arial;font-size: 13px;padding: 10px;">R&eacute;f&eacute;rence</th>
-					<th bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;background-color: #fbfbfb;color: #333;font-family: Arial;font-size: 13px;padding: 10px;">Produit</th>
-					<th bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;background-color: #fbfbfb;color: #333;font-family: Arial;font-size: 13px;padding: 10px;" width="17%">Prix unitaire</th>
-					<th bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;background-color: #fbfbfb;color: #333;font-family: Arial;font-size: 13px;padding: 10px;">Quantit&eacute;</th>
-					<th bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;background-color: #fbfbfb;color: #333;font-family: Arial;font-size: 13px;padding: 10px;" width="17%">Prix total</th>
-				</tr>
-				<tr>
-					<td colspan="5" style="border:1px solid #D6D4D4;text-align:center;color:#777;padding:7px 0">
-						&nbsp;&nbsp;{products} 
-					</td>
-				</tr>
-				<tr>
-					<td colspan="5" style="border:1px solid #D6D4D4;text-align:center;color:#777;padding:7px 0">
-						&nbsp;&nbsp;{discounts}
-					</td>
-				</tr>
-				<tr class="conf_body">
-					<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
-						<table class="table" style="width:100%;border-collapse:collapse">
-							<tr>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-								<td align="right" style="color:#333;padding:0">
-									<font size="2" face="Open-sans, sans-serif" color="#555454">
-										<strong>Produits</strong>
-									</font>
-								</td>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-							</tr>
-						</table>
-					</td>
-					<td bgcolor="#f8f8f8" align="right" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
-						<table class="table" style="width:100%;border-collapse:collapse">
-							<tr>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-								<td align="right" style="color:#333;padding:0">
-									<font size="2" face="Open-sans, sans-serif" color="#555454">
-										{total_products}
-									</font>
-								</td>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-				<tr class="conf_body">
-					<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
-						<table class="table" style="width:100%;border-collapse:collapse">
-							<tr>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-								<td align="right" style="color:#333;padding:0">
-									<font size="2" face="Open-sans, sans-serif" color="#555454">
-										<strong>R&eacute;ductions</strong>
-									</font>
-								</td>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-							</tr>
-						</table>
-					</td>
-					<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
-						<table class="table" style="width:100%;border-collapse:collapse">
-							<tr>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-								<td align="right" style="color:#333;padding:0">
-									<font size="2" face="Open-sans, sans-serif" color="#555454">
-										{total_discounts}
-									</font>
-								</td>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-				<tr class="conf_body">
-					<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
-						<table class="table" style="width:100%;border-collapse:collapse">
-							<tr>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-								<td align="right" style="color:#333;padding:0">
-									<font size="2" face="Open-sans, sans-serif" color="#555454">
-										<strong>Paquet cadeau</strong>
-									</font>
-								</td>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-							</tr>
-						</table>
-					</td>
-					<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
-						<table class="table" style="width:100%;border-collapse:collapse">
-							<tr>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-								<td align="right" style="color:#333;padding:0">
-									<font size="2" face="Open-sans, sans-serif" color="#555454">
-										{total_wrapping}
-									</font>
-								</td>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-				<tr class="conf_body">
-					<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
-						<table class="table" style="width:100%;border-collapse:collapse">
-							<tr>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-								<td align="right" style="color:#333;padding:0">
-									<font size="2" face="Open-sans, sans-serif" color="#555454">
-										<strong>Livraison</strong>
-									</font>
-								</td>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-							</tr>
-						</table>
-					</td>
-					<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
-						<table class="table" style="width:100%;border-collapse:collapse">
-							<tr>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-								<td align="right" style="color:#333;padding:0">
-									<font size="2" face="Open-sans, sans-serif" color="#555454">
-										{total_shipping}
-									</font>
-								</td>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-				<tr class="conf_body">
-					<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
-						<table class="table" style="width:100%;border-collapse:collapse">
-							<tr>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-								<td align="right" style="color:#333;padding:0">
-									<font size="2" face="Open-sans, sans-serif" color="#555454">
-										<strong>TVA totale</strong>
-									</font>
-								</td>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-							</tr>
-						</table>
-					</td>
-					<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
-						<table class="table" style="width:100%;border-collapse:collapse">
-							<tr>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-								<td align="right" style="color:#333;padding:0">
-									<font size="2" face="Open-sans, sans-serif" color="#555454">
-										{total_tax_paid}
-									</font>
-								</td>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-				<tr class="conf_body">
-					<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
-						<table class="table" style="width:100%;border-collapse:collapse">
-							<tr>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-								<td align="right" style="color:#333;padding:0">
-									<font size="2" face="Open-sans, sans-serif" color="#555454">
-										<strong>Total pay&eacute;</strong>
-									</font>
-								</td>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-							</tr>
-						</table>
-					</td>
-					<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
-						<table class="table" style="width:100%;border-collapse:collapse">
-							<tr>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-								<td align="right" style="color:#333;padding:0">
-									<font size="4" face="Open-sans, sans-serif" color="#555454">
-										{total_paid}
-									</font>
-								</td>
-								<td width="10" style="color:#333;padding:0">&nbsp;</td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-				</tbody>
-			</table>
-		</font>
-	</td>
+<td class="box" style="border: 1px solid #D6D4D4; background-color: #f8f8f8; padding: 7px 0;">
+<table class="table" style="width: 100%;">
+<tbody>
+<tr>
+<td width="10" style="padding: 7px 0;">&nbsp;</td>
+<td style="padding: 7px 0;">
+<p data-html-only="1" style="border-bottom: 1px solid #D6D4D4; margin: 3px 0 7px; text-transform: uppercase; font-weight: 500; font-size: 18px; padding-bottom: 10px;">D&eacute;tails de la commande</p>
+<span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"><span style="color: #777;"> <span style="color: #333;"><strong>Commande :</strong></span> {order_name} pass&eacute;e le {date}<br /><br /> <span style="color: #333;"><strong>Paiement :</strong></span> {payment} </span> </span></td>
+<td width="10" style="padding: 7px 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</td>
 </tr>
 <tr>
-	<td class="box" style="border:1px solid #D6D4D4;background-color:#f8f8f8;padding:7px 0">
-		<table class="table" style="width:100%">
-			<tr>
-				<td width="10" style="padding:7px 0">&nbsp;</td>
-				<td style="padding:7px 0">
-					<font size="2" face="Open-sans, sans-serif" color="#555454">
-						<p data-html-only="1" style="border-bottom:1px solid #D6D4D4;margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;padding-bottom:10px">
-							Livraison						</p>
-						<span style="color:#777">
-							<span style="color:#333"><strong>Transporteur :</strong></span> {carrier}<br /><br />
-							<span style="color:#333"><strong>Paiement :</strong></span> {payment}
-						</span>
-					</font>
-				</td>
-				<td width="10" style="padding:7px 0">&nbsp;</td>
-			</tr>
-		</table>
-	</td>
+<td style="padding: 7px 0;">
+<table class="table table-recap" bgcolor="#ffffff" style="width: 100%; border-collapse: collapse;"><!-- Title -->
+<tbody>
+<tr><th bgcolor="#f8f8f8" style="border: 1px solid #D6D4D4; background-color: #fbfbfb; color: #333; font-family: Arial; font-size: 13px; padding: 10px;">R&eacute;f&eacute;rence</th><th bgcolor="#f8f8f8" style="border: 1px solid #D6D4D4; background-color: #fbfbfb; color: #333; font-family: Arial; font-size: 13px; padding: 10px;">Produit</th><th bgcolor="#f8f8f8" style="border: 1px solid #D6D4D4; background-color: #fbfbfb; color: #333; font-family: Arial; font-size: 13px; padding: 10px;" width="17%">Prix unitaire</th><th bgcolor="#f8f8f8" style="border: 1px solid #D6D4D4; background-color: #fbfbfb; color: #333; font-family: Arial; font-size: 13px; padding: 10px;">Quantit&eacute;</th><th bgcolor="#f8f8f8" style="border: 1px solid #D6D4D4; background-color: #fbfbfb; color: #333; font-family: Arial; font-size: 13px; padding: 10px;" width="17%">Prix total</th></tr>
+<tr>
+<td colspan="5" style="border: 1px solid #D6D4D4; text-align: center; color: #777; padding: 7px 0;">&nbsp;&nbsp;{products}</td>
 </tr>
 <tr>
-	<td class="space_footer" style="padding:0!important">&nbsp;</td>
+<td colspan="5" style="border: 1px solid #D6D4D4; text-align: center; color: #777; padding: 7px 0;">&nbsp;&nbsp;{discounts}</td>
+</tr>
+<tr class="conf_body">
+<td bgcolor="#f8f8f8" colspan="4" style="border: 1px solid #D6D4D4; color: #333; padding: 7px 0;">
+<table class="table" style="width: 100%; border-collapse: collapse;">
+<tbody>
+<tr>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+<td align="right" style="color: #333; padding: 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> <strong>Produits</strong> </span></td>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</td>
+<td bgcolor="#f8f8f8" align="right" colspan="4" style="border: 1px solid #D6D4D4; color: #333; padding: 7px 0;">
+<table class="table" style="width: 100%; border-collapse: collapse;">
+<tbody>
+<tr>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+<td align="right" style="color: #333; padding: 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> {total_products} </span></td>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+<tr class="conf_body">
+<td bgcolor="#f8f8f8" colspan="4" style="border: 1px solid #D6D4D4; color: #333; padding: 7px 0;">
+<table class="table" style="width: 100%; border-collapse: collapse;">
+<tbody>
+<tr>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+<td align="right" style="color: #333; padding: 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> <strong>R&eacute;ductions</strong> </span></td>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</td>
+<td bgcolor="#f8f8f8" colspan="4" style="border: 1px solid #D6D4D4; color: #333; padding: 7px 0;">
+<table class="table" style="width: 100%; border-collapse: collapse;">
+<tbody>
+<tr>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+<td align="right" style="color: #333; padding: 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> {total_discounts} </span></td>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+<tr class="conf_body">
+<td bgcolor="#f8f8f8" colspan="4" style="border: 1px solid #D6D4D4; color: #333; padding: 7px 0;">
+<table class="table" style="width: 100%; border-collapse: collapse;">
+<tbody>
+<tr>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+<td align="right" style="color: #333; padding: 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> <strong>Paquet cadeau</strong> </span></td>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</td>
+<td bgcolor="#f8f8f8" colspan="4" style="border: 1px solid #D6D4D4; color: #333; padding: 7px 0;">
+<table class="table" style="width: 100%; border-collapse: collapse;">
+<tbody>
+<tr>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+<td align="right" style="color: #333; padding: 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> {total_wrapping} </span></td>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+<tr class="conf_body">
+<td bgcolor="#f8f8f8" colspan="4" style="border: 1px solid #D6D4D4; color: #333; padding: 7px 0;">
+<table class="table" style="width: 100%; border-collapse: collapse;">
+<tbody>
+<tr>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+<td align="right" style="color: #333; padding: 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> <strong>Livraison</strong> </span></td>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</td>
+<td bgcolor="#f8f8f8" colspan="4" style="border: 1px solid #D6D4D4; color: #333; padding: 7px 0;">
+<table class="table" style="width: 100%; border-collapse: collapse;">
+<tbody>
+<tr>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+<td align="right" style="color: #333; padding: 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> {total_shipping} </span></td>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+<tr class="conf_body">
+<td bgcolor="#f8f8f8" colspan="4" style="border: 1px solid #D6D4D4; color: #333; padding: 7px 0;">
+<table class="table" style="width: 100%; border-collapse: collapse;">
+<tbody>
+<tr>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+<td align="right" style="color: #333; padding: 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> <strong>TVA totale</strong> </span></td>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</td>
+<td bgcolor="#f8f8f8" colspan="4" style="border: 1px solid #D6D4D4; color: #333; padding: 7px 0;">
+<table class="table" style="width: 100%; border-collapse: collapse;">
+<tbody>
+<tr>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+<td align="right" style="color: #333; padding: 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> {total_tax_paid} </span></td>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+<tr class="conf_body">
+<td bgcolor="#f8f8f8" colspan="4" style="border: 1px solid #D6D4D4; color: #333; padding: 7px 0;">
+<table class="table" style="width: 100%; border-collapse: collapse;">
+<tbody>
+<tr>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+<td align="right" style="color: #333; padding: 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> <strong>Total pay&eacute;</strong> </span></td>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</td>
+<td bgcolor="#f8f8f8" colspan="4" style="border: 1px solid #D6D4D4; color: #333; padding: 7px 0;">
+<table class="table" style="width: 100%; border-collapse: collapse;">
+<tbody>
+<tr>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+<td align="right" style="color: #333; padding: 0;"><span size="4" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: large;"> {total_paid} </span></td>
+<td width="10" style="color: #333; padding: 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
 </tr>
 <tr>
-	<td style="padding:7px 0">
-		<table class="table" style="width:100%">
-			<tr>
-				<td class="box address" width="310" style="border:1px solid #D6D4D4;background-color:#f8f8f8;padding:7px 0">
-					<table class="table" style="width:100%">
-						<tr>
-							<td width="10" style="padding:7px 0">&nbsp;</td>
-							<td style="padding:7px 0">
-								<font size="2" face="Open-sans, sans-serif" color="#555454">
-									<p data-html-only="1" style="border-bottom:1px solid #D6D4D4;margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;padding-bottom:10px">
-										Adresse de livraison									</p>
-									<span data-html-only="1" style="color:#777">
-										{delivery_block_html}
-									</span>
-									
-								</font>
-							</td>
-							<td width="10" style="padding:7px 0">&nbsp;</td>
-						</tr>
-					</table>
-				</td>
-				<td width="20" class="space_address" style="padding:7px 0">&nbsp;</td>
-				<td class="box address" width="310" style="border:1px solid #D6D4D4;background-color:#f8f8f8;padding:7px 0">
-					<table class="table" style="width:100%">
-						<tr>
-							<td width="10" style="padding:7px 0">&nbsp;</td>
-							<td style="padding:7px 0">
-								<font size="2" face="Open-sans, sans-serif" color="#555454">
-									<p data-html-only="1" style="border-bottom:1px solid #D6D4D4;margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;padding-bottom:10px">
-										Adresse de facturation									</p>
-									<span data-html-only="1" style="color:#777">
-										{invoice_block_html}
-									</span>
-									
-								</font>
-							</td>
-							<td width="10" style="padding:7px 0">&nbsp;</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-		</table>
-	</td>
+<td class="box" style="border: 1px solid #D6D4D4; background-color: #f8f8f8; padding: 7px 0;">
+<table class="table" style="width: 100%;">
+<tbody>
+<tr>
+<td width="10" style="padding: 7px 0;">&nbsp;</td>
+<td style="padding: 7px 0;">
+<p data-html-only="1" style="border-bottom: 1px solid #D6D4D4; margin: 3px 0 7px; text-transform: uppercase; font-weight: 500; font-size: 18px; padding-bottom: 10px;">Livraison</p>
+<span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"><span style="color: #777;"> <span style="color: #333;"><strong>Transporteur :</strong></span> {carrier}<br /><br /> <span style="color: #333;"><strong>Paiement :</strong></span> {payment} </span> </span></td>
+<td width="10" style="padding: 7px 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</td>
 </tr>
 <tr>
-	<td class="space_footer" style="padding:0!important">&nbsp;</td>
+<td class="space_footer" style="padding: 0!important;">&nbsp;</td>
 </tr>
 <tr>
-	<td class="linkbelow" style="padding:7px 0">
-		<font size="2" face="Open-sans, sans-serif" color="#555454">
-			<span>
-				Vous pouvez acc&eacute;der &agrave; tout moment au suivi de votre commande et t&eacute;l&eacute;charger votre facture dans <a href="{history_url}" style="color:#337ff1">"Historique des commandes"</a> de la rubrique <a href="{my_account_url}" style="color:#337ff1">"Mon compte"</a> sur notre site.			</span>
-		</font>
-	</td>
+<td style="padding: 7px 0;">
+<table class="table" style="width: 100%;">
+<tbody>
+<tr>
+<td class="box address" width="310" style="border: 1px solid #D6D4D4; background-color: #f8f8f8; padding: 7px 0;">
+<table class="table" style="width: 100%;">
+<tbody>
+<tr>
+<td width="10" style="padding: 7px 0;">&nbsp;</td>
+<td style="padding: 7px 0;">
+<p data-html-only="1" style="border-bottom: 1px solid #D6D4D4; margin: 3px 0 7px; text-transform: uppercase; font-weight: 500; font-size: 18px; padding-bottom: 10px;">Adresse de livraison</p>
+<span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"><span data-html-only="1" style="color: #777;"> {delivery_block_html} </span> </span></td>
+<td width="10" style="padding: 7px 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</td>
+<td width="20" class="space_address" style="padding: 7px 0;">&nbsp;</td>
+<td class="box address" width="310" style="border: 1px solid #D6D4D4; background-color: #f8f8f8; padding: 7px 0;">
+<table class="table" style="width: 100%;">
+<tbody>
+<tr>
+<td width="10" style="padding: 7px 0;">&nbsp;</td>
+<td style="padding: 7px 0;">
+<p data-html-only="1" style="border-bottom: 1px solid #D6D4D4; margin: 3px 0 7px; text-transform: uppercase; font-weight: 500; font-size: 18px; padding-bottom: 10px;">Adresse de facturation</p>
+<span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"><span data-html-only="1" style="color: #777;"> {invoice_block_html} </span> </span></td>
+<td width="10" style="padding: 7px 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
 </tr>
 <tr>
-	<td class="linkbelow" style="padding:7px 0">
-		<font size="2" face="Open-sans, sans-serif" color="#555454">
-			<span>
-				Si vous avez un compte invit&eacute;, vous pouvez suivre votre commande dans la section <a href="{guest_tracking_url}?id_order={order_name}" style="color:#337ff1">"Suivi invit&eacute;"</a> de notre site.			</span>
-		</font>
-	</td>
+<td class="space_footer" style="padding: 0!important;">&nbsp;</td>
 </tr>
-
-						<tr>
-							<td class="space_footer" style="padding:0!important">&nbsp;</td>
-						</tr>
-						<tr>
-							<td class="footer" style="border-top:4px solid #333333;padding:7px 0">
-								<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
-							</td>
-						</tr>
-					</table>
-				</td>
-				<td class="space" style="width:20px;padding:7px 0">&nbsp;</td>
-			</tr>
-		</table>
-	</body>
+<tr>
+<td class="linkbelow" style="padding: 7px 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> <span> Vous pouvez acc&eacute;der &agrave; tout moment au suivi de votre commande et t&eacute;l&eacute;charger votre facture dans <a href="{history_url}" style="color: #337ff1;">"Historique des commandes"</a> de la rubrique <a href="{my_account_url}" style="color: #337ff1;">"Mon compte"</a> sur notre site. </span> </span></td>
+</tr>
+<tr>
+<td class="linkbelow" style="padding: 7px 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> <span> Si vous avez un compte invit&eacute;, vous pouvez suivre votre commande dans la section <a href="{guest_tracking_url}?id_order={order_name}" style="color: #337ff1;">"Suivi invit&eacute;"</a> de notre site. </span> </span></td>
+</tr>
+<tr>
+<td class="space_footer" style="padding: 0!important;">&nbsp;</td>
+</tr>
+<tr>
+<td class="footer" style="border-top: 4px solid #333333; padding: 7px 0;"><span><a href="{shop_url}" style="color: #337ff1;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color: #337ff1;">PrestaShop&trade;</a></span></td>
+</tr>
+</tbody>
+</table>
+</td>
+<td class="space" style="width: 20px; padding: 7px 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</body>
 </html>
--- a/web/themes/bioconcept/mails/fr/payment.html
+++ b/web/themes/bioconcept/mails/fr/payment.html
@@ -11,6 +11,7 @@
 					width:218px !important;
 					margin:auto !important;
 				}
+				thead, tbody{width: 100%}
 				.table {width:195px !important;margin:auto !important;}
 				.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}		
 				span.title{font-size:20px !important;line-height: 23px !important}
@@ -25,24 +26,25 @@
 				.space_address{display: none !important;}	
 			}
 	@media only screen and (min-width: 301px) and (max-width: 500px) { 
-				body {width:308px!important;margin:auto!important;}
-				.table {width:285px!important;margin:auto!important;}	
+				body {width:425px!important;margin:auto!important;}
+				thead, tbody{width: 100%}
+				.table {margin:auto!important;}	
 				.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}	
-				.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr { 
-					display: block !important; 
-				}
 				.table-recap{width: 295px !important;}
 				.table-recap tr td, .conf_body td{text-align:center !important;}
+				.table-recap tr th{font-size: 10px !important}
 				
 			}
 	@media only screen and (min-width: 501px) and (max-width: 768px) {
 				body {width:478px!important;margin:auto!important;}
-				.table {width:450px!important;margin:auto!important;}	
+				thead, tbody{width: 100%}
+				.table {margin:auto!important;}	
 				.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}			
 			}
 	@media only screen and (max-device-width: 480px) { 
-				body {width:308px!important;margin:auto!important;}
-				.table {width:285px;margin:auto!important;}	
+				body {width:340px!important;margin:auto!important;}
+				thead, tbody{width: 100%}
+				.table {margin:auto!important;}	
 				.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
 				
 				.table-recap{width: 295px!important;}
@@ -53,81 +55,79 @@
 </style>

 	</head>
-	<body style="-webkit-text-size-adjust:none;background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto" >
-		<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
-			<tr>
-				<td class="space" style="width:20px;padding:7px 0">&nbsp;</td>
-				<td align="center" style="padding:7px 0">
-					<table class="table" bgcolor="#ffffff" style="width:100%">
-						<tr>
-							<td align="center" class="logo" style="border-bottom:4px solid #333333;padding:7px 0">
-								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
-									<img src="{shop_logo}" alt="{shop_name}" />
-								</a>
-							</td>
-						</tr>
-
+	<body style="-webkit-text-size-adjust:none;background-color:#fff;width:650px;font-family:Open-sans, 
+	sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto" >
+<table class="table table-mail" style="width: 100%; margin-top: 10px; -moz-box-shadow: 0 0 5px #afafaf; -webkit-box-shadow: 0 0 5px #afafaf; -o-box-shadow: 0 0 5px #afafaf; box-shadow: 0 0 5px #afafaf; filter: progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5);">
+<tbody>
 <tr>
-	<td align="center" class="titleblock" style="padding:7px 0">
-		<font size="2" face="Open-sans, sans-serif" color="#555454">
-			<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Bonjour {firstname} {lastname},</span><br/>
-			<span class="subtitle" style="font-weight:500;font-size:16px;text-transform:uppercase;line-height:25px">Merci d&#039;avoir effectu&eacute; vos achats sur {shop_name}!</span>
-		</font>
-	</td>
+<td class="space" style="width: 20px; padding: 7px 0;">&nbsp;</td>
+<td align="center" style="padding: 7px 0;">
+<table class="table" bgcolor="#ffffff" style="width: 100%;">
+<tbody>
+<tr>
+<td align="center" class="logo" style="border-bottom: 4px solid #333333; padding: 7px 0;">
+<p><img src="https://www.bio-concept-pharma.com/img/cms/logo-Bio-Concept-2018-couleur-email.jpg" alt="" width="83" height="100" /></p>
+</td>
 </tr>
 <tr>
-	<td class="space_footer" style="padding:0!important">&nbsp;</td>
+<td align="center" class="titleblock" style="padding: 7px 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> <span class="title" style="font-weight: 500; font-size: 20px; text-transform: uppercase; line-height: 33px;"> Bonjour {firstname},</span><br /></span></td>
 </tr>
 <tr>
-	<td class="box" style="border:1px solid #D6D4D4;background-color:#f8f8f8;padding:7px 0">
-		<table class="table" style="width:100%">
-			<tr>
-				<td width="10" style="padding:7px 0">&nbsp;</td>
-				<td style="padding:7px 0">
-					<font size="2" face="Open-sans, sans-serif" color="#555454">
-						<p data-html-only="1" style="border-bottom:1px solid #D6D4D4;margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;padding-bottom:10px">
-							Commande {order_name}&nbsp;-&nbsp;Paiement accept&eacute;						</p>
-						<span style="color:#777">
-							Le paiement pour votre commande ayant pour r&eacute;f&eacute;rence <strong><span style="color:#333">{order_name}</span></strong> a &eacute;t&eacute; accept&eacute;.						</span>
-					</font>
-				</td>
-				<td width="10" style="padding:7px 0">&nbsp;</td>
-			</tr>
-		</table>
-	</td>
+<td class="space_footer" style="padding: 0!important;">&nbsp;</td>
 </tr>
 <tr>
-	<td class="space_footer" style="padding:0!important">&nbsp;</td>
+<td class="box" style="border: 1px solid #D6D4D4; padding: 5px 0;">
+<table class="table" style="width: 100%;">
+<tbody>
+<tr>
+<td align="center" class="titleblock" style="padding: 7px 0;">
+<p><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"><span class="subtitle" style="font-weight: 500; font-size: 16px; line-height: 25px;"><strong>Merci d&#039;avoir effectu&eacute; vos achats sur Bio Concept Pharma. </strong></span></span></p>
+<p><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"><span class="subtitle" style="font-weight: 500; font-size: 16px; line-height: 25px;"> Votre commande est valid&eacute;e ! <br />Voici votre r&eacute;capitulatif : <br />Commande : {order_name} <br />Montant : {total_paid}</span></span></p>
+</td>
+<td width="10" style="padding: 7px 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</td>
 </tr>
 <tr>
-	<td class="linkbelow" style="padding:7px 0">
-		<font size="2" face="Open-sans, sans-serif" color="#555454">
-			<span>
-				Vous pouvez acc&eacute;der &agrave; tout moment au suivi de votre commande et t&eacute;l&eacute;charger votre facture dans <a href="{history_url}" style="color:#337ff1">"Historique des commandes"</a> de la rubrique <a href="{my_account_url}" style="color:#337ff1">"Mon compte"</a> sur notre site.			</span>
-		</font>
-	</td>
+<td align="center" class="logo">
+<p><strong>Statut de votre commande</strong> <img src="https://www.bio-concept-pharma.com/img/cms/cde-valide.png" alt="Commande valid&eacute;e" width="598" height="" /></p>
+</td>
 </tr>
 <tr>
-	<td class="linkbelow" style="padding:7px 0">
-		<font size="2" face="Open-sans, sans-serif" color="#555454">
-			<span>
-				Si vous avez un compte invit&eacute;, vous pouvez suivre votre commande dans la section <a href="{guest_tracking_url}?id_order={order_name}" style="color:#337ff1">"Suivi invit&eacute;"</a> de notre site.			</span>
-		</font>
-	</td>
+<td class="box" style="border: 1px solid #D6D4D4; padding: 7px 0;">
+<table class="table" style="width: 100%;">
+<tbody>
+<tr>
+<td width="10" style="padding: 7px 0;">&nbsp;</td>
+<td style="padding: 7px 0;">
+<p style="border-bottom: 1px solid #D6D4D4; margin: 3px 0 7px; font-weight: 500; font-size: 18px; padding-bottom: 10px; text-align: center;">Des questions ?</p>
+<p style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;" face="Open-sans, sans-serif" color="#555454">N&#039;h&eacute;sitez pas &agrave; contacter notre Service Client&egrave;le par t&eacute;l&eacute;phone au 05 49 24 71 42 ou par email &agrave; contact@bio-concept-pharma.com, du lundi au jeudi de 8h &agrave; 12h30 et de 13h15 &agrave; 16h15 et le vendredi de 8h &agrave; 11h30.</p>
+</td>
+<td width="10" style="padding: 7px 0;">&nbsp;</td>
 </tr>
-
-						<tr>
-							<td class="space_footer" style="padding:0!important">&nbsp;</td>
-						</tr>
-						<tr>
-							<td class="footer" style="border-top:4px solid #333333;padding:7px 0">
-								<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
-							</td>
-						</tr>
-					</table>
-				</td>
-				<td class="space" style="width:20px;padding:7px 0">&nbsp;</td>
-			</tr>
-		</table>
-	</body>
-</html>
+</tbody>
+</table>
+</td>
+</tr>
+<tr>
+<td class="space_footer" style="padding: 0!important;">&nbsp;</td>
+</tr>
+<tr>
+<td class="footer" style="border-top: 2px solid #333333;"></td>
+</tr>
+<tr>
+<td align="center" class="logo">
+<p><img src="https://www.bio-concept-pharma.com/img/cms/bioconcept-cest_1.jpg" alt="Bio Concept c&#039;est" width="598" height="" /></p>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
+<td class="space" style="width: 20px; padding: 7px 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</body>
+</html>
--- a/web/themes/bioconcept/mails/fr/preparation.html
+++ b/web/themes/bioconcept/mails/fr/preparation.html
@@ -53,80 +53,79 @@
 </style>

 	</head>
-	<body style="-webkit-text-size-adjust:none;background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto" >
-		<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
-			<tr>
-				<td class="space" style="width:20px;padding:7px 0">&nbsp;</td>
-				<td align="center" style="padding:7px 0">
-					<table class="table" bgcolor="#ffffff" style="width:100%">
-						<tr>
-							<td align="center" class="logo" style="border-bottom:4px solid #333333;padding:7px 0">
-								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
-									<img src="{shop_logo}" alt="{shop_name}" />
-								</a>
-							</td>
-						</tr>
-
+	<body style="-webkit-text-size-adjust:none;background-color:#fff;width:650px;font-family:Open-sans, 
+	sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto" >
+<table class="table table-mail" style="width: 100%; margin-top: 10px; -moz-box-shadow: 0 0 5px #afafaf; -webkit-box-shadow: 0 0 5px #afafaf; -o-box-shadow: 0 0 5px #afafaf; box-shadow: 0 0 5px #afafaf; filter: progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5);">
+<tbody>
 <tr>
-	<td align="center" class="titleblock" style="padding:7px 0">
-		<font size="2" face="Open-sans, sans-serif" color="#555454">
-			<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Bonjour {firstname} {lastname},</span>
-		</font>
-	</td>
+<td class="space" style="width: 20px; padding: 7px 0;">&nbsp;</td>
+<td align="center" style="padding: 7px 0;">
+<table class="table" bgcolor="#ffffff" style="width: 100%;">
+<tbody>
+<tr>
+<td align="center" class="logo" style="border-bottom: 4px solid #333333; padding: 7px 0;">
+<p><a href="https://www.bio-concept-pharma.com"><img src="https://www.bio-concept-pharma.com/img/cms/logo-Bio-Concept-2018-couleur-email.jpg" alt="" width="83" height="100" /></a></p>
+</td>
 </tr>
 <tr>
-	<td class="space_footer" style="padding:0!important">&nbsp;</td>
+<td align="center" class="titleblock" style="padding: 7px 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> <span class="title" style="font-weight: 500; font-size: 20px; text-transform: uppercase; line-height: 33px;"> Bonjour {firstname},</span><br /></span></td>
 </tr>
 <tr>
-	<td class="box" style="border:1px solid #D6D4D4;background-color:#f8f8f8;padding:7px 0">
-		<table class="table" style="width:100%">
-			<tr>
-				<td width="10" style="padding:7px 0">&nbsp;</td>
-				<td style="padding:7px 0">
-					<font size="2" face="Open-sans, sans-serif" color="#555454">
-						<p data-html-only="1" style="border-bottom:1px solid #D6D4D4;margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;padding-bottom:10px">
-							Commande {order_name}&nbsp;-&nbsp;En cours de pr&eacute;paration						</p>
-						<span style="color:#777">
-							Votre commande sur <strong><span style="color:#333">{shop_name}</span></strong> ayant pour r&eacute;f&eacute;rence <strong><span style="color:#333">{order_name}</span></strong> est en cours de pr&eacute;paration.						</span>
-					</font>
-				</td>
-				<td width="10" style="padding:7px 0">&nbsp;</td>
-			</tr>
-		</table>
-	</td>
+<td class="space_footer" style="padding: 0!important;">&nbsp;</td>
 </tr>
 <tr>
-	<td class="space_footer" style="padding:0!important">&nbsp;</td>
+<td class="box" style="border: 1px solid #D6D4D4; padding: 5px 0;">
+<table class="table" style="width: 100%;">
+<tbody>
+<tr>
+<td align="center" class="titleblock" style="padding: 7px 0;">
+<p><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"><span class="subtitle" style="font-weight: 500; font-size: 16px; line-height: 25px;">Votre <strong>commande {order_name}</strong> se trouve actuellement <br />entre les mains de nos pr&eacute;pateurs ! <br />Pas de doute, elle sera bient&ocirc;t chez vous. <br />Vous serez inform&eacute;s par email lorsque votre commande sera exp&eacute;di&eacute;e. </span></span></p>
+</td>
+<td width="10" style="padding: 7px 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</td>
 </tr>
 <tr>
-	<td class="linkbelow" style="padding:7px 0">
-		<font size="2" face="Open-sans, sans-serif" color="#555454">
-			<span>
-				Vous pouvez acc&eacute;der &agrave; tout moment au suivi de votre commande et t&eacute;l&eacute;charger votre facture dans <a href="{history_url}" style="color:#337ff1">"Historique des commandes"</a> de la rubrique <a href="{my_account_url}" style="color:#337ff1">"Mon compte"</a> sur notre site.			</span>
-		</font>
-	</td>
+<td align="center" class="logo">
+<p><strong>Statut de votre commande</strong> <br /><img src="https://www.bio-concept-pharma.com/img/cms/cde-prepa.png" alt="Commande en cours de pr&eacute;paration" width="598" height="" /></p>
+<p><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"><span class="subtitle" style="font-weight: 500; font-size: 16px; line-height: 25px;">Vous pouvez acc&eacute;der &agrave; tout moment au suivi de votre commande <br />en vous rendant sur votre compte <a href="https://www.bio-concept-pharma.com/mon-compte">BioConcept</a></span></span></p>
+</td>
 </tr>
 <tr>
-	<td class="linkbelow" style="padding:7px 0">
-		<font size="2" face="Open-sans, sans-serif" color="#555454">
-			<span>
-				Si vous avez un compte invit&eacute;, vous pouvez suivre votre commande dans la section <a href="{guest_tracking_url}?id_order={order_name}" style="color:#337ff1">"Suivi invit&eacute;"</a> de notre site.			</span>
-		</font>
-	</td>
+<td class="box" style="border: 1px solid #D6D4D4; padding: 7px 0;">
+<table class="table" style="width: 100%;">
+<tbody>
+<tr>
+<td width="10" style="padding: 7px 0;">&nbsp;</td>
+<td style="padding: 7px 0;">
+<p style="border-bottom: 1px solid #D6D4D4; margin: 3px 0 7px; font-weight: 500; font-size: 18px; padding-bottom: 10px; text-align: center;">Des questions ?</p>
+<p style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;" face="Open-sans, sans-serif" color="#555454">N&#039;h&eacute;sitez pas &agrave; contacter notre Service Client&egrave;le par t&eacute;l&eacute;phone au 05 49 24 71 42 ou <br />par email &agrave; contact@bio-concept-pharma.com, du lundi au jeudi de 8h &agrave; 12h30 <br />et de 13h15 &agrave; 16h15 et le vendredi de 8h &agrave; 11h30.</p>
+</td>
+<td width="10" style="padding: 7px 0;">&nbsp;</td>
 </tr>
-
-						<tr>
-							<td class="space_footer" style="padding:0!important">&nbsp;</td>
-						</tr>
-						<tr>
-							<td class="footer" style="border-top:4px solid #333333;padding:7px 0">
-								<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
-							</td>
-						</tr>
-					</table>
-				</td>
-				<td class="space" style="width:20px;padding:7px 0">&nbsp;</td>
-			</tr>
-		</table>
-	</body>
+</tbody>
+</table>
+</td>
+</tr>
+<tr>
+<td class="space_footer" style="padding: 0!important;">&nbsp;</td>
+</tr>
+<tr>
+<td class="footer" style="border-top: 2px solid #333333;"></td>
+</tr>
+<tr>
+<td align="center" class="logo">
+<p><img src="https://www.bio-concept-pharma.com/img/cms/bioconcept-cest_1.jpg" alt="Bio Concept c&#039;est" width="598" height="" /></p>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
+<td class="space" style="width: 20px; padding: 7px 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</body>
 </html>
--- a/web/themes/bioconcept/mails/fr/shipped.html
+++ b/web/themes/bioconcept/mails/fr/shipped.html
@@ -53,69 +53,79 @@
 </style>

 	</head>
-	<body style="-webkit-text-size-adjust:none;background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto" >
-		<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
-			<tr>
-				<td class="space" style="width:20px;padding:7px 0">&nbsp;</td>
-				<td align="center" style="padding:7px 0">
-					<table class="table" bgcolor="#ffffff" style="width:100%">
-						<tr>
-							<td align="center" class="logo" style="border-bottom:4px solid #333333;padding:7px 0">
-								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
-									<img src="{shop_logo}" alt="{shop_name}" />
-								</a>
-							</td>
-						</tr>
-
+	<body style="-webkit-text-size-adjust:none;background-color:#fff;width:650px;font-family:Open-sans, 
+	sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto" >
+<table class="table table-mail" style="width: 100%; margin-top: 10px; -moz-box-shadow: 0 0 5px #afafaf; -webkit-box-shadow: 0 0 5px #afafaf; -o-box-shadow: 0 0 5px #afafaf; box-shadow: 0 0 5px #afafaf; filter: progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5);">
+<tbody>
 <tr>
-	<td align="center" class="titleblock" style="padding:7px 0">
-		<font size="2" face="Open-sans, sans-serif" color="#555454">
-			<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Bonjour {firstname} {lastname},</span><br/>
-			<span class="subtitle" style="font-weight:500;font-size:16px;text-transform:uppercase;line-height:25px">Votre commande a &eacute;t&eacute; exp&eacute;di&eacute;e</span>
-		</font>
-	</td>
+<td class="space" style="width: 20px; padding: 7px 0;">&nbsp;</td>
+<td align="center" style="padding: 7px 0;">
+<table class="table" bgcolor="#ffffff" style="width: 100%;">
+<tbody>
+<tr>
+<td align="center" class="logo" style="border-bottom: 4px solid #333333; padding: 7px 0;">
+<p><a href="https://www.bio-concept-pharma.com"><img src="https://www.bio-concept-pharma.com/img/cms/logo-Bio-Concept-2018-couleur-email.jpg" alt="" width="83" height="100" /></a></p>
+</td>
 </tr>
 <tr>
-	<td class="space_footer" style="padding:0!important">&nbsp;</td>
+<td align="center" class="titleblock" style="padding: 7px 0;"><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"> <span class="title" style="font-weight: 500; font-size: 20px; text-transform: uppercase; line-height: 33px;"> Bonjour {firstname},</span><br /></span></td>
 </tr>
 <tr>
-	<td class="box" style="border:1px solid #D6D4D4;background-color:#f8f8f8;padding:7px 0">
-		<table class="table" style="width:100%">
-			<tr>
-				<td width="10" style="padding:7px 0">&nbsp;</td>
-				<td style="padding:7px 0">
-					<font size="2" face="Open-sans, sans-serif" color="#555454">
-						<p data-html-only="1" style="border-bottom:1px solid #D6D4D4;margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;padding-bottom:10px">
-							Commande {order_name}&nbsp;-&nbsp;Exp&eacute;di&eacute;						</p>
-						<span style="color:#777">
-							Votre commande ayant la r&eacute;f&eacute;rence <span style="color:#333"><strong>{order_name}</strong></span> vient d&#039;&ecirc;tre exp&eacute;di&eacute;e.<br /> 
-							Merci d&#039;avoir effectu&eacute; vos achats sur {shop_name}!						</span>
-					</font>
-				</td>
-				<td width="10" style="padding:7px 0">&nbsp;</td>
-			</tr>
-		</table>
-	</td>
+<td class="space_footer" style="padding: 0!important;">&nbsp;</td>
 </tr>
 <tr>
-	<td class="linkbelow" style="padding:7px 0">
-		<span>
-			Vous pouvez acc&eacute;der &agrave; tout moment au suivi de votre commande et t&eacute;l&eacute;charger votre facture dans <a href="{history_url}" style="color:#337ff1">"Historique des commandes"</a> de la rubrique <a href="{my_account_url}" style="color:#337ff1">"Mon compte"</a> sur notre site.		</span>
-	</td>
+<td class="box" style="border: 1px solid #D6D4D4; padding: 5px 0;">
+<table class="table" style="width: 100%;">
+<tbody>
+<tr>
+<td align="center" class="titleblock" style="padding: 7px 0;">
+<p><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"><span class="subtitle" style="font-weight: 500; font-size: 16px; line-height: 25px;">Nous venons d&#039;exp&eacute;dier votre <strong>commande {order_name}</strong> &agrave; l&#039;adresse suivante : <br />{delivery_block_html} <br />Vous pouvez suivre la progression de votre colis &agrave; cette adresse : {followup}. </span></span></p>
+</td>
+<td width="10" style="padding: 7px 0;">&nbsp;</td>
 </tr>
-
-						<tr>
-							<td class="space_footer" style="padding:0!important">&nbsp;</td>
-						</tr>
-						<tr>
-							<td class="footer" style="border-top:4px solid #333333;padding:7px 0">
-								<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
-							</td>
-						</tr>
-					</table>
-				</td>
-				<td class="space" style="width:20px;padding:7px 0">&nbsp;</td>
-			</tr>
-		</table>
-	</body>
+</tbody>
+</table>
+</td>
+</tr>
+<tr>
+<td align="center" class="logo">
+<p><strong>Statut de votre commande</strong> <br /><img src="https://www.bio-concept-pharma.com/img/cms/cde-expedie.png" alt="Commande exp&eacute;di&eacute;e" width="598" height="" /></p>
+<p><span size="2" face="Open-sans, sans-serif" color="#555454" style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;"><span class="subtitle" style="font-weight: 500; font-size: 16px; line-height: 25px;">Vous pouvez acc&eacute;der &agrave; tout moment au suivi de votre commande <br />en vous rendant sur votre compte <a href="https://www.bio-concept-pharma.com/mon-compte">BioConcept</a></span></span></p>
+</td>
+</tr>
+<tr>
+<td class="box" style="border: 1px solid #D6D4D4; padding: 7px 0;">
+<table class="table" style="width: 100%;">
+<tbody>
+<tr>
+<td width="10" style="padding: 7px 0;">&nbsp;</td>
+<td style="padding: 7px 0;">
+<p style="border-bottom: 1px solid #D6D4D4; margin: 3px 0 7px; font-weight: 500; font-size: 18px; padding-bottom: 10px; text-align: center;">Des questions ?</p>
+<p style="color: #555454; font-family: Open-sans, sans-serif; font-size: small;" face="Open-sans, sans-serif" color="#555454">N&#039;h&eacute;sitez pas &agrave; contacter notre Service Client&egrave;le par t&eacute;l&eacute;phone au 05 49 24 71 42 ou <br />par email &agrave; contact@bio-concept-pharma.com, du lundi au jeudi de 8h &agrave; 12h30 <br />et de 13h15 &agrave; 16h15 et le vendredi de 8h &agrave; 11h30.</p>
+</td>
+<td width="10" style="padding: 7px 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+<tr>
+<td class="space_footer" style="padding: 0!important;">&nbsp;</td>
+</tr>
+<tr>
+<td class="footer" style="border-top: 2px solid #333333;"></td>
+</tr>
+<tr>
+<td align="center" class="logo">
+<p><img src="https://www.bio-concept-pharma.com/img/cms/bioconcept-cest_1.jpg" alt="Bio Concept c&#039;est" width="598" height="" /></p>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
+<td class="space" style="width: 20px; padding: 7px 0;">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</body>
 </html>
--- a/web/themes/bioconcept/mails/fr/test.html
+++ b/web/themes/bioconcept/mails/fr/test.html
@@ -79,6 +79,10 @@
 	<td class="linkbelow" style="padding:7px 0">
 		<span>
 			Voici un <strong>e-mail</strong> de test de votre boutique. <br /><br />Si vous parvenez &agrave; lire ceci, le test a r&eacute;ussi!.
+			Je viens de terminer les refontes des emails et il y en a seulement 2 où j'ai besoin d'un développement particuliers avec les variables qui ne fonctionnent pas :
+- "payment.html" : la variable {total_paid}
+- "shipped.html" : les variables {delivery_block_html} et {followup}
+
 		</span>
 	</td>
 </tr>
--- a/web/themes/bioconcept/mails/fr/test.txt
+++ b/web/themes/bioconcept/mails/fr/test.txt
@@ -6,6 +6,11 @@ Voici un E-MAIL de test de votre boutique.

 Si vous parvenez à lire ceci, le test a réussi!. 

+			Je viens de terminer les refontes des emails et il y en a seulement 2 où j'ai besoin d'un développement particuliers avec les variables qui ne fonctionnent pas :
+- "payment.html" : la variable {total_paid}
+- "shipped.html" : les variables {delivery_block_html} et {followup}
+
+
 {shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/]
Author	SHA1	Message	Date
TheCoreDev	64fd18c286	Rajout du nb de points fidélité dans le mail envoyé au statut "Livré"	2020-09-30 11:51:54 +02:00
TheCoreDev	5403b65f07	Retour arrière sur évo 0000030 (le client s'est trompé de site)	2020-06-17 12:18:40 +02:00
TheCoreDev	a6b37c9f3d	Evolution #000033 (rajout du RIB au bas de la facture)	2020-06-17 09:25:42 +02:00
Laurent LE CORRE	7719802e15	Modif de la requête pour ano 0000030	2020-06-07 12:22:25 +02:00
Laurent LE CORRE	29d7c3f620	Ano n°0000020 : rajout des 2 variables {followup} et {delivery_block_html} sur le template "shipped"	2020-03-29 10:02:08 +02:00
Laurent LE CORRE	dff476d4c5	Récupération des nouveaux templates d'email du client	2020-03-29 09:59:40 +02:00
Laurent LE CORRE	ed8206cbce	Evolution n°0000019 pour remise en page des factures	2020-03-28 09:46:23 +01:00
Laurent LE CORRE	239479d854	Début correction ano 0000019 : OK sur dates + OK sur inversion "unitaire HT" et "Taxe"	2020-03-27 09:47:07 +01:00
Laurent LE CORRE	ce808d11e5	Modif du .gitignore	2019-11-28 16:01:49 +01:00
Laurent LE CORRE	c919cdd77d	Suppression des fichiers .esl*	2019-11-21 10:30:01 +01:00