diff --git a/www/themes/chocolatdemariage/category-univers.tpl b/www/themes/chocolatdemariage/category-univers.tpl
index c0745872..571a2213 100644
--- a/www/themes/chocolatdemariage/category-univers.tpl
+++ b/www/themes/chocolatdemariage/category-univers.tpl
@@ -35,7 +35,7 @@
                                       
                                         <a href="{$link->getCategoryLink($subcategory.id_category, $subcategory.link_rewrite)|escape:'html':'UTF-8'}">
                                             {if file_exists($smarty.const._PS_ROOT_DIR_|cat:"/img/c/home/{$subcategory.id_category}.jpg")}
-                                                <div class="img"><img class="img-full" src="{$base_dir}img/c/home/{$subcategory.id_category}.jpg" alt="{$subcategory.name}"/></div>
+                                                <div class="img"><img class="img-full" src="{$base_dir_ssl}img/c/home/{$subcategory.id_category}.jpg" alt="{$subcategory.name}"/></div>
                                             {/if}
                                             <div class="content">
                                                 <div class="txt">
diff --git a/www/themes/chocolatdemariage/cms.tpl b/www/themes/chocolatdemariage/cms.tpl
index 3099dfcb..bcd7b9db 100644
--- a/www/themes/chocolatdemariage/cms.tpl
+++ b/www/themes/chocolatdemariage/cms.tpl
@@ -97,7 +97,7 @@
 							{if !empty($cms->matrices)}
 							<div class="matrices {if $cms->id_cms_category==2}catNews{/if}" >
 								{foreach from=$cms->matrices item=matrice name=matrice}
-									{capture name='imgCms'}{$base_dir}img/cms/matrices/{$matrice.image[$id_lang]}.jpg{/capture}
+									{capture name='imgCms'}{$base_dir_ssl}img/cms/matrices/{$matrice.image[$id_lang]}.jpg{/capture}
 									<div class="ctn">
 										<div class="{$matrice.blockClass[$id_lang]} bg clearfix">
 											<div class="cms-style matrice row" style="{if $matrice.blockColor[$id_lang]}background-color: {$matrice.blockColor[$id_lang]};{/if} {if $matrice.textColor[$id_lang]}color : {$matrice.textColor[$id_lang]}{/if}">
@@ -134,7 +134,7 @@
 												{if $matrice.image[$id_lang]}
 												<div class="md6 {if $matrice.blockClass[$id_lang] =='classImgLeft'}pull-md6{/if}">
 													<div class="img">
-														<img class="img-responsive" src="{$base_dir}img/cms/matrices/{$matrice.image[$id_lang]}.jpg" {if $matrice.linkLabel[$id_lang]}alt ="{$matrice.linkLabel[$id_lang]}"{/if} />
+														<img class="img-responsive" src="{$base_dir_ssl}img/cms/matrices/{$matrice.image[$id_lang]}.jpg" {if $matrice.linkLabel[$id_lang]}alt ="{$matrice.linkLabel[$id_lang]}"{/if} />
 													</div>
 												</div>
 												{/if}
diff --git a/www/themes/chocolatdemariage/lang/fr.php b/www/themes/chocolatdemariage/lang/fr.php
index 1ab1410b..2b6420a3 100644
--- a/www/themes/chocolatdemariage/lang/fr.php
+++ b/www/themes/chocolatdemariage/lang/fr.php
@@ -27,7 +27,7 @@ $_LANG['address_e4eb5dadb6ee84c5c55a8edf53f6e554'] = 'Code postal';
 $_LANG['address_e9b6b3aa3cab28048d3879710882e1de'] = 'Modifier cette adresse';
 $_LANG['address_fe66abce284ec8589e7d791185b5c442'] = 'Téléphone fixe ou mobile';
 $_LANG['addresses_06933067aafd48425d67bcb01bba5cb6'] = 'Mettre à jour';
-$_LANG['addresses_3908e1afa0ff22fbf112aff3c5ba55c1'] = 'Vos addresses';
+$_LANG['addresses_3908e1afa0ff22fbf112aff3c5ba55c1'] = 'Vos adresses';
 $_LANG['addresses_3c7d34ae915c6664189dab2aebb02307'] = 'Ajouter une adresse';
 $_LANG['addresses_56d3db43fb7f323139022a29d57276d8'] = 'Aucune adresse disponible.';
 $_LANG['addresses_729a51874fe901b092899e9e8b31c97a'] = 'Êtes-vous sûr ?';
@@ -105,6 +105,7 @@ $_LANG['contact-form_8cf04a9734132302f96da8e113e80ce5'] = 'Accueil';
 $_LANG['contact-form_94966d90747b97d1f0f206c98a8b1ac3'] = 'Envoyer';
 $_LANG['contact-form_b357b524e740bc85b9790a0712d84a30'] = 'Adresse e-mail';
 $_LANG['contact-form_bbaff12800505b22a853e8b7f4eb6a22'] = 'Contact';
+$_LANG['contact-form_c7bf4c98e77034f8156ad09b13d697c8'] = 'de 9h00 à 17h30';
 $_LANG['contact-form_deb10517653c255364175796ace3553f'] = 'Produit';
 $_LANG['contact-form_e635032a5f71d809146d3872389f5b0c'] = 'Parcourir';
 $_LANG['contact-form_f787618e514c038851726224d7e4421e'] = 'Aucun fichier sélectionné';
@@ -203,17 +204,7 @@ $_LANG['live_edit_ea4788705e6873b424c65e91c2846b19'] = 'Annuler';
 $_LANG['maintenance_38a27c0c7ef7a05e13efa2798ee21533'] = 'Mode maintenance';
 $_LANG['maintenance_a022ff58716d4cf34050cb68e7f12fcf'] = 'Nous nous excusons pour la gêne occasionnée. Merci de revenir plus tard.';
 $_LANG['maintenance_fef882af64a6b9c88dbc5e6cce2607bc'] = 'Pour cause de maintenance, votre boutique en ligne est temporairement inaccessible.';
-$_LANG['manufacturer-list_0397cbccfd02272abd38f8933b865218'] = '%d produit';
 $_LANG['manufacturer-list_0e1e874dde345d19583102a9fd63fb7e'] = 'Fabricants :';
-$_LANG['manufacturer-list_3426bf3cca12b1f6550fd8bd36171e2f'] = 'afficher les produits';
-$_LANG['manufacturer-list_4ee29ca12c7d126654bd0e5275de6135'] = 'Liste';
-$_LANG['manufacturer-list_5174d1309f275ba6f275db3af9eb3e18'] = 'Grille';
-$_LANG['manufacturer-list_84be54bb4bd1b755a27d86388700d097'] = 'Marques';
-$_LANG['manufacturer-list_864c665aea5e824772fda0e678c3ac4d'] = '%d produits';
-$_LANG['manufacturer-list_ac27bfc960343d2e6222945cc50f2405'] = 'Il y a une marque';
-$_LANG['manufacturer-list_ce7bdbaa2a5998973271d85172456ee6'] = 'Il n\'y aucun fabricant.';
-$_LANG['manufacturer-list_df25de42c84837baf5fa15049a8bc764'] = 'Afficher :';
-$_LANG['manufacturer-list_f84855a18b9b3e1cd70f2b2cde5778b4'] = 'Il y a %d marques';
 $_LANG['manufacturer_4c8d12a46c2deb4898979acfd4e23f6a'] = 'Liste de produits par fabricant';
 $_LANG['manufacturer_a65ed5e8df4b1c2bb34844f81cc9b451'] = 'Pas de produit pour ce fabricant.';
 $_LANG['manufacturer_d3da97e2d9aee5c8fbe03156ad051c99'] = 'Détails';
@@ -288,6 +279,7 @@ $_LANG['order-address_dd1f775e443ff3b9a89270713580a51b'] = 'Précédent';
 $_LANG['order-address_ec211f7c20af43e742bf2570c3cb84f9'] = 'Ajouter';
 $_LANG['order-address_f5bf48aa40cad7891eb709fcf1fde128'] = 'produit';
 $_LANG['order-carrier_06933067aafd48425d67bcb01bba5cb6'] = 'Mettre à jour';
+$_LANG['order-carrier_20da2026fb210b9c08f044744c529658'] = 'Complément d’information à propos de votre commande';
 $_LANG['order-carrier_390b4c95516a4b7faf97389ca46fc0c7'] = 'Utiliser la même adresse pour la facturation';
 $_LANG['order-carrier_445def31373e81b59d300197617ae3c2'] = 'Finaliser votre commande';
 $_LANG['order-carrier_518490da8d2304af18af2231b644fab0'] = 'Vous n\'avez qu\'une adresse reliée à votre compte';
@@ -518,6 +510,8 @@ $_LANG['prices-drop_c8f312df214e2295809027c6ca79d232'] = 'Promotions';
 $_LANG['product-compare_216adaf4e98dc62ec3abeab51b9fc57f'] = 'Veuillez choisir au moins 1 produit.';
 $_LANG['product-compare_7eece51cf3938103677db7a5051ef8f5'] = 'Comparer';
 $_LANG['product-compare_90723749917a82bf3ff8a73247d32ffb'] = 'Vous ne pouvez pas ajouter plus de %d produit(s) dans le comparateur.';
+$_LANG['product-configurator-config_2d0f6b8300be19cf35e89e66f0677f95'] = 'Commander';
+$_LANG['product-configurator-config_426e25bd1dd663401d4b96c4eb9dd55e'] = 'Sauvegarder votre simulation';
 $_LANG['product-list-line_08a09674c9d744d2d43a4604b981e4dc'] = 'au lieu de ';
 $_LANG['product-list-line_216adaf4e98dc62ec3abeab51b9fc57f'] = 'Merci de sélectionner au moins un produit';
 $_LANG['product-list-line_2d0f6b8300be19cf35e89e66f0677f95'] = 'Commander';
@@ -527,10 +521,14 @@ $_LANG['product-list_08a09674c9d744d2d43a4604b981e4dc'] = 'Au lieu de ';
 $_LANG['product-list_216adaf4e98dc62ec3abeab51b9fc57f'] = 'Veuillez choisir au moins 1 produit.';
 $_LANG['product-list_2d0f6b8300be19cf35e89e66f0677f95'] = 'Ajouter au panier';
 $_LANG['product-list_3480e5e94074ed8737ba6c65a1fd8012'] = 'Acheter';
+$_LANG['product-list_7bccc5ff3c07e44131fba93251893c92'] = '* Prix unitaire pour une commande de %d pièces';
 $_LANG['product-list_90723749917a82bf3ff8a73247d32ffb'] = 'Vous ne pouvez pas ajouter plus de %d produit(s) dans le comparateur.';
 $_LANG['product-list_d98a07f84921b24ee30f86fd8cd85c3c'] = 'à partir de';
 $_LANG['product-main-config_04325f5c10c9818bc464d660daa2b030'] = 'Minimum de commande : ';
 $_LANG['product-main-config_2d0f6b8300be19cf35e89e66f0677f95'] = 'Commander';
+$_LANG['product-main-config_426e25bd1dd663401d4b96c4eb9dd55e'] = 'Sauvegarder votre simulation';
+$_LANG['product-main-standard_04325f5c10c9818bc464d660daa2b030'] = 'Minimum de commande : ';
+$_LANG['product-main-standard_26f5a22330a8d5d32c87e6a4c7f3de95'] = 'Jusqu\'à';
 $_LANG['product-main-standard_2d0f6b8300be19cf35e89e66f0677f95'] = 'Ajouter au panier';
 $_LANG['product-sort_03590cca8220917788b5a6c25fa39a15'] = 'Le plus cher';
 $_LANG['product-sort_4f4f552919d5a7ad3435b5fdb7fcae61'] = 'De Z à A';
@@ -562,6 +560,7 @@ $_LANG['products-comparison_d6295c05503596b3ed3528aee83e3ef7'] = 'Caractéristiq
 $_LANG['products-comparison_db0404dd6d32e0926c9adecd9ba193f3'] = 'par %s';
 $_LANG['products-comparison_f5e15309ff0396474b8421ef48871d0b'] = 'Aucune caractéristique à comparer';
 $_LANG['restricted-country_cf8092a0be7b972d6cee3db90bfaf923'] = 'Vous ne pouvez pas accéder à notre boutique depuis votre pays. Veuillez nous excuser de la gêne occasionnée.';
+$_LANG['resume-cart_2c59ffd0a6631127450d729861975719'] = 'Quantité :';
 $_LANG['resume-cart_300225ee958b6350abc51805dab83c24'] = 'Continuer mes achats';
 $_LANG['resume-cart_7e0bf6d67701868aac3116ade8fea957'] = 'Finaliser ma commande';
 $_LANG['resume-cart_c6995d6cc084c192bc2e742f052a5c74'] = 'Offerts';
@@ -650,15 +649,10 @@ $_LANG['stores_f8be99e56d4207f6df76e12bd32e0fea'] = 'Voici la liste détaillée
 $_LANG['stores_fdb0c388de01d545017cdf9ccf00eb72'] = 'Magasin';
 $_LANG['supplier-list_0397cbccfd02272abd38f8933b865218'] = '%d produit';
 $_LANG['supplier-list_44cc6cf69e752cd267e29e71ac4175ff'] = 'Il n\'y a aucun fournisseur.';
-$_LANG['supplier-list_4ee29ca12c7d126654bd0e5275de6135'] = 'Liste';
-$_LANG['supplier-list_5174d1309f275ba6f275db3af9eb3e18'] = 'Grille';
 $_LANG['supplier-list_70e0158b4815b0ad6be5f86a11e3a3b4'] = 'Il y a %d fournisseurs.';
 $_LANG['supplier-list_864c665aea5e824772fda0e678c3ac4d'] = '%d produits';
-$_LANG['supplier-list_a00e46e856e637f8fd077b4fd710c9e2'] = 'Fournisseurs :';
 $_LANG['supplier-list_bf1f33501d576cce01509b67e2260242'] = 'Il y a %d fournisseur.';
 $_LANG['supplier-list_c61ab4204f572e9b3aa84a040e0dab31'] = 'voir les produits';
-$_LANG['supplier-list_df25de42c84837baf5fa15049a8bc764'] = 'Afficher :';
-$_LANG['supplier_4bbacadd33aff22ab7468fa4f9efd717'] = 'Liste des produits du fournisseur';
 $_LANG['supplier_71a863ca23a2b5d1dc82e60b908576b5'] = 'Pas de produit pour ce fournisseur.';
 
 ?>
\ No newline at end of file
diff --git a/www/themes/chocolatdemariage/modules/advconstructor/bestchocolate.tpl b/www/themes/chocolatdemariage/modules/advconstructor/bestchocolate.tpl
index 9c3040d2..48d5a818 100644
--- a/www/themes/chocolatdemariage/modules/advconstructor/bestchocolate.tpl
+++ b/www/themes/chocolatdemariage/modules/advconstructor/bestchocolate.tpl
@@ -5,7 +5,7 @@
 			<div class="row">
 				<div class="lg5 md5 sm12 ctn-img">
 					<div class="valign-bottom title">
-						<img class="img-responsive" src="{$base_dir}img/constructor/image_icon/{$block->id}_{$cookie->id_lang}.png" alt="{$block->title}" />
+						<img class="img-responsive" src="{$base_dir_ssl}img/constructor/image_icon/{$block->id}_{$cookie->id_lang}.png" alt="{$block->title}" />
 						<span>{$block->title}</span>
 					</div>
 					<div class="desc">{$block->content}</div>
@@ -14,6 +14,6 @@
 		</div>
 	</div>
 	<div class="img">
-		<img class="pull-left img-responsive" src="{$base_dir}img/constructor/image/{$block->id}_{$cookie->id_lang}.jpg" alt="{$block->title}" />
+		<img class="pull-left img-responsive" src="{$base_dir_ssl}img/constructor/image/{$block->id}_{$cookie->id_lang}.jpg" alt="{$block->title}" />
 	</div>
 </div>
\ No newline at end of file
diff --git a/www/themes/chocolatdemariage/modules/advconstructor/constructorfooter.tpl b/www/themes/chocolatdemariage/modules/advconstructor/constructorfooter.tpl
index 13b6e1ef..491d674c 100644
--- a/www/themes/chocolatdemariage/modules/advconstructor/constructorfooter.tpl
+++ b/www/themes/chocolatdemariage/modules/advconstructor/constructorfooter.tpl
@@ -1,5 +1,5 @@
 <div class="footerconstructor-block animated-full clearfix sm6">
-	<div class="inner" style="background-image: url({$base_dir}img/constructor/image/{$block->id}_{$cookie->id_lang}.png);">
+	<div class="inner" style="background-image: url({$base_dir_ssl}img/constructor/image/{$block->id}_{$cookie->id_lang}.png);">
 		<div class="title-drop"><span>{$block->title}</span></div>
 		<div class="content">{$block->content}</div>
 		{if $block->subtitle}
diff --git a/www/themes/chocolatdemariage/modules/advconstructor/guidebook.tpl b/www/themes/chocolatdemariage/modules/advconstructor/guidebook.tpl
index a15dbbce..7e488201 100644
--- a/www/themes/chocolatdemariage/modules/advconstructor/guidebook.tpl
+++ b/www/themes/chocolatdemariage/modules/advconstructor/guidebook.tpl
@@ -1,10 +1,10 @@
 
 <div class="guidebook-block animated-full clearfix valign-middle">
 	<div class="sm6 content {if $block->rang % 2 != 0}push-sm6{/if} blockToAppear fast-time">
-		<img class="icon" src="{$base_dir}img/constructor/image_icon/{$block->id}_{$cookie->id_lang}.png" alt="{$block->title}" />
+		<img class="icon" src="{$base_dir_ssl}img/constructor/image_icon/{$block->id}_{$cookie->id_lang}.png" alt="{$block->title}" />
 		<div class="desc">{$block->content}</div>
 	</div>
 	<div class="sm6 ctn-img {if $block->rang % 2 != 0}pull-sm6{/if}">
-		<img class="img-responsive" src="{$base_dir}img/constructor/image/{$block->id}_{$cookie->id_lang}.jpg" alt="{$block->title}" />
+		<img class="img-responsive" src="{$base_dir_ssl}img/constructor/image/{$block->id}_{$cookie->id_lang}.jpg" alt="{$block->title}" />
 	</div>
 </div>
\ No newline at end of file
diff --git a/www/themes/chocolatdemariage/modules/advconstructor/img-full-padded.tpl b/www/themes/chocolatdemariage/modules/advconstructor/img-full-padded.tpl
index 7029a773..439e0760 100644
--- a/www/themes/chocolatdemariage/modules/advconstructor/img-full-padded.tpl
+++ b/www/themes/chocolatdemariage/modules/advconstructor/img-full-padded.tpl
@@ -1,5 +1,5 @@
 <div class="homeblock homeblock{$block->id} block img-full-padded animated-full smooth-appear">
-	<div class="content cover" style="background-image: url({$base_dir}img/constructor/image/{$block->id}_{$cookie->id_lang}.jpg);{if !empty($block->textcolor)} color: {$block->textcolor}{/if}">
+	<div class="content cover" style="background-image: url({$base_dir_ssl}img/constructor/image/{$block->id}_{$cookie->id_lang}.jpg);{if !empty($block->textcolor)} color: {$block->textcolor}{/if}">
 		<h2 class="title">{$block->title}</h2>
 		<div class="desc">{$block->content}</div>
 		{if $block->link}
diff --git a/www/themes/chocolatdemariage/modules/advconstructor/img-left.tpl b/www/themes/chocolatdemariage/modules/advconstructor/img-left.tpl
index 96d949af..a23b6412 100644
--- a/www/themes/chocolatdemariage/modules/advconstructor/img-left.tpl
+++ b/www/themes/chocolatdemariage/modules/advconstructor/img-left.tpl
@@ -2,7 +2,7 @@
 	<div class="ctn">
 		<div class="row valign-middle">
 			<div class="xs6 xxs12 img">
-				<img class="trigger" src="{$base_dir}img/constructor/image/{$block->id}_{$cookie->id_lang}.jpg" alt="" />
+				<img class="trigger" src="{$base_dir_ssl}img/constructor/image/{$block->id}_{$cookie->id_lang}.jpg" alt="" />
 			</div>
 			<div class="xs6 xxs12 content"{if !empty($block->textcolor)} style="color: {$block->textcolor}"{/if}>
 				<h2 class="title trigger">{$block->title}</h2>
diff --git a/www/themes/chocolatdemariage/modules/advconstructor/img-right.tpl b/www/themes/chocolatdemariage/modules/advconstructor/img-right.tpl
index fda8bab8..a8700a0c 100644
--- a/www/themes/chocolatdemariage/modules/advconstructor/img-right.tpl
+++ b/www/themes/chocolatdemariage/modules/advconstructor/img-right.tpl
@@ -2,7 +2,7 @@
 	<div class="ctn">
 		<div class="row valign-middle">
 			<div class="xs6 xxs12 img">
-				<img class="trigger" src="{$base_dir}img/constructor/image/{$block->id}_{$cookie->id_lang}.jpg" alt="" />
+				<img class="trigger" src="{$base_dir_ssl}img/constructor/image/{$block->id}_{$cookie->id_lang}.jpg" alt="" />
 			</div>
 			<div class="xs6 xxs12 content"{if !empty($block->textcolor)} style="color: {$block->textcolor}"{/if}>
 				<h2 class="title trigger">{$block->title}</h2>
diff --git a/www/themes/chocolatdemariage/modules/advconstructor/justanimage.tpl b/www/themes/chocolatdemariage/modules/advconstructor/justanimage.tpl
index 255a8cfd..3f5acdf7 100644
--- a/www/themes/chocolatdemariage/modules/advconstructor/justanimage.tpl
+++ b/www/themes/chocolatdemariage/modules/advconstructor/justanimage.tpl
@@ -1,9 +1,9 @@
 {if file_exists($smarty.const._PS_ROOT_DIR_|cat:"/img/constructor/image/{$block->id}_{$cookie->id_lang}.png")}
 <div class="img-responsive img">
-	<img class="blockToAppear {if $block->rang % 2 == 0}offset-time {/if} img-responsive" src="{$base_dir}img/constructor/image/{$block->id}_{$cookie->id_lang}.png" alt="{$block->title}" />
+	<img class="blockToAppear {if $block->rang % 2 == 0}offset-time {/if} img-responsive" src="{$base_dir_ssl}img/constructor/image/{$block->id}_{$cookie->id_lang}.png" alt="{$block->title}" />
 </div>
 {elseif file_exists($smarty.const._PS_ROOT_DIR_|cat:"/img/constructor/image/{$block->id}_{$cookie->id_lang}.jpg")}
 <div class="img-responsive img">
-	<img class="blockToAppear img-responsive" src="{$base_dir}img/constructor/image/{$block->id}_{$cookie->id_lang}.jpg" alt="{$block->title}" />
+	<img class="blockToAppear img-responsive" src="{$base_dir_ssl}img/constructor/image/{$block->id}_{$cookie->id_lang}.jpg" alt="{$block->title}" />
 </div>
 {/if}
\ No newline at end of file
diff --git a/www/themes/chocolatdemariage/modules/advconstructor/news.tpl b/www/themes/chocolatdemariage/modules/advconstructor/news.tpl
index f2c5b248..25eb484a 100644
--- a/www/themes/chocolatdemariage/modules/advconstructor/news.tpl
+++ b/www/themes/chocolatdemariage/modules/advconstructor/news.tpl
@@ -1,6 +1,6 @@
 <div class="news-block advconstr xs6 bs-min">
 	<div class=" animated-full clearfix valign-middle ">
-		<span class="icon" style="background-image : url({$base_dir}img/constructor/image/{$block->id}_{$cookie->id_lang}.png)"></span>
+		<span class="icon" style="background-image : url({$base_dir_ssl}img/constructor/image/{$block->id}_{$cookie->id_lang}.png)"></span>
 		<div class=" content">
 			<div class="title">{$block->title}</div>
 			<div class="desc">{$block->content}</div>
diff --git a/www/themes/chocolatdemariage/modules/advconstructor/no-style.tpl b/www/themes/chocolatdemariage/modules/advconstructor/no-style.tpl
index afb46064..e626c373 100644
--- a/www/themes/chocolatdemariage/modules/advconstructor/no-style.tpl
+++ b/www/themes/chocolatdemariage/modules/advconstructor/no-style.tpl
@@ -1,7 +1,7 @@
 <div class="homeblock {if !$block->hasImg}no-img{/if} no-style smooth-appear">
 	<div class="content"{if !empty($block->textcolor)} style="color: {$block->textcolor}"{/if}>
 		{if $block->hasImg}
-			<img src="{$base_dir}img/constructor/image/{$block->id}_{$cookie->id_lang}.jpg" alt="" />
+			<img src="{$base_dir_ssl}img/constructor/image/{$block->id}_{$cookie->id_lang}.jpg" alt="" />
 		{/if}
 		{$block->content}
 	</div>
diff --git a/www/themes/chocolatdemariage/modules/advconstructor/product.tpl b/www/themes/chocolatdemariage/modules/advconstructor/product.tpl
index 04f3b59e..fadcdf2d 100644
--- a/www/themes/chocolatdemariage/modules/advconstructor/product.tpl
+++ b/www/themes/chocolatdemariage/modules/advconstructor/product.tpl
@@ -2,7 +2,7 @@
 	<div class="row valign-middle">
 		{if $block->hasImg}
 			<div class="offset-lg1 lg6 offset-md0 md6 sm5 xs6">
-				<img src="{$base_dir}img/constructor/image/{$block->id}_{$cookie->id_lang}.jpg" alt="" />
+				<img src="{$base_dir_ssl}img/constructor/image/{$block->id}_{$cookie->id_lang}.jpg" alt="" />
 			</div>
 		{/if}
 
diff --git a/www/themes/chocolatdemariage/modules/advreassurance/advreassurance-bottom.tpl b/www/themes/chocolatdemariage/modules/advreassurance/advreassurance-bottom.tpl
index a60399d8..4c79ee2e 100644
--- a/www/themes/chocolatdemariage/modules/advreassurance/advreassurance-bottom.tpl
+++ b/www/themes/chocolatdemariage/modules/advreassurance/advreassurance-bottom.tpl
@@ -9,7 +9,7 @@
 	{/foreach}
 		<li class="md3 sm6 xs6 xxs6">
 			<span class="title hidden-lg hidden-md hidden-sm">{l s='Reviews' mod='advreassurance'}</span>
-			<img src="{$base_dir}img/verified-reviews.png" alt="">
+			<img src="{$base_dir_ssl}img/verified-reviews.png" alt="">
 		</li>
 	</ul>
 {/if}
diff --git a/www/themes/chocolatdemariage/modules/advreassurance/advreassurance.tpl b/www/themes/chocolatdemariage/modules/advreassurance/advreassurance.tpl
index 02fe53ec..9b5a9570 100644
--- a/www/themes/chocolatdemariage/modules/advreassurance/advreassurance.tpl
+++ b/www/themes/chocolatdemariage/modules/advreassurance/advreassurance.tpl
@@ -5,7 +5,7 @@
 			<ul class="row">
 			{foreach from=$blocks item=block key=key}
 				<li class="md3 sm3 xs6 xxs6">
-					<div><img src="{$base_dir}img/reassurance/{$block.id_reassurance}.jpg" alt="{$block.title}" /></div>
+					<div><img src="{$base_dir_ssl}img/reassurance/{$block.id_reassurance}.jpg" alt="{$block.title}" /></div>
 					<span class="title">{$block.title}</span>
 					<div class="content">{$block.subtitle}</div>
 				</li>
diff --git a/www/themes/chocolatdemariage/modules/advreassurance2/advreassurance2-bottom.tpl b/www/themes/chocolatdemariage/modules/advreassurance2/advreassurance2-bottom.tpl
index a60399d8..4c79ee2e 100644
--- a/www/themes/chocolatdemariage/modules/advreassurance2/advreassurance2-bottom.tpl
+++ b/www/themes/chocolatdemariage/modules/advreassurance2/advreassurance2-bottom.tpl
@@ -9,7 +9,7 @@
 	{/foreach}
 		<li class="md3 sm6 xs6 xxs6">
 			<span class="title hidden-lg hidden-md hidden-sm">{l s='Reviews' mod='advreassurance'}</span>
-			<img src="{$base_dir}img/verified-reviews.png" alt="">
+			<img src="{$base_dir_ssl}img/verified-reviews.png" alt="">
 		</li>
 	</ul>
 {/if}
diff --git a/www/themes/chocolatdemariage/modules/advreassurance2/advreassurance2.tpl b/www/themes/chocolatdemariage/modules/advreassurance2/advreassurance2.tpl
index a44ce21f..4cd02803 100644
--- a/www/themes/chocolatdemariage/modules/advreassurance2/advreassurance2.tpl
+++ b/www/themes/chocolatdemariage/modules/advreassurance2/advreassurance2.tpl
@@ -5,7 +5,7 @@
 		{foreach from=$blocks item=block key=key}
 			<li class="md3 sm3 xs6">
 				<div class="inner">
-					<div><img src="{$base_dir}img/reassurance2/{$block.id_reassurance2}.jpg" alt="{$block.title}" /></div>
+					<div><img src="{$base_dir_ssl}img/reassurance2/{$block.id_reassurance2}.jpg" alt="{$block.title}" /></div>
 					<span class="title">{$block.title}</span>
 					<div class="content">{$block.subtitle}</div>
 				</div>
diff --git a/www/themes/chocolatdemariage/modules/advreassurance3/advreassurance3-bottom.tpl b/www/themes/chocolatdemariage/modules/advreassurance3/advreassurance3-bottom.tpl
index a60399d8..4c79ee2e 100644
--- a/www/themes/chocolatdemariage/modules/advreassurance3/advreassurance3-bottom.tpl
+++ b/www/themes/chocolatdemariage/modules/advreassurance3/advreassurance3-bottom.tpl
@@ -9,7 +9,7 @@
 	{/foreach}
 		<li class="md3 sm6 xs6 xxs6">
 			<span class="title hidden-lg hidden-md hidden-sm">{l s='Reviews' mod='advreassurance'}</span>
-			<img src="{$base_dir}img/verified-reviews.png" alt="">
+			<img src="{$base_dir_ssl}img/verified-reviews.png" alt="">
 		</li>
 	</ul>
 {/if}
diff --git a/www/themes/chocolatdemariage/modules/advreassurance3/advreassurance3.tpl b/www/themes/chocolatdemariage/modules/advreassurance3/advreassurance3.tpl
index ed2d716c..f03c698a 100644
--- a/www/themes/chocolatdemariage/modules/advreassurance3/advreassurance3.tpl
+++ b/www/themes/chocolatdemariage/modules/advreassurance3/advreassurance3.tpl
@@ -5,7 +5,7 @@
 		{foreach from=$blocks item=block key=key}
 			<li class="md3 sm3 xs6">
 				<div class="inner">
-					<div><img src="{$base_dir}img/reassurance3/{$block.id_reassurance}.jpg" alt="{$block.title}" /></div>
+					<div><img src="{$base_dir_ssl}img/reassurance3/{$block.id_reassurance}.jpg" alt="{$block.title}" /></div>
 					<span class="title">{$block.title}</span>
 					<div class="content">{$block.subtitle}</div>
 				</div>
diff --git a/www/themes/chocolatdemariage/modules/advreassurance4/advreassurance4-bottom.tpl b/www/themes/chocolatdemariage/modules/advreassurance4/advreassurance4-bottom.tpl
index a60399d8..4c79ee2e 100644
--- a/www/themes/chocolatdemariage/modules/advreassurance4/advreassurance4-bottom.tpl
+++ b/www/themes/chocolatdemariage/modules/advreassurance4/advreassurance4-bottom.tpl
@@ -9,7 +9,7 @@
 	{/foreach}
 		<li class="md3 sm6 xs6 xxs6">
 			<span class="title hidden-lg hidden-md hidden-sm">{l s='Reviews' mod='advreassurance'}</span>
-			<img src="{$base_dir}img/verified-reviews.png" alt="">
+			<img src="{$base_dir_ssl}img/verified-reviews.png" alt="">
 		</li>
 	</ul>
 {/if}
diff --git a/www/themes/chocolatdemariage/modules/advreassurance4/advreassurance4.tpl b/www/themes/chocolatdemariage/modules/advreassurance4/advreassurance4.tpl
index 8c93e59f..4b9bd5c9 100644
--- a/www/themes/chocolatdemariage/modules/advreassurance4/advreassurance4.tpl
+++ b/www/themes/chocolatdemariage/modules/advreassurance4/advreassurance4.tpl
@@ -5,7 +5,7 @@
 			<ul class="row">
 			{foreach from=$blocks item=block key=key}
 				<li class="md4 sm4 xs4 xxs12">
-					<div><img src="{$base_dir}img/reassurance4/{$block.id_reassurance}.jpg" alt="{$block.title}" /></div>
+					<div><img src="{$base_dir_ssl}img/reassurance4/{$block.id_reassurance}.jpg" alt="{$block.title}" /></div>
 					<span class="title-drop"><span>{$block.title}</span></span>
 					<div class="content">{$block.subtitle}</div>
 				</li>
diff --git a/www/themes/chocolatdemariage/modules/advslider/advslider-home.tpl b/www/themes/chocolatdemariage/modules/advslider/advslider-home.tpl
index b4ba2c07..aab79db3 100644
--- a/www/themes/chocolatdemariage/modules/advslider/advslider-home.tpl
+++ b/www/themes/chocolatdemariage/modules/advslider/advslider-home.tpl
@@ -7,8 +7,8 @@
 						{if !empty($slide.url) && empty($slide.label)}
 						<a href="{$slide.url}">
 						{/if}
-							<img class="homeslider-img hidden-xs hidden-xxs" src="{$base_dir}img/slider/{$slide.id_slide}.jpg" width="100%" height="100%" alt="{$slide.title|escape:'htmlall':'UTF-8'}" />
-							<img class="homeslider-img hidden-lg hidden-md hidden-sm" src="{$base_dir}img/slider/{$slide.id_slide}-image_mobile.jpg" width="100%" height="100%" alt="{$slide.title|escape:'htmlall':'UTF-8'}" />
+							<img class="homeslider-img hidden-xs hidden-xxs" src="{$base_dir_ssl}img/slider/{$slide.id_slide}.jpg" width="100%" height="100%" alt="{$slide.title|escape:'htmlall':'UTF-8'}" />
+							<img class="homeslider-img hidden-lg hidden-md hidden-sm" src="{$base_dir_ssl}img/slider/{$slide.id_slide}-image_mobile.jpg" width="100%" height="100%" alt="{$slide.title|escape:'htmlall':'UTF-8'}" />
 							<div class="homeslider-description">
 								{if !empty($slide.title)}
 									<div class="homeslider-title">
diff --git a/www/themes/chocolatdemariage/modules/advslider/advslider-store.tpl b/www/themes/chocolatdemariage/modules/advslider/advslider-store.tpl
index 2bdb632b..b75f6290 100644
--- a/www/themes/chocolatdemariage/modules/advslider/advslider-store.tpl
+++ b/www/themes/chocolatdemariage/modules/advslider/advslider-store.tpl
@@ -4,7 +4,7 @@
 			{foreach from=$slides item=slide}
 				{if $slide.active}
 					<li class="homeslider-ctn">
-						<img class="homeslider-img" src="{$base_dir}img/slider/{$slide.id_slide}.jpg" width="100%" height="100%" alt="{$slide.title|escape:'htmlall':'UTF-8'}" />
+						<img class="homeslider-img" src="{$base_dir_ssl}img/slider/{$slide.id_slide}.jpg" width="100%" height="100%" alt="{$slide.title|escape:'htmlall':'UTF-8'}" />
 						{if !empty($slide.description)}
 							<div class="homeslider-description cms-style">
 								<p class="homeslider-title">
diff --git a/www/themes/chocolatdemariage/modules/advslider/advslider.tpl b/www/themes/chocolatdemariage/modules/advslider/advslider.tpl
index 6bf8d145..33937d6c 100644
--- a/www/themes/chocolatdemariage/modules/advslider/advslider.tpl
+++ b/www/themes/chocolatdemariage/modules/advslider/advslider.tpl
@@ -7,8 +7,8 @@
 						{if !empty($slide.url) && empty($slide.label)}
 						<a >
 						{/if}
-							<div class="slider-img hidden-lg hidden-md" style="background-image: url({$base_dir}img/slider/{$slide.id_slide}-image_mobile.jpg);"></div>
-							<div class="slider-img hidden-sm hidden-xs hidden-xxs" style="background-image: url({$base_dir}img/slider/{$slide.id_slide}.jpg);"></div>
+							<div class="slider-img hidden-lg hidden-md" style="background-image: url({$base_dir_ssl}img/slider/{$slide.id_slide}-image_mobile.jpg);"></div>
+							<div class="slider-img hidden-sm hidden-xs hidden-xxs" style="background-image: url({$base_dir_ssl}img/slider/{$slide.id_slide}.jpg);"></div>
 						{if !empty($slide.url) && empty($slide.label)}
 						</a>
 						{/if}
diff --git a/www/themes/chocolatdemariage/modules/advslider2/advslider-home2.tpl b/www/themes/chocolatdemariage/modules/advslider2/advslider-home2.tpl
index 07af3e11..567b3ef0 100644
--- a/www/themes/chocolatdemariage/modules/advslider2/advslider-home2.tpl
+++ b/www/themes/chocolatdemariage/modules/advslider2/advslider-home2.tpl
@@ -7,8 +7,8 @@
 						{if !empty($slide.url) && empty($slide.label)}
 						<a href="{$slide.url}">
 						{/if}
-							<img class="homeslider-img hidden-xs hidden-xxs" src="{$base_dir}img/slider/{$slide.id_slide}.jpg" width="100%" height="100%" alt="{$slide.title|escape:'htmlall':'UTF-8'}" />
-							<img class="homeslider-img hidden-lg hidden-md hidden-sm" src="{$base_dir}img/slider/{$slide.id_slide}-image_mobile.jpg" width="100%" height="100%" alt="{$slide.title|escape:'htmlall':'UTF-8'}" />
+							<img class="homeslider-img hidden-xs hidden-xxs" src="{$base_dir_ssl}img/slider/{$slide.id_slide}.jpg" width="100%" height="100%" alt="{$slide.title|escape:'htmlall':'UTF-8'}" />
+							<img class="homeslider-img hidden-lg hidden-md hidden-sm" src="{$base_dir_ssl}img/slider/{$slide.id_slide}-image_mobile.jpg" width="100%" height="100%" alt="{$slide.title|escape:'htmlall':'UTF-8'}" />
 							<div class="homeslider-description">
 								{if !empty($slide.title)}
 									<div class="homeslider-title">
diff --git a/www/themes/chocolatdemariage/modules/advslider2/advslider-store.tpl b/www/themes/chocolatdemariage/modules/advslider2/advslider-store.tpl
index 2bdb632b..b75f6290 100644
--- a/www/themes/chocolatdemariage/modules/advslider2/advslider-store.tpl
+++ b/www/themes/chocolatdemariage/modules/advslider2/advslider-store.tpl
@@ -4,7 +4,7 @@
 			{foreach from=$slides item=slide}
 				{if $slide.active}
 					<li class="homeslider-ctn">
-						<img class="homeslider-img" src="{$base_dir}img/slider/{$slide.id_slide}.jpg" width="100%" height="100%" alt="{$slide.title|escape:'htmlall':'UTF-8'}" />
+						<img class="homeslider-img" src="{$base_dir_ssl}img/slider/{$slide.id_slide}.jpg" width="100%" height="100%" alt="{$slide.title|escape:'htmlall':'UTF-8'}" />
 						{if !empty($slide.description)}
 							<div class="homeslider-description cms-style">
 								<p class="homeslider-title">
diff --git a/www/themes/chocolatdemariage/modules/antadisconfigurator/views/templates/hook/displayProductForm.tpl b/www/themes/chocolatdemariage/modules/antadisconfigurator/views/templates/hook/displayProductForm.tpl
index 79573ad5..85561323 100644
--- a/www/themes/chocolatdemariage/modules/antadisconfigurator/views/templates/hook/displayProductForm.tpl
+++ b/www/themes/chocolatdemariage/modules/antadisconfigurator/views/templates/hook/displayProductForm.tpl
@@ -67,7 +67,7 @@
 				{assign var="optValue" value=$optSelectedValues[$optGroup['id_configurator_opt_group']][0]}
 				{/if}
 				<span id="response-optgroup-{$optGroup['id_configurator_opt_group']}-{$optImpact['id_configurator_opt']}">{$optValue}</span>
-				<input type="hidden" name="optgroup-{$optGroup['id_configurator_opt_group']}-{$optImpact['id_configurator_opt']}" data-dl="{$base_dir}upload/simu/{$id_product}/{$optGroup['reference']}" value="{$optValue}"/>
+				<input type="hidden" name="optgroup-{$optGroup['id_configurator_opt_group']}-{$optImpact['id_configurator_opt']}" data-dl="{$base_dir_ssl}upload/simu/{$id_product}/{$optGroup['reference']}" value="{$optValue}"/>
 			{elseif $optGroup['type'] == 'radio'}
 				{assign var="optValue" value=array()}
 				{if isset($optSelectedValues[$optGroup['id_configurator_opt_group']])}
diff --git a/www/themes/chocolatdemariage/modules/antexportorder/translations/fr.php b/www/themes/chocolatdemariage/modules/antexportorder/translations/fr.php
new file mode 100644
index 00000000..e69de29b
diff --git a/www/themes/chocolatdemariage/modules/anthowknowus/translations/fr.php b/www/themes/chocolatdemariage/modules/anthowknowus/translations/fr.php
new file mode 100644
index 00000000..e69de29b
diff --git a/www/themes/chocolatdemariage/modules/bankwire/translations/fr.php b/www/themes/chocolatdemariage/modules/bankwire/translations/fr.php
index dfa590c6..6f786dd2 100644
--- a/www/themes/chocolatdemariage/modules/bankwire/translations/fr.php
+++ b/www/themes/chocolatdemariage/modules/bankwire/translations/fr.php
@@ -53,3 +53,4 @@ $_MODULE['<{bankwire}chocolatdemariage>payment_return_66fcf4c223bbf4c7c886d4784e
 $_MODULE['<{bankwire}chocolatdemariage>payment_return_d15feee53d81ea16269e54d4784fa123'] = 'Nous avons rencontré un problème avec votre commande. Nous vous invitons à prendre contact avec notre';
 $_MODULE['<{bankwire}chocolatdemariage>payment_5e1695822fc5af98f6b749ea3cbc9b4c'] = 'Payer par virement bancaire';
 $_MODULE['<{bankwire}chocolatdemariage>payment_4e1fb9f4b46556d64db55d50629ee301'] = '(le traitement de la commande sera plus long)';
+$_MODULE['<{bankwire}chocolatdemariage>payment_3cb8f1e7a758ff6e44dd83c7dd1ba10b'] = 'Votre commande sera traitée dès réception de votre virement';
diff --git a/www/themes/chocolatdemariage/modules/blockreinsurance/blockreinsurance-left.tpl b/www/themes/chocolatdemariage/modules/blockreinsurance/blockreinsurance-left.tpl
index 046e1919..1f3d7fc9 100644
--- a/www/themes/chocolatdemariage/modules/blockreinsurance/blockreinsurance-left.tpl
+++ b/www/themes/chocolatdemariage/modules/blockreinsurance/blockreinsurance-left.tpl
@@ -9,7 +9,7 @@
 			</div>                        
 		{/foreach}
 	</div>
-	<img class="payment-logo" src="{$base_dir}img/logo-payment.png" alt="" />
+	<img class="payment-logo" src="{$base_dir_ssl}img/logo-payment.png" alt="" />
 </div>
 <!-- /MODULE Block reinsurance -->
 {/if}
\ No newline at end of file
diff --git a/www/themes/chocolatdemariage/modules/featuredcategories/featuredcategories.tpl b/www/themes/chocolatdemariage/modules/featuredcategories/featuredcategories.tpl
index 2766d99b..dcfa6c91 100644
--- a/www/themes/chocolatdemariage/modules/featuredcategories/featuredcategories.tpl
+++ b/www/themes/chocolatdemariage/modules/featuredcategories/featuredcategories.tpl
@@ -11,7 +11,7 @@
 				<a class="inner clearfix" href="{$link->getCategoryLink($block.id_category)}">
 					<i class="icon icon-{trim($block.liste_icons_univers)} icon-featured"></i>
 					{if file_exists($smarty.const._PS_ROOT_DIR_|cat:"/img/c/home/{$block.id_category}.jpg")}
-						<div class="img"><img class="img-full" src="{$base_dir}img/c/home/{$block.id_category}.jpg" alt="{$block.name}"/></div>
+						<div class="img"><img class="img-full" src="{$base_dir_ssl}img/c/home/{$block.id_category}.jpg" alt="{$block.name}"/></div>
 					{/if}
 					<div class="content">
 						<div class="txt">
diff --git a/www/themes/chocolatdemariage/modules/tntofficiel/translations/fr.php b/www/themes/chocolatdemariage/modules/tntofficiel/translations/fr.php
index 1c02e958..edcf23ad 100644
--- a/www/themes/chocolatdemariage/modules/tntofficiel/translations/fr.php
+++ b/www/themes/chocolatdemariage/modules/tntofficiel/translations/fr.php
@@ -21,6 +21,33 @@ $_MODULE['<{tntofficiel}chocolatdemariage>tntofficiel_34df815e78180dfe3de4498717
 $_MODULE['<{tntofficiel}chocolatdemariage>tntofficiel_4b944d27d010a334b7a7ac925d58fc2a'] = 'Le numéro de compte est obligatoire';
 $_MODULE['<{tntofficiel}chocolatdemariage>tntofficiel_b34731c53c709e721b0f11e567759f38'] = 'Le mot de passe est obligatoire';
 $_MODULE['<{tntofficiel}chocolatdemariage>tntofficiel_b5c2f36d66da368ec60fae8ea9ff7b76'] = 'Une erreur est survenue lors de la création de la livraison';
+$_MODULE['<{tntofficiel}chocolatdemariage>_print_bt_icon_277b18808bb6fba9845a813795fe8baa'] = 'BT';
+$_MODULE['<{tntofficiel}chocolatdemariage>_print_bt_icon_76c3e002d3c052bd6a909366a8dc3845'] = 'Manifeste';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayajaxtracking_cc97a74bb428ffc130b1b39eabc141f5'] = 'Détail de la livraison';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayajaxtracking_d3d2e617335f08df83599665eef8a418'] = 'Fermer';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayajaxtracking_b6026301f6eccf9afcf19458173e63e8'] = 'Numéro de suivi';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayajaxtracking_50b613e90b9579184a11f56ab19ea5be'] = 'Suivre mon colis';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayadminorder_5c0a951f54c0c7bf4c66dd2e6d0fe2de'] = 'Date de ramassage';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayadminorder_2e79cbc13bbc903d989eab943a2e394f'] = 'Date de livraison';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayadminorder_0bfc9d7a908999118a95316e5b2cd3ca'] = 'La date n\'est pas valide';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayadminorder_3e6548fbd02839544c5a6ce445116b03'] = 'La date est valide';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayadminorder_96f26ad4b9f1ed9c512d5944dc40d558'] = 'Colis';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayadminorder_83a71abc738492fd7d9d536c5c2a7231'] = 'Numéro de ramassage : ';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayadminorder_392235852a55ba6cba1db9df1b4695f0'] = 'Poids total : ';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayadminorder_2ce124d87604bed00f310d4585d26ea7'] = 'Kg';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayadminorder_faca76e418e6a6bf8ca1815c9586bf7c'] = 'Numéro de colis';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayadminorder_7edabf994b76a00cbc60c95af337db8f'] = 'Poids';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayadminorder_418c5509e2171d55b0aee5c2ea4442b5'] = 'Action';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayadminorder_4e0799443cae591e21badb40f9a20754'] = 'PDL';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayadminorder_151648106e4bf98297882ea2ea1c4b0e'] = 'Mise à jour réussie';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayadminorder_06933067aafd48425d67bcb01bba5cb6'] = 'Mise à jour';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayadminorder_f2a6c498fb90ee345d997f888fce3b18'] = 'Supprimer';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayadminorder_1e8e42b87a65326b98ced7d3af717a72'] = 'Voir';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayadminorder_34ec78fcc91ffb1e54cd85e4a0924332'] = 'Ajouter';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayadminorder_ae30ab8690d876020e4f8dec7332f3a7'] = 'Ajouter un colis';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayadminorder_09d2c2cea0ca2c48cc357e7fa996db87'] = 'Poids du colis';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayadminorder_43781db5c40ecc39fd718685594f0956'] = 'Sauver';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayadminorder_d41f0f868a0dbe1e9f25fe8c125f7fdd'] = 'Une commande doit contenir au moins un colis';
 $_MODULE['<{tntofficiel}chocolatdemariage>displaycarrierlist_c945f0cc434c21e830eb9bd8d45b2845'] = 'La commande ne peut pas être achetée';
 $_MODULE['<{tntofficiel}chocolatdemariage>displaycarrierlist_0c0a7d8a27886268bf0f5ec9727288df'] = 'La ville saisie est inconnue pour le code postal %s';
 $_MODULE['<{tntofficiel}chocolatdemariage>displaycarrierlist_eacc8a7970c5a823d0f383f15591c8b0'] = 'Informations complémentaires transporteur';
@@ -30,5 +57,40 @@ $_MODULE['<{tntofficiel}chocolatdemariage>displaycarrierlist_070c051179746c6932d
 $_MODULE['<{tntofficiel}chocolatdemariage>displaycarrierlist_dc4a632c5933c9c81274bedc8dd797f7'] = 'Code d\'accès au bâtiment (7 caractères maximum)';
 $_MODULE['<{tntofficiel}chocolatdemariage>displaycarrierlist_f3f6d0343d56ce88ce7958170ed05cb3'] = 'Etage (2 caractères maximum)';
 $_MODULE['<{tntofficiel}chocolatdemariage>displaycarrierlist_70397c4b252a5168c5ec003931cea215'] = 'Champs obligatoires';
-$_MODULE['<{tntofficiel}chocolatdemariage>displaycarrierlist_6971dd4c515c58b6122410c8bd1ed6fe'] = 'Le champ \'Téléphone portable\' doit être composé de 10 chiffres sans espace ni point, et commencer par un 06 ou 07';
-$_MODULE['<{tntofficiel}chocolatdemariage>displaycarrierlist_8144eaaa3a1db5748161ec93fa3b5f1c'] = 'Une erreur s\'est produite';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayorderdetail_a7dd12b1dab17d25467b0b0a4c8d4a92'] = 'Voir';
+$_MODULE['<{tntofficiel}chocolatdemariage>displayorderdetail_ef7eea8df7e16831217a3b25c58bf508'] = 'Suivre mes colis';
+$_MODULE['<{tntofficiel}chocolatdemariage>deliverypointsbox_60c1249f2568c852f5fa352e609d1741'] = 'Choisissez votre Relais Colis®';
+$_MODULE['<{tntofficiel}chocolatdemariage>deliverypointsbox_775721e7246431e9e3fa4c9ea932db0d'] = 'Choisissez votre Dépôt restant';
+$_MODULE['<{tntofficiel}chocolatdemariage>deliverypointset_ccdb7bf9d93e5652b57cabcc8c41e061'] = 'Horaires';
+$_MODULE['<{tntofficiel}chocolatdemariage>deliverypointset_6f8522e0610541f1ef215a22ffa66ff6'] = 'Lundi';
+$_MODULE['<{tntofficiel}chocolatdemariage>deliverypointset_5792315f09a5d54fb7e3d066672b507f'] = 'Mardi';
+$_MODULE['<{tntofficiel}chocolatdemariage>deliverypointset_796c163589f295373e171842f37265d5'] = 'Mercredi';
+$_MODULE['<{tntofficiel}chocolatdemariage>deliverypointset_78ae6f0cd191d25147e252dc54768238'] = 'Jeudi';
+$_MODULE['<{tntofficiel}chocolatdemariage>deliverypointset_c33b138a163847cdb6caeeb7c9a126b4'] = 'Vendredi';
+$_MODULE['<{tntofficiel}chocolatdemariage>deliverypointset_8b7051187b9191cdcdae6ed5a10e5adc'] = 'Samedi';
+$_MODULE['<{tntofficiel}chocolatdemariage>deliverypointset_9d1a0949c39e66a0cd65240bc0ac9177'] = 'Dimanche';
+$_MODULE['<{tntofficiel}chocolatdemariage>deliverypointset_be5d5d37542d75f93a87094459f76678'] = 'et';
+$_MODULE['<{tntofficiel}chocolatdemariage>deliverypointset_03f4a47830f97377a35321051685071e'] = 'Fermé';
+$_MODULE['<{tntofficiel}chocolatdemariage>deliverypointset_f4ec5f57bd4d31b803312d873be40da9'] = 'Modifier';
+$_MODULE['<{tntofficiel}chocolatdemariage>form_48974cc3df177e6b565c39aa155458cd'] = 'Adresse de livraison';
+$_MODULE['<{tntofficiel}chocolatdemariage>form_8bcdc441379cbf584638b0589a3f9adb'] = 'Code postal';
+$_MODULE['<{tntofficiel}chocolatdemariage>form_57d056ed0984166336b7879c2af3657f'] = 'Ville';
+$_MODULE['<{tntofficiel}chocolatdemariage>form_36936b078805af8a6e283161721f99e1'] = '-- Sélectionner une ville --';
+$_MODULE['<{tntofficiel}chocolatdemariage>form_647552b29642ed538b23b5bc3d28864f'] = 'Aucune ville disponible';
+$_MODULE['<{tntofficiel}chocolatdemariage>form_f4ec5f57bd4d31b803312d873be40da9'] = 'Modifier';
+$_MODULE['<{tntofficiel}chocolatdemariage>list_ccdb7bf9d93e5652b57cabcc8c41e061'] = 'Horaires';
+$_MODULE['<{tntofficiel}chocolatdemariage>list_6f8522e0610541f1ef215a22ffa66ff6'] = 'Lundi';
+$_MODULE['<{tntofficiel}chocolatdemariage>list_5792315f09a5d54fb7e3d066672b507f'] = 'Mardi';
+$_MODULE['<{tntofficiel}chocolatdemariage>list_796c163589f295373e171842f37265d5'] = 'Mercredi';
+$_MODULE['<{tntofficiel}chocolatdemariage>list_78ae6f0cd191d25147e252dc54768238'] = 'Jeudi';
+$_MODULE['<{tntofficiel}chocolatdemariage>list_c33b138a163847cdb6caeeb7c9a126b4'] = 'Vendredi';
+$_MODULE['<{tntofficiel}chocolatdemariage>list_8b7051187b9191cdcdae6ed5a10e5adc'] = 'Samedi';
+$_MODULE['<{tntofficiel}chocolatdemariage>list_9d1a0949c39e66a0cd65240bc0ac9177'] = 'Dimanche';
+$_MODULE['<{tntofficiel}chocolatdemariage>list_be5d5d37542d75f93a87094459f76678'] = 'et';
+$_MODULE['<{tntofficiel}chocolatdemariage>list_03f4a47830f97377a35321051685071e'] = 'Fermé';
+$_MODULE['<{tntofficiel}chocolatdemariage>list_961f2247a2070bedff9f9cd8d64e2650'] = 'Choisir';
+$_MODULE['<{tntofficiel}chocolatdemariage>list_5a07832bfc91847bdde742703f7a7d71'] = 'Aucune ville correspondante pour le code postal demandé.';
+$_MODULE['<{tntofficiel}chocolatdemariage>list_671f3468c84b318bbcd174a4a546765e'] = 'Vérifier le code postal et cliquez sur';
+$_MODULE['<{tntofficiel}chocolatdemariage>list_f4ec5f57bd4d31b803312d873be40da9'] = 'Modifier';
+$_MODULE['<{tntofficiel}chocolatdemariage>list_fdfeefba19d7a7f570a372d1cf8b20fb'] = 'Sélectionnez une ville dans la liste et cliquez sur';
+$_MODULE['<{tntofficiel}chocolatdemariage>list_e0db4c0842a1cc908c6c97e621bd8481'] = 'Aucun point de livraison n\'est disponible pour cette ville.';
diff --git a/www/themes/chocolatdemariage/order-detail.tpl b/www/themes/chocolatdemariage/order-detail.tpl
index 94ea8582..112cd57a 100644
--- a/www/themes/chocolatdemariage/order-detail.tpl
+++ b/www/themes/chocolatdemariage/order-detail.tpl
@@ -312,12 +312,12 @@
 																	<span class="name">{$group['name']} : </span>
 																	{foreach item=v from=$group['value'] name=opt}
 																		{if $group['type'] == 'file'}
-																		<a href="{$base_dir}upload/orders/{$order->id}/{$product.id_product}/{$group['reference']}/{$v}" target="_blank">
-																		<img src="{$base_dir}upload/orders/{$order->id}/{$product.id_product}/{$group['reference']}/{$v}" width="75" height="75"/>
+																		<a href="{$base_dir_ssl}upload/orders/{$order->id}/{$product.id_product}/{$group['reference']}/{$v}" target="_blank">
+																		<img src="{$base_dir_ssl}upload/orders/{$order->id}/{$product.id_product}/{$group['reference']}/{$v}" width="75" height="75"/>
 																		</a>
 																		{elseif $type == 'IMG'}
-																		<a href="{$base_dir}upload/orders/{$order->id}/{$product.id_product}/{$group['reference']}/{$v}" target="_blank">
-																		<img src="{$base_dir}upload/orders/{$order->id}/{$product.id_product}/{$group['reference']}/{$v}" width="75" height="75"/>
+																		<a href="{$base_dir_ssl}upload/orders/{$order->id}/{$product.id_product}/{$group['reference']}/{$v}" target="_blank">
+																		<img src="{$base_dir_ssl}upload/orders/{$order->id}/{$product.id_product}/{$group['reference']}/{$v}" width="75" height="75"/>
 																		</a>					
 																		{else} 
 																		{$v} 
diff --git a/www/themes/chocolatdemariage/resume-cart.tpl b/www/themes/chocolatdemariage/resume-cart.tpl
index 1a3e9b05..4bf31bbd 100644
--- a/www/themes/chocolatdemariage/resume-cart.tpl
+++ b/www/themes/chocolatdemariage/resume-cart.tpl
@@ -31,12 +31,12 @@
 																			<span class="name">{$group['name']} : </span>
 																			{foreach item=v from=$group['value'] name=opt}
 																				{if $group['type'] == 'file'}
-																				<a href="{$base_dir}upload/simu/{$product.id_product}/{$group['reference']}/{$v}" target="_blank">
-																				<img src="{$base_dir}upload/simu/{$product.id_product}/{$group['reference']}/{$v}" width="75" height="75"/>
+																				<a href="{$base_dir_ssl}upload/simu/{$product.id_product}/{$group['reference']}/{$v}" target="_blank">
+																				<img src="{$base_dir_ssl}upload/simu/{$product.id_product}/{$group['reference']}/{$v}" width="75" height="75"/>
 																				</a>
 																				{elseif $type == 'IMG'}
-																				<a href="{$base_dir}upload/simu/{$product.id_product}/{$group['reference']}/{$v}" target="_blank">
-																				<img src="{$base_dir}upload/simu/{$product.id_product}/{$group['reference']}/{$v}" width="75" height="75"/>
+																				<a href="{$base_dir_ssl}upload/simu/{$product.id_product}/{$group['reference']}/{$v}" target="_blank">
+																				<img src="{$base_dir_ssl}upload/simu/{$product.id_product}/{$group['reference']}/{$v}" width="75" height="75"/>
 																				</a>					
 																				{else} {$v} {/if} {if !$smarty.foreach.opt.last},{/if}
 																			{/foreach}
diff --git a/www/themes/chocolatdemariage/shopping-cart-product-line.tpl b/www/themes/chocolatdemariage/shopping-cart-product-line.tpl
index 59e465a5..70dc0a2e 100644
--- a/www/themes/chocolatdemariage/shopping-cart-product-line.tpl
+++ b/www/themes/chocolatdemariage/shopping-cart-product-line.tpl
@@ -25,12 +25,12 @@
 					<span class="name">{$group['name']} : </span>
 					{foreach item=v from=$group['value'] name=opt}
 						{if $group['type'] == 'file'}
-						<a href="{$base_dir}upload/simu/{$product.id_product}/{$group['reference']}/{$v}" target="_blank">
-						<img src="{$base_dir}upload/simu/{$product.id_product}/{$group['reference']}/{$v}" width="75" height="75"/>
+						<a href="{$base_dir_ssl}upload/simu/{$product.id_product}/{$group['reference']}/{$v}" target="_blank">
+						<img src="{$base_dir_ssl}upload/simu/{$product.id_product}/{$group['reference']}/{$v}" width="75" height="75"/>
 						</a>
 						{elseif $type == 'IMG'}
-						<a href="{$base_dir}upload/simu/{$product.id_product}/{$group['reference']}/{$v}" target="_blank">
-						<img src="{$base_dir}upload/simu/{$product.id_product}/{$group['reference']}/{$v}" width="75" height="75"/>
+						<a href="{$base_dir_ssl}upload/simu/{$product.id_product}/{$group['reference']}/{$v}" target="_blank">
+						<img src="{$base_dir_ssl}upload/simu/{$product.id_product}/{$group['reference']}/{$v}" width="75" height="75"/>
 						</a>					
 						{else} {$v} {/if} {if !$smarty.foreach.opt.last},{/if}
 					{/foreach}