From c37df06d4713234f5a4206d84559d860abd70d23 Mon Sep 17 00:00:00 2001
From: Thibault UBUNTU <thibault+ubuntu@antadis.com>
Date: Wed, 20 Apr 2016 15:32:12 +0200
Subject: [PATCH 1/2] add reassurance text

---
 themes/site/css/style.css                     | 13 ++++++
 .../paypal/express_checkout_payment.tpl       | 44 +++++++++++++++----
 .../site/modules/paypal/payment/payment.tpl   |  2 +-
 3 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/themes/site/css/style.css b/themes/site/css/style.css
index af207e6b..7a47863c 100755
--- a/themes/site/css/style.css
+++ b/themes/site/css/style.css
@@ -434,6 +434,19 @@
   .box_add_to_cart .content_best_sales li .reduction a{}
   .box_add_to_cart .content_best_sales li a:hover{ text-decoration: none;}
 
+.paiement_info_lightbox {
+  background: #333;
+  border-radius: 50px;
+  color: #ffffff;
+  cursor: pointer;
+  float: left;
+  font-size: 10px;
+  height: 15px;
+  line-height: 14px;
+  margin-left: 9px;
+  width: 15px;
+}
+
 .block_filter h4.open{
   cursor: pointer;
   background: url('../img/li_size.png') no-repeat right 6px;
diff --git a/themes/site/modules/paypal/express_checkout_payment.tpl b/themes/site/modules/paypal/express_checkout_payment.tpl
index 95c42fb7..637aec2d 100644
--- a/themes/site/modules/paypal/express_checkout_payment.tpl
+++ b/themes/site/modules/paypal/express_checkout_payment.tpl
@@ -55,7 +55,7 @@
 			</span>
 			<span class="save_info">
 				<input type="checkbox" id="save_info_paypal" data-change="save_billing_paypal">
-				<label for="save_info_paypal">{l s='Save my paypal account information for future payments' mod='paypal'}</label>					
+				<label for="save_info_paypal">{l s='Save my paypal account information for future payments' mod='paypal'} </label><span class="paiement_info_lightbox paypal_info">?</span>
 			</span>
 		</div>
 	</div>
@@ -80,6 +80,28 @@
 			{/foreach}
 		</div>
 	{/if}
+
+
+	<div class="overlay_bbb info_paypal"></div>
+	<div class="box_add_to_cart paiment_info_paypal">
+		<div class="content">
+			<h3>{l s='Mémorisation de vos données Paypal' mod='paypal'}</h3>
+			<div id="close_add_to_cart" class="close">
+				<img alt="{l s='Fermer la fenètre'}" src="{$img_dir}close.jpg">
+			</div>
+			<div class="content_box">
+				<p>
+					{l s='Lors du passage d\'une commande, vous pouvez choisir de mémoriser vos coordonnées Paypal. Ces dernières seront alors enregistrées sur les serveurs sécurisés de Paypal. Votre compte enregistré vous sera proposé pour vos prochaines commandes sans que vous n\'ayez besoin de saisir de nouveau vos données.' mod='paypal'}
+				</p>
+				<p>
+					{l s='Quelle que soit l\'option choisie, seul Paypal a accès à vos informations, et en aucun cas Bébé Boutik.' mod='paypal'}
+				</p>
+				<p>
+					{l s='Vous pouvez à tout moment voir et supprimer vos comptes Paypal enregistrés sur la page « Gérer mes moyens de paiement » dans le menu « Mon compte ».' mod='paypal'}
+				</p>
+			</div>
+		</div>
+	</div>
 	
 </div>
 
@@ -92,14 +114,20 @@
 		} else {
 			$('#save_billing_paypal').val('0');
 		}
-	});
 
-	$('#save_info_paypal').change(function(){
-		if ($(this).is(':checked')) {
-			$('#save_billing_paypal').val('1');
-		} else {
-			$('#save_billing_paypal').val('0');
-		}
+		$('.paypal_info').live('click', function(){
+			$('.info_paypal').fadeIn();
+			$('.paiment_info_paypal').fadeIn();
+		});
+
+		$('#save_info_paypal').change(function(){
+			if ($(this).is(':checked')) {
+				$('#save_billing_paypal').val('1');
+			} else {
+				$('#save_billing_paypal').val('0');
+			}
+		});
+
 	});
 </script>
 {/literal}
\ No newline at end of file
diff --git a/themes/site/modules/paypal/payment/payment.tpl b/themes/site/modules/paypal/payment/payment.tpl
index f9030228..5d8b7394 100755
--- a/themes/site/modules/paypal/payment/payment.tpl
+++ b/themes/site/modules/paypal/payment/payment.tpl
@@ -46,7 +46,7 @@
 	<div class="clearfix"></div>
 	{if $accounts}
 		<div class="accounts">
-			<p class="title_account_payment">Vous avez des comptes enregistrés vous pouvez les utiliser pour payer :</p>
+			<p class="title_account_payment">{l s='Vous avez des comptes enregistrés vous pouvez les utiliser pour payer :' mod='paypal'}</p>
 			{foreach from=$accounts item=account}
 				<div class="account_payment">
 					<div class="radio">

From bbee57249a553790c320711c13366355b81425eb Mon Sep 17 00:00:00 2001
From: Thibault UBUNTU <thibault+ubuntu@antadis.com>
Date: Wed, 20 Apr 2016 17:35:03 +0200
Subject: [PATCH 2/2] version mobile

---
 .../paypal/express_checkout_payment.tpl       |   1 -
 themes/site_mobile/css/style.css              | 110 +++++++++++----
 themes/site_mobile/lang/es.php                |  24 ++++
 themes/site_mobile/lang/fr.php                |  28 ++++
 .../paypal/express_checkout_payment.tpl       | 133 ++++++++++++++++++
 themes/site_mobile/modules/paypal/fr.php      |   2 +
 themes/site_mobile/order-confirmation.tpl     |  38 ++++-
 themes/site_mobile/order-payment.tpl          |  43 +++++-
 8 files changed, 346 insertions(+), 33 deletions(-)
 create mode 100644 themes/site_mobile/modules/paypal/express_checkout_payment.tpl

diff --git a/themes/site/modules/paypal/express_checkout_payment.tpl b/themes/site/modules/paypal/express_checkout_payment.tpl
index 637aec2d..5cb15ffc 100644
--- a/themes/site/modules/paypal/express_checkout_payment.tpl
+++ b/themes/site/modules/paypal/express_checkout_payment.tpl
@@ -127,7 +127,6 @@
 				$('#save_billing_paypal').val('0');
 			}
 		});
-
 	});
 </script>
 {/literal}
\ No newline at end of file
diff --git a/themes/site_mobile/css/style.css b/themes/site_mobile/css/style.css
index d2512330..d7225a0a 100755
--- a/themes/site_mobile/css/style.css
+++ b/themes/site_mobile/css/style.css
@@ -2730,7 +2730,7 @@ body#order div.addresses div#ordermsg{
 	margin-top:15px;
 }
 body#order-confirmation p{
-	font-size:14px;
+	font-size: 12px;
 	margin:0px 10px;
 }
 body#order div.addresses div#ordermsg p{
@@ -2866,41 +2866,62 @@ body#order #HOOK_PAYMENT .payment_module{
     margin-bottom: 5px;
     font-weight: normal;
   }
-  #order #center_column #HOOK_PAYMENT p a:hover { text-decoration: none;}
+  #order #center_column #HOOK_PAYMENT p a:hover { text-decoration: none; }
+	.save_info { margin-top: 5px; font-size: 12px; clear: both; display: block; overflow: auto;}	
+	.save_info input { float: left; position: relative; top: 3px;}
+	
 
-body#order #HOOK_PAYMENT p{
- 	clear: both;
-    color: #e36ea2;
-    font-family: Arial;
-    font-size: 12px;
-    font-weight: bold;
-    height: 20px;
-    margin-bottom: 10px;
-    text-align: center;
-    text-transform: uppercase;
+.paiement_info_lightbox {
+  background: #333;
+  border-radius: 50px;
+  color: #ffffff;
+  cursor: pointer;
+  font-size: 10px;
+  height: 15px;
+  line-height: 14px;
+  margin-left: 9px;
+  width: 15px;
+  display: block;
+  margin: 0 auto;
 }
-body#order #HOOK_PAYMENT p a span{
-	display: table-cell;
-	vertical-align: middle;
+
+body#order #HOOK_PAYMENT .box_add_to_cart .content_box p{
+	color: #333;
+    font-size: 13px;
+    font-weight: normal;
+    height: auto;
+    text-transform: none;
 }
-body#order #HOOK_PAYMENT p a span.logo{
-	width:35%;
+
+.title_payment {
+	color: #222;
+	font-family: georgia,times new roman,serif;
+	font-size: 18px;
+	font-style: italic;
+	text-align: center;
 }
-body#order #HOOK_PAYMENT p a{
+
+.account_payment {
+	margin: 10px 0px 0px;
+	border-top: 1px solid #adadae;
 	clear: both;
-    color: #e36ea2;
-    display: block;
-    float: left;
-    text-align: center;
-    width: 100%;
+	padding: 10px 0 0;
 }
-body#order #HOOK_PAYMENT p a img{
-	display: block;
-    height: 50%;
-    margin: 0 auto;
-    text-align: center;
-    width: 50%;
+#order #center_column #HOOK_PAYMENT .account_payment .title {
+	font-family: tahoma;
+	color: #6d777d;
+	text-align: left;
+	text-transform: uppercase;
+	font-size: 12px;
+	margin-bottom: 15px;
+	padding-bottom: 0;
 }
+.account_payment .box_account { cursor: pointer; overflow: auto }
+.account_payment .box_account input { float: left; position: relative; top: 3px; width: 10%;}
+.account_payment .box_account label { float: left; cursor: pointer; color: #444d52; font-size: 12px; width: 90%;}
+
+
+
 
 /* Referal Program */
 body#module-invite-invite-program .tab_wrap div{
@@ -3467,6 +3488,32 @@ body#module-cheque-payment p.img_wrap{
 body#order-confirmation p.footer_links{
 	display:none;
 }
+#order_conf_detail a { color: #e36ea2 }
+#order_conf_detail {
+	font-size: 12px;
+	color : #333
+}
+.order_conf_left {
+	margin-bottom: 15px;
+}
+.order_confirmation_detail {
+	 margin-bottom: 7px;
+	 padding-bottom: 10px;
+	 border-bottom: 1px solid #ccc;
+}
+#order_conf_detail h3{
+	background: #fff;
+	font-size: 12px;
+	color: #e36ea2;
+	margin: 10px 0;
+	padding: 10px;
+}
+h4.delay_cart{
+	background: #ccc;
+	padding: 10px;
+	margin-bottom: 10px;
+}
+
 
 body#module-loyalty-loyalty-program p{
 	font-size: 12px;
@@ -4411,4 +4458,7 @@ body#index .jqibuttons span.gradient{
 	font-style: italic;
 	font-size: 13px;
 	background: #504d8b;
-}
\ No newline at end of file
+}
+
+
+#cookiescontent { padding: 10px; font-size: 12px; }
\ No newline at end of file
diff --git a/themes/site_mobile/lang/es.php b/themes/site_mobile/lang/es.php
index 349fe134..01fd2a82 100755
--- a/themes/site_mobile/lang/es.php
+++ b/themes/site_mobile/lang/es.php
@@ -285,6 +285,30 @@ $_LANG['order-carrier_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Siguiente';
 $_LANG['order-carrier_bd5b551d1757a856d9f2d01dc7850080'] = 'Deje un mensaje';
 $_LANG['order-carrier_617096c86d35478132502be00e12e016'] = 'Si desea añadir algún comentario sobre su pedido, escríbalo, por favor, a continuación';
 $_LANG['order-confirmation_fb077ecba55e5552916bde26d8b9e794'] = 'Confirmación de pedido';
+$_LANG['order-confirmation_8b1a9953c4611296a827abf8c47804d7'] = 'Hola';
+$_LANG['order-confirmation_58d27df1d25a432c074a0dd39485298c'] = 'Acabas de hacer un pedido en Bébé Boutik y te lo agradecemos.';
+$_LANG['order-confirmation_fc56c93fab8dcac592834f6dc98a5962'] = 'El número de seguimiento del pedido será comunicado por mail en el momento en que se envíe el paquete.';
+$_LANG['order-confirmation_c3efd0ea01b5547cc009061e037c522f'] = 'Puedes descargar tu factura en tu cuenta, espacio';
+$_LANG['order-confirmation_42027dc8724f95b3f0a6bef9630cad3d'] = 'Historial de pedidos.';
+$_LANG['order-confirmation_75a5021bc4f5530d528676272110638c'] = 'Apadrina & gana 10€';
+$_LANG['order-confirmation_308c7fad819f1ca3eb9489dc00bcc14c'] = 'Email de tu amigo/a';
+$_LANG['order-confirmation_fa9ba9bbd94c6d42e3c3c6c2fadb01af'] = '> Apadrinar a más amigos/as';
+$_LANG['order-confirmation_8dffb37d6ae0ba95c6142387239beeac'] = 'Detalles del pedido';
+$_LANG['order-confirmation_694e8d1f2ee056f98ee488bdc4982d73'] = 'Cantidad';
+$_LANG['order-confirmation_197101c4a1b1fc503dcd6ebee127aa10'] = 'Precio unitario';
+$_LANG['order-confirmation_db205f01b4fd580fb5daa9072d96849d'] = 'Total artículos';
+$_LANG['order-confirmation_b76c1a1463e45cece931ef4467c0bdf8'] = 'Total reducciones';
+$_LANG['order-confirmation_ab2cf9a596bbcf17ccb9c98404576b58'] = 'Total envío';
+$_LANG['order-confirmation_96b0141273eabab320119c467cdcaf17'] = 'Total';
+$_LANG['order-confirmation_380ce8cbd24372c0c4e1372269758ee4'] = 'Envío';
+$_LANG['order-confirmation_2f2f0f119a907c6c67a3c6fcde0193ab'] = 'Dirección de envío';
+$_LANG['order-confirmation_886dc40a9367328f942e6bf6c31f3ebb'] = 'Dirección de facturación';
+$_LANG['order-confirmation_73878c19cdc6ef2ab0d0fac6943cc958'] = '¿Necesitas ayuda?';
+$_LANG['order-confirmation_1385af17704d88a7d7f2b304fe519221'] = '¿Cómo seguir mi pedido?';
+$_LANG['order-confirmation_761fc370a2b7de4983e9569a92f4009f'] = '¿Cómo hacer una devolución?';
+$_LANG['order-confirmation_964ea159bc8f6367f7a0a503c5869236'] = 'Nuestro servicio de atención al cliente está a tu disposición';
+$_LANG['order-confirmation_d5552e0564007d93ff5937a9cb3bc491'] = 'Servicio de atención al cliente';
+$_LANG['order-confirmation_8dd27b9ed5800530a6ca9f6d158074ed'] = '902 044 399 - De 9 a 12h y de 14 a 18h, de lunes a viernes';
 $_LANG['order-confirmation_e19e31ddb54b493059808ec4f2dab4cb'] = 'Su ID de pedido es:';
 $_LANG['order-confirmation_c3b59dc92773203d09404d887676376f'] = 'Su ID de pedido se ha enviado a su dirección de correo electrónico';
 $_LANG['order-confirmation_4082ea29b4f196c4f60533500139725a'] = 'Seguimiento de mi pedido';
diff --git a/themes/site_mobile/lang/fr.php b/themes/site_mobile/lang/fr.php
index 5ca30f75..e1ebf3bf 100755
--- a/themes/site_mobile/lang/fr.php
+++ b/themes/site_mobile/lang/fr.php
@@ -300,6 +300,34 @@ $_LANG['order-carrier_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Suivant';
 $_LANG['order-carrier_bd5b551d1757a856d9f2d01dc7850080'] = 'Laissez un message';
 $_LANG['order-carrier_617096c86d35478132502be00e12e016'] = 'Si vous souhaitez ajouter un commentaire sur votre commande, merci d\'écrire ci-dessous.';
 $_LANG['order-confirmation_fb077ecba55e5552916bde26d8b9e794'] = 'Confirmation de commande';
+$_LANG['order-confirmation_8b1a9953c4611296a827abf8c47804d7'] = 'Bonjour';
+$_LANG['order-confirmation_58d27df1d25a432c074a0dd39485298c'] = 'Vous venez de commander sur Bébé Boutik et nous vous en remercions.';
+$_LANG['order-confirmation_fc56c93fab8dcac592834f6dc98a5962'] = 'Le numéro de suivi vous sera envoyé par email lors de l\'expédition du colis.';
+$_LANG['order-confirmation_c3efd0ea01b5547cc009061e037c522f'] = 'Vous pouvez télécharger votre facture dans votre compte, rubrique';
+$_LANG['order-confirmation_42027dc8724f95b3f0a6bef9630cad3d'] = 'Historique des commandes.';
+$_LANG['order-confirmation_75a5021bc4f5530d528676272110638c'] = 'Parrainez & gagnez 10€';
+$_LANG['order-confirmation_308c7fad819f1ca3eb9489dc00bcc14c'] = 'Email de votre ami(e)';
+$_LANG['order-confirmation_fa9ba9bbd94c6d42e3c3c6c2fadb01af'] = '> Parrainer plus d’ami(e)s';
+$_LANG['order-confirmation_8dffb37d6ae0ba95c6142387239beeac'] = 'Détails de votre commande';
+$_LANG['order-confirmation_694e8d1f2ee056f98ee488bdc4982d73'] = 'Quantité';
+$_LANG['order-confirmation_197101c4a1b1fc503dcd6ebee127aa10'] = 'Prix unitaire';
+$_LANG['order-confirmation_db205f01b4fd580fb5daa9072d96849d'] = 'Total produits';
+$_LANG['order-confirmation_b76c1a1463e45cece931ef4467c0bdf8'] = 'Total réductions';
+$_LANG['order-confirmation_ab2cf9a596bbcf17ccb9c98404576b58'] = 'Total livraison';
+$_LANG['order-confirmation_96b0141273eabab320119c467cdcaf17'] = 'Total';
+$_LANG['order-confirmation_380ce8cbd24372c0c4e1372269758ee4'] = 'Livraison';
+$_LANG['order-confirmation_2f2f0f119a907c6c67a3c6fcde0193ab'] = 'Adresse de livraison';
+$_LANG['order-confirmation_886dc40a9367328f942e6bf6c31f3ebb'] = 'Adresse de facturation';
+$_LANG['order-confirmation_73878c19cdc6ef2ab0d0fac6943cc958'] = 'Besoin d\'aide ?';
+$_LANG['order-confirmation_1385af17704d88a7d7f2b304fe519221'] = 'Comment suivre ma commande ?';
+$_LANG['order-confirmation_761fc370a2b7de4983e9569a92f4009f'] = 'Comment faire un retour ?';
+$_LANG['order-confirmation_964ea159bc8f6367f7a0a503c5869236'] = 'Notre service client à votre écoute';
+$_LANG['order-confirmation_d5552e0564007d93ff5937a9cb3bc491'] = 'Service client';
+$_LANG['order-confirmation_8dd27b9ed5800530a6ca9f6d158074ed'] = '05 67 80 15 60 9h - 12h et 14h - 18h, du lundi au vend.';
+$_LANG['order-confirmation_e19e31ddb54b493059808ec4f2dab4cb'] = 'Votre numéro de commande est le:';
+$_LANG['order-confirmation_c3b59dc92773203d09404d887676376f'] = 'Votre numéro de commande a été envoyé par mail.';
+$_LANG['order-confirmation_4082ea29b4f196c4f60533500139725a'] = 'Suivre ma commande';
+$_LANG['order-confirmation_9390390581f54c65d6acfc8da4e17362'] = 'Retour aux commandes';
 $_LANG['order-confirmation_e19e31ddb54b493059808ec4f2dab4cb'] = 'Votre numéro de commande est le:';
 $_LANG['order-confirmation_c3b59dc92773203d09404d887676376f'] = 'Votre numéro de commande a été envoyé par mail.';
 $_LANG['order-confirmation_4082ea29b4f196c4f60533500139725a'] = 'Suivre ma commande';
diff --git a/themes/site_mobile/modules/paypal/express_checkout_payment.tpl b/themes/site_mobile/modules/paypal/express_checkout_payment.tpl
new file mode 100644
index 00000000..0ac3f01d
--- /dev/null
+++ b/themes/site_mobile/modules/paypal/express_checkout_payment.tpl
@@ -0,0 +1,133 @@
+{*
+* 2007-2014 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+
+<div class="payment_module payment_paypal">
+	<div class="inner">
+		<div class="input_radio">
+			<div class="hidden">
+				<form id="paypal_payment_form" action="{$base_dir_ssl}modules/paypal/express_checkout/payment.php" data-ajax="false" title="{l s='Pay with PayPal' mod='paypal'}" method="post">
+					<input type="hidden" name="save_billing" id="save_billing_paypal" value="0"/>
+					<input type="hidden" name="express_checkout" value="{$PayPal_payment_type|escape:'htmlall':'UTF-8'}"/>
+					<input type="hidden" name="current_shop_url" value="{$PayPal_current_page|escape:'htmlall':'UTF-8'}" />
+					<input type="hidden" name="bn" value="{$PayPal_tracking_code|escape:'htmlall':'UTF-8'}" />
+					<input type="hidden" name="custom" value="{$custom|escape:'htmlall':'UTF-8'}" />
+				</form>
+			</div>
+			<input type="radio" value="" name="paiement-method">
+		</div>
+		<div class="img_payment">
+			{if isset($use_mobile) && $use_mobile}
+			<img src="{$base_dir_ssl}modules/paypal/img/logos/express_checkout_mobile/CO_{$PayPal_lang_code}_orange_295x43.png" />
+			{else}
+				{if isset($logos.LocalPayPalHorizontalSolutionPP) && $PayPal_payment_method == $PayPal_integral}
+					<img src="{$logos.LocalPayPalHorizontalSolutionPP}" alt="{$PayPal_content.payment_choice|escape:'htmlall':'UTF-8'}" height="48px" />
+				{else}
+					<img src="{$logos.LocalPayPalLogoMedium}" alt="{$PayPal_content.payment_choice|escape:'htmlall':'UTF-8'}" />
+				{/if}
+			{/if}
+		</div>
+		<div class="label">
+			<span class="title_payment">
+				{$PayPal_content.payment_choice}
+			</span>
+			<span class="save_info">
+				<input type="checkbox" id="save_info_paypal" data-change="save_billing_paypal">
+				<label for="save_info_paypal">{l s='Save my paypal account information for future payments' mod='paypal'} </label>
+				<span class="paiement_info_lightbox paypal_info">?</span>
+			</span>
+		</div>
+	</div>
+	
+	{if $accounts}
+		<div class="account_payment">
+			<p class="title">{l s='You have registered accounts, you can use them to pay' mod='paypal'}</p>
+			{foreach from=$accounts item=account}		
+				<div class="box_account">
+					<div class="hidden">
+						<form id="paypal_payment_form" action="{$base_dir_ssl}modules/paypal/express_checkout/payment.php" data-ajax="false" title="{l s='Pay with PayPal' mod='paypal'}" method="post">
+							<input type="hidden" name="id_billing" value="{$account.id_paypal_agreement}"/>
+							<input type="hidden" name="express_checkout" value="{$PayPal_payment_type|escape:'htmlall':'UTF-8'}"/>
+							<input type="hidden" name="current_shop_url" value="{$PayPal_current_page|escape:'htmlall':'UTF-8'}" />
+							<input type="hidden" name="bn" value="{$PayPal_tracking_code|escape:'htmlall':'UTF-8'}" />
+							<input type="hidden" name="custom" value="{$custom|escape:'htmlall':'UTF-8'}" />
+						</form>
+					</div>
+					<input data-module-name="paypal" type="radio" value="" name="paiement-method" id="paypal_{$account.id_paypal_agreement}">
+					<label for="paypal_{$account.id_paypal_agreement}">{$account.email} - {$account.name}</label>
+				</div>
+			{/foreach}
+		</div>
+	{/if}
+
+
+	<div class="overlay_bbb info_paypal"></div>
+	<div class="box_add_to_cart paiment_info_paypal">
+		<div class="content">
+			<h3>{l s='Mémorisation de vos données Paypal' mod='paypal'}</h3>
+			<div id="close_add_to_cart" class="close">
+				<img alt="{l s='Fermer la fenètre'}" src="{$img_dir}close.jpg">
+			</div>
+			<div class="content_box">
+				<p>
+					{l s='Lors du passage d\'une commande, vous pouvez choisir de mémoriser vos coordonnées Paypal. Ces dernières seront alors enregistrées sur les serveurs sécurisés de Paypal. Votre compte enregistré vous sera proposé pour vos prochaines commandes sans que vous n\'ayez besoin de saisir de nouveau vos données.' mod='paypal'}
+				</p>
+				<p>
+					{l s='Quelle que soit l\'option choisie, seul Paypal a accès à vos informations, et en aucun cas Bébé Boutik.' mod='paypal'}
+				</p>
+				<p>
+					{l s='Vous pouvez à tout moment voir et supprimer vos comptes Paypal enregistrés sur la page « Gérer mes moyens de paiement » dans le menu « Mon compte ».' mod='paypal'}
+				</p>
+			</div>
+		</div>
+	</div>
+	
+</div>
+
+
+{literal}
+<script>
+	$(document).ready(function() {
+		if ($('#save_info_paypal').is(':checked')) {
+			$('#save_billing_paypal').val('1');
+		} else {
+			$('#save_billing_paypal').val('0');
+		}
+
+		$('.paypal_info').live('click', function(){
+			$('.info_paypal').fadeIn();
+			$('.paiment_info_paypal').fadeIn();
+		});
+
+		$('#save_info_paypal').change(function(){
+			if ($(this).is(':checked')) {
+				$('#save_billing_paypal').val('1');
+			} else {
+				$('#save_billing_paypal').val('0');
+			}
+		});
+	});
+</script>
+{/literal}
\ No newline at end of file
diff --git a/themes/site_mobile/modules/paypal/fr.php b/themes/site_mobile/modules/paypal/fr.php
index 74a256e3..0be50096 100755
--- a/themes/site_mobile/modules/paypal/fr.php
+++ b/themes/site_mobile/modules/paypal/fr.php
@@ -39,3 +39,5 @@ $_MODULE['<{paypal}site_mobile>payment_dac2693baa5c5c9a5318609ed81c4f2a'] = 'Pay
 $_MODULE['<{paypal}site_mobile>payment_a3f2caee6ef8e68fbd26e42d83f2bf65'] = 'Payez avec votre compte PayPal, carte de crédit (CB, Visa, Mastercard ...)';
 $_MODULE['<{paypal}site_mobile>payment_b08008a2de4331ba13f006c9bcf37b62'] = 'Payez avec PayPal';
 $_MODULE['<{paypal}site_mobile>paypal_dac2693baa5c5c9a5318609ed81c4f2a'] = 'Payer par PayPal';
+$_MODULE['<{paypal}site_mobile>express_checkout_payment_9166266e8de0b0f8ac4e87c8f35c8bfa'] = 'Sauvegarder mon compte pour un futur achat';
+$_MODULE['<{paypal}site_mobile>express_checkout_payment_e19e2f09002009081b41655e7c143bd5'] = 'Vous avez des comptes enregistrés, vous pouvez les utiliser pour payer';
\ No newline at end of file
diff --git a/themes/site_mobile/order-confirmation.tpl b/themes/site_mobile/order-confirmation.tpl
index 01cc57e4..fe76eb0d 100755
--- a/themes/site_mobile/order-confirmation.tpl
+++ b/themes/site_mobile/order-confirmation.tpl
@@ -29,10 +29,46 @@
 
 {assign var='current_step' value='payment'}
 {include file="$tpl_dir./order-steps.tpl"}
-<h1>{l s='Order confirmation'}</h1>
+<h1 class="title"><span>{l s='Order confirmation'}</span></h1>
 
 {include file="$tpl_dir./errors.tpl"}
 
+
+{if $order->valid}
+	<div id="order_conf_detail">
+		<div class="order_conf_left">
+			<p><strong>{l s='Hello'} {$customer->firstname},</strong></p>
+			<p>{l s='You just order on Bébé boutik and we thank you in'}</p>
+			<p>{l s='The tracking number will be emailed upon shipment of the package'}</p>
+			<p>{l s='You can download your invoice in your account, on'} <a href="{$link->getPageLink('history.php', true)}">"{l s='Order History'}"</a></p>
+		</div>
+
+		<div class="clear"></div>
+
+		<h3>{l s='Details of your order'}</h3>
+		<div id="order-detail-content" class="table_block">
+			{foreach from=$products item=details}
+				<h4 class="delay_cart">{$details.title}</h4>
+				{foreach $details.products as $product}
+					<div class="order_confirmation_detail">
+						<!-- <img src="{$link->getImageLink('product', $product.id_image, 'small')}"> -->
+						<p>{$product.product_name}</p>
+						<p>{l s='Quantity'} {$product.product_quantity}</p>						
+						{assign var='total' value=$product.product_price_wt * $product.product_quantity}						
+						<p>{displayPrice price=$total}</p>
+					</div>
+				{/foreach}
+			{/foreach}
+
+			<div class="order_confirmation_total">
+				<p><b>{l s='Total products'}</b> : {displayPrice price=$order->total_products_wt}</p>
+				<p><b>{l s='Total delivery'}</b> : {displayPrice price=$order->total_shipping}</p>
+				<p><b>{l s='Total '}</b> : {displayPrice price=$order->total_paid_real}</p>
+			</div>
+		</div>
+	</div>
+{/if}
+
 {$HOOK_ORDER_CONFIRMATION}
 {$HOOK_PAYMENT_RETURN}
 
diff --git a/themes/site_mobile/order-payment.tpl b/themes/site_mobile/order-payment.tpl
index 1ac65cb3..1aff9b2e 100755
--- a/themes/site_mobile/order-payment.tpl
+++ b/themes/site_mobile/order-payment.tpl
@@ -64,8 +64,49 @@
 {/if}
 
 {if !$opc}
-	{*<p class="cart_navigation"><a href="{$link->getPageLink('order.php', true)}?step=2" title="{l s='Previous'}" class="button"><img src="{$img_dir}reverse-arrow-submit.png" alt="{l s='Previous'}" /><span>{l s='Previous'}</span></a></p>*}
+	<p class="cart_navigation">
+		<a href="{$link->getPageLink('order.php', true)}?step=2" title="{l s='Previous'}" class="button">{l s='Previous'}</a>
+		<a class="exclusive submitPayment" title="{l s='Valider ma commande'}" class="button">{l s='Valider ma commande'}</a>
+	</p>
 {else}
 	</div>
 {/if}
 
+
+
+
+<script>	
+	var paiementErrorMessage = "{l s='You have to choose a paiement method' js=1}";
+</script>
+{literal}
+<script>
+	$(document).ready(function() {
+		$('.payment_module .inner').live('click', function(e) {			
+			$(this).children('.input_radio').children('input[name="paiement-method"]').attr('checked', true);
+		});
+		
+		$('.submitPayment').live('click', function(e) {
+			e.preventDefault();
+			// check if selected
+			$input = $('input[name="paiement-method"]:checked');
+			if(!$input.length) {
+				alert(paiementErrorMessage);
+			}
+
+			if ($input.val()) {
+				window.location = $input.val();
+			} else {
+				// LOADER POUR PAYPAL
+				if ($input.attr('data-module-name') == "paypal") {
+					$('.overlay_bbb').fadeIn();
+					$('.box_paypal').fadeIn();
+				}
+				$form = $input.parent().children('div.hidden').children('form');				
+				$form.submit();
+			}
+
+		});
+
+	});
+</script>
+{/literal}
\ No newline at end of file