From f15662e826b7539bd753a04e22259c06280f8ccf Mon Sep 17 00:00:00 2001 From: Thibault UBUNTU Date: Mon, 2 May 2016 15:30:12 +0200 Subject: [PATCH] paypal suite --- modules/fraud/fraud.php | 47 +++++++++++++++- modules/paymentinfo/index.php | 10 ++++ modules/paymentinfo/manage.php | 54 +++++++++++++++++++ modules/paymentinfo/paymentinfo.php | 28 ++++++++++ modules/paymentinfo/paymentinfo.tpl | 32 +++++++++++ modules/paypal/express_checkout/payment.php | 4 +- modules/paypal/paypal.php | 7 +++ override/classes/FrontController.php | 1 + themes/site/lang/fr.php | 6 +-- themes/site/modules/paymentinfo/fr.php | 16 ++++++ .../site/modules/paymentinfo/paymentinfo.tpl | 40 ++++++++++++++ themes/site/modules/paypal/fr.php | 4 +- themes/site/my-account.tpl | 2 + themes/site_mobile/css/style.css | 12 +++-- themes/site_mobile/lang/fr.php | 25 +-------- themes/site_mobile/modules/blockcms/fr.php | 1 - .../blockprivatesalescategories/fr.php | 0 themes/site_mobile/modules/paymentinfo/fr.php | 11 ++++ .../modules/paymentinfo/paymentinfo.tpl | 36 +++++++++++++ themes/site_mobile/modules/paypal/fr.php | 4 +- .../site_mobile/modules/privatesales/fr.php | 1 - themes/site_mobile/my-account.tpl | 1 + 22 files changed, 301 insertions(+), 41 deletions(-) create mode 100644 modules/paymentinfo/index.php create mode 100644 modules/paymentinfo/manage.php create mode 100644 modules/paymentinfo/paymentinfo.php create mode 100644 modules/paymentinfo/paymentinfo.tpl create mode 100644 themes/site/modules/paymentinfo/fr.php create mode 100644 themes/site/modules/paymentinfo/paymentinfo.tpl create mode 100644 themes/site_mobile/modules/blockprivatesalescategories/fr.php create mode 100644 themes/site_mobile/modules/paymentinfo/fr.php create mode 100644 themes/site_mobile/modules/paymentinfo/paymentinfo.tpl diff --git a/modules/fraud/fraud.php b/modules/fraud/fraud.php index f3552955..156242fb 100755 --- a/modules/fraud/fraud.php +++ b/modules/fraud/fraud.php @@ -98,6 +98,51 @@ class Fraud extends Module { } + /* This method is called when a customer use account's paypal on a different address from previously */ + public function testPaypalBilling($id_order) + { + $order = new Order($id_order); + $id_billing = Db::getInstance()->getValue(' + SELECT `is_billing` + FROM `'._DB_PREFIX_.'paypal_order` + WHERE `id_order` = '.(int) $order->id + ); + + if ($id_billing !=0) { + $address = new Address($order->id_address_delivery); + $address_paypal = Db::getInstance()->getRow(' + SELECT `city`, `address` + FROM `'._DB_PREFIX_.'paypal_customer_agreement` + WHERE id_paypal_agreement = '.(int) $id_billing.' + '); + + $new_address = false; + if ($address->city != $address_paypal['city']) { + $new_address = true; + } else if ($address->address1 != $address_paypal['address']) { + $new_address = true; + } + + if ($new_address) { + $total_score = 110; + $fraud_report = array(); + $fraud_report[] = 'Compte paypal enregistré utilisé sur une nouvelle adresse (+110)'; + + Db::getInstance()->ExecuteS(' + INSERT INTO `'._DB_PREFIX_.'order_reputation` + VALUES ( + '.(int) $order->id_cart.', + '.(int) $total_score.', + '.((int) $total_score < 100? 1: 0).', + "'.pSQL(json_encode($fraud_report)).'" + ) + '); + $this->_changeStatutFraud($order->id); + } + } + } + + public function hookafterChangeStatus($params) { if($params['newOrderState'] == 2) { $order = new Order($params['order']['id']); @@ -122,7 +167,7 @@ class Fraud extends Module { $fraud_score = $fraud_detection->getFraudScore(); $fraud_report = $fraud_detection->getFraudReport(); - $current_reputation = 0; + $current_reputation = 0; $i = 0; $query = Db::getInstance()->ExecuteS(' SELECT * diff --git a/modules/paymentinfo/index.php b/modules/paymentinfo/index.php new file mode 100644 index 00000000..d2780cd3 --- /dev/null +++ b/modules/paymentinfo/index.php @@ -0,0 +1,10 @@ +preProcess(); + +if (!$cookie->isLogged()) + Tools::redirect('authentication.php?back=modules/paymentinfo/manage.php'); + +include(dirname(__FILE__).'/../../header.php'); + + +// DELTE ACCOUNT PAYPAL +if (Tools::getValue('delete_agreement')) { + $id_paypal_agreement = Tools::getValue('delete_agreement'); + + $id_customer_test = Db::getInstance()->getValue(' + SELECT `id_customer` + FROM `'._DB_PREFIX_.'paypal_customer_agreement` + WHERE `id_paypal_agreement`= '.(int) $id_paypal_agreement.' + '); + if(empty($id_customer_test)) { + return false; + } + if($id_customer_test != $cookie->id_customer) { + return false; + } + // DELETE + Db::getInstance()->execute(' + DELETE FROM `'._DB_PREFIX_.'paypal_customer_agreement` + WHERE `id_paypal_agreement`= '.(int) $id_paypal_agreement + ); + $smarty->assign(array( + 'delete' => true, + )); +} +// account paypal +$paypal_accounts = Db::getInstance()->executes(' + SELECT `id_paypal_agreement`, `email`, `name`, `city`, `date_add` + FROM `'._DB_PREFIX_.'paypal_customer_agreement` + WHERE `id_customer`= '.(int) $cookie->id_customer.' +'); + +$smarty->assign(array( + 'paypal_accounts' => $paypal_accounts, +)); + + +// @TODO account cb + + +echo Module::display(dirname(__FILE__).'/paymentinfo.php', 'paymentinfo.tpl'); + +include(dirname(__FILE__).'/../../footer.php'); diff --git a/modules/paymentinfo/paymentinfo.php b/modules/paymentinfo/paymentinfo.php new file mode 100644 index 00000000..1952b8f4 --- /dev/null +++ b/modules/paymentinfo/paymentinfo.php @@ -0,0 +1,28 @@ +name = 'paymentinfo'; + $this->tab = 'advertising_marketing'; + $this->version = '1.0'; + $this->author = 'Antadis'; + $this->need_instance = 0; + + parent::__construct(); + + $this->displayName = $this->l('Manage payments info'); + $this->description = $this->l('Manage payments info'); + + $this->confirmUninstall = $this->l('Are you sure ?'); + $this->_errors = array(); + } + + public function install() { + return TRUE; + } + +} diff --git a/modules/paymentinfo/paymentinfo.tpl b/modules/paymentinfo/paymentinfo.tpl new file mode 100644 index 00000000..6c1413c8 --- /dev/null +++ b/modules/paymentinfo/paymentinfo.tpl @@ -0,0 +1,32 @@ +

{l s='Manage payment info' mod='paymentinfo'}

+ + +

{l s='My paypal account' mod='paymentinfo'}

+ + +{if $paypal_accounts} + + + + + + + + + + {foreach from=$paypal_accounts item=paypal} + + + + + + + + {/foreach} + +
{l s='Name' mod='paymentinfo'}{l s='Email' mod='paymentinfo'}{l s='City' mod='paymentinfo'}{l s='Date add' mod='paymentinfo'}{l s='Action' mod='paymentinfo'}
{$paypal.name}{$paypal.email}{$paypal.city}{$paypal.date_add}{l s='Delete' mod='paymentinfo'}
+{else} +
+

{l s='No account register' mod='paymentinfo'}

+
+{/if} \ No newline at end of file diff --git a/modules/paypal/express_checkout/payment.php b/modules/paypal/express_checkout/payment.php index 81ffd548..c87a6fc8 100755 --- a/modules/paypal/express_checkout/payment.php +++ b/modules/paypal/express_checkout/payment.php @@ -187,8 +187,8 @@ if ($request_type && $ppec->type) { $order_total = (float)$cart->getOrderTotal(true, Cart::BOTH); $ppec->validateOrder((int)$cart->id, $payment_type, $order_total, $ppec->displayName, $message, $transaction, - (int)$cart->id_currency, false, $customer->secure_key, $ppec->context->shop, 1); - + (int)$cart->id_currency, false, $customer->secure_key, $ppec->context->shop, $id_billing_to_use); + $order = new Order($ppec->currentOrder); $module_tmp = new Paypal(); $redirect_after_payment = $ppec->context->link->getPageLink('order-confirmation.php').'?id_cart='.$cart->id.'&key='.$order->secure_key.'&id_module='.$module_tmp->id; diff --git a/modules/paypal/paypal.php b/modules/paypal/paypal.php index bb9ae1f9..b4bbe42b 100755 --- a/modules/paypal/paypal.php +++ b/modules/paypal/paypal.php @@ -1398,6 +1398,13 @@ class PayPal extends PaymentModule if (count($transaction) > 0) PayPalOrder::saveOrder((int)$this->currentOrder, $transaction, $is_billing); + + if (!class_exists('Fraud')) { + include_once _MODULE_DIR_.'fraud/fraud.php'; + } + $fraud = new Fraud(); + $fraud->testPaypalBilling($this->currentOrder); + $this->setPayPalAsConfigured(); } } diff --git a/override/classes/FrontController.php b/override/classes/FrontController.php index fc44d635..ad69b939 100755 --- a/override/classes/FrontController.php +++ b/override/classes/FrontController.php @@ -379,6 +379,7 @@ class FrontController extends FrontControllerCore { 'module-ant_support-help', 'module-ant_support_form-support', 'module-paypal-express_checkout-payment', + 'module-paymentinfo-manage', ); $displayRight = array( diff --git a/themes/site/lang/fr.php b/themes/site/lang/fr.php index 3fe8a29a..8ed379ee 100755 --- a/themes/site/lang/fr.php +++ b/themes/site/lang/fr.php @@ -181,11 +181,6 @@ $_LANG['guest-tracking_83fa39a28a4d159061c408fbd6a249e7'] = 'Numéro de commande $_LANG['guest-tracking_d51b1df43394fe14cd03d5bcb3a7216b'] = 'Par exemple : 010123'; $_LANG['guest-tracking_df1555fe48479f594280a2e03f9a8186'] = 'E-mail :'; $_LANG['guest-tracking_f0d1e86ef00ea0cae0b5a1d3adc8b0c1'] = 'Voir ma commande'; -$_LANG['header_f84307b0992c0265739d1c0e8664d936'] = 'Attention, vous utilisez un navigateur obsolète.'; -$_LANG['header_33a4f507246880812b27da60dcc02fe9'] = 'En plus d\'être une source de failles de sécurité, le site risque de ne pas s\'afficher correctement. Nous vous recommandons de mettre à jour votre navigateur vers'; -$_LANG['header_9cab670affb642428047286fe184970d'] = 'Vous pouvez également utiliser un navigateur alternatif tel que'; -$_LANG['header_e81c4e4f2b7b93b481e13a8553c2ae1b'] = 'ou'; -$_LANG['header_0e5302e5300d66db1a9ae62645f20470'] = 'Ces logiciels sont gratuits. Si vous n\'avez pas les droits requis sur votre ordinateur pour faire ces changements, prenez contact avec votre administrateur système.'; $_LANG['header_0fcd4065ff78fceb3083316ddb958bc1'] = 'Vous ne pouvez pas créer de nouvelle commande depuis votre pays :'; $_LANG['history_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'Mon compte'; $_LANG['history_782c8b38bce4f2f6975ca7f33ac8189b'] = 'Historique de vos commandes'; @@ -277,6 +272,7 @@ $_LANG['my-account_a82be0f551b8708bc08eb33cd9ded0cf'] = 'Informations'; $_LANG['my-account_4c8a50af0ebcf49be0cf4e0f67f37595'] = 'Mes informations personnelles'; $_LANG['my-account_a82868319826fb092b73968e661b5b38'] = 'Bons de réduction'; $_LANG['my-account_95d2137c196c7f84df5753ed78f18332'] = 'Mes bons de réduction'; +$_LANG['my-account_543e659147f37d7a3dce4bf8ffc4cc74'] = 'Gérer mes moyens de paiement'; $_LANG['my-account_8cf04a9734132302f96da8e113e80ce5'] = 'Accueil'; $_LANG['new-products_9ff0635f5737513b1a6f559ac2bff745'] = 'Nouveaux produits'; $_LANG['new-products_d58424783355b6da2dedc302f2bf4065'] = 'Pas de nouveaux produits'; diff --git a/themes/site/modules/paymentinfo/fr.php b/themes/site/modules/paymentinfo/fr.php new file mode 100644 index 00000000..2917ad32 --- /dev/null +++ b/themes/site/modules/paymentinfo/fr.php @@ -0,0 +1,16 @@ +paymentinfo_bea8d9e6a0d57c4a264756b4f9822ed9'] = 'Mon compte'; +$_MODULE['<{paymentinfo}site>paymentinfo_a01492dafb4b0f7a2266228095bcaf2c'] = 'Gérer mes moyens de paiement'; +$_MODULE['<{paymentinfo}site>paymentinfo_8de5b7d46e51b994328c75c8ee9c7759'] = 'Suppression réussie'; +$_MODULE['<{paymentinfo}site>paymentinfo_4aa701fb7e287f19cb129f57bffb834b'] = 'Mes comptes paypal'; +$_MODULE['<{paymentinfo}site>paymentinfo_49ee3087348e8d44e1feda1917443987'] = 'Nom'; +$_MODULE['<{paymentinfo}site>paymentinfo_ce8ae9da5b7cd6c3df2929543a9af92d'] = 'Email'; +$_MODULE['<{paymentinfo}site>paymentinfo_57d056ed0984166336b7879c2af3657f'] = 'Ville'; +$_MODULE['<{paymentinfo}site>paymentinfo_7b6e7f81d1c260b7068ca82b91eb90a7'] = 'Date d\'ajout'; +$_MODULE['<{paymentinfo}site>paymentinfo_004bf6c9a40003140292e97330236c53'] = 'Action'; +$_MODULE['<{paymentinfo}site>paymentinfo_729a51874fe901b092899e9e8b31c97a'] = 'Êtes-vous sur ?'; +$_MODULE['<{paymentinfo}site>paymentinfo_f2a6c498fb90ee345d997f888fce3b18'] = 'Supprimer'; +$_MODULE['<{paymentinfo}site>paymentinfo_fe8aa01ce44668df439a8db46d95dd2d'] = 'Aucun compte enregistré'; diff --git a/themes/site/modules/paymentinfo/paymentinfo.tpl b/themes/site/modules/paymentinfo/paymentinfo.tpl new file mode 100644 index 00000000..47c04b75 --- /dev/null +++ b/themes/site/modules/paymentinfo/paymentinfo.tpl @@ -0,0 +1,40 @@ +{capture name=path}{l s='My Account' mod='paymentinfo'}{$navigationPipe}{l s='Manage payment info' mod='paymentinfo'}{/capture} +{include file="$tpl_dir./breadcrumb.tpl"} + +

{l s='Manage payment info' mod='paymentinfo'}

+ +{if isset($delete) && $delete} +
+

{l s='Delete success' mod='paymentinfo'}

+
+
+{/if} + +

{l s='My paypal account' mod='paymentinfo'}

+ +{if $paypal_accounts} + + + + + + + + + + {foreach from=$paypal_accounts item=paypal} + + + + + + + + {/foreach} + +
{l s='Name' mod='paymentinfo'}{l s='Email' mod='paymentinfo'}{l s='City' mod='paymentinfo'}{l s='Date add' mod='paymentinfo'}{l s='Action' mod='paymentinfo'}
{$paypal.name}{$paypal.email}{$paypal.city}{$paypal.date_add|date_format:'d/m/Y'}{l s='Delete' mod='paymentinfo'}
+{else} +
+

{l s='No account register' mod='paymentinfo'}

+
+{/if} \ No newline at end of file diff --git a/themes/site/modules/paypal/fr.php b/themes/site/modules/paypal/fr.php index c824ceb5..348df3e2 100755 --- a/themes/site/modules/paypal/fr.php +++ b/themes/site/modules/paypal/fr.php @@ -36,9 +36,9 @@ $_MODULE['<{paypal}site>error_a40cab5994f36d4c48103a22ca082e8f'] = 'Votre panier $_MODULE['<{paypal}site>error_ad69e733ebae8d264bccaa38d68830e8'] = 'PayPal'; $_MODULE['<{paypal}site>error_425551a2289ed60c9260933d1c45ef00'] = 'Merci de vous reférer aux logs :'; $_MODULE['<{paypal}site>error_0557fa923dcee4d0f86b1409f5c2167f'] = 'Précédent'; +$_MODULE['<{paypal}site>express_checkout_payment_9166266e8de0b0f8ac4e87c8f35c8bfa'] = 'Sauvegarder mon compte pour un futur achat'; +$_MODULE['<{paypal}site>express_checkout_payment_e19e2f09002009081b41655e7c143bd5'] = 'Vous avez des comptes enregistrés, vous pouvez les utiliser pour payer'; $_MODULE['<{paypal}site>payment_dac2693baa5c5c9a5318609ed81c4f2a'] = 'Payez avec votre compte PayPal'; $_MODULE['<{paypal}site>payment_a3f2caee6ef8e68fbd26e42d83f2bf65'] = 'Payez avec votre compte PayPal, carte de crédit (CB, Visa, Mastercard ...)'; $_MODULE['<{paypal}site>payment_b08008a2de4331ba13f006c9bcf37b62'] = 'Payez avec votre compte PayPal'; $_MODULE['<{paypal}site>paypal_dac2693baa5c5c9a5318609ed81c4f2a'] = 'Payez avec votre compte PayPal'; -$_MODULE['<{paypal}site>express_checkout_payment_9166266e8de0b0f8ac4e87c8f35c8bfa'] = 'Sauvegarder mon compte pour un futur achat'; -$_MODULE['<{paypal}site>express_checkout_payment_e19e2f09002009081b41655e7c143bd5'] = 'Vous avez des comptes enregistrés, vous pouvez les utiliser pour payer'; diff --git a/themes/site/my-account.tpl b/themes/site/my-account.tpl index e94b2e3c..34f3fc92 100755 --- a/themes/site/my-account.tpl +++ b/themes/site/my-account.tpl @@ -40,6 +40,8 @@ {if $voucherAllowed}
  • {l s='My vouchers'}
    • {/if} + +
  • {l s='Manage Payments infos'}
    • {$HOOK_CUSTOMER_ACCOUNT} {*

    {l s='Home'}

    *} diff --git a/themes/site_mobile/css/style.css b/themes/site_mobile/css/style.css index d7225a0a..994122b1 100755 --- a/themes/site_mobile/css/style.css +++ b/themes/site_mobile/css/style.css @@ -2911,7 +2911,6 @@ body#order #HOOK_PAYMENT .box_add_to_cart .content_box p{ font-family: tahoma; color: #6d777d; text-align: left; - text-transform: uppercase; font-size: 12px; margin-bottom: 15px; padding-bottom: 0; @@ -4459,6 +4458,13 @@ body#index .jqibuttons span.gradient{ font-size: 13px; background: #504d8b; } +#cookiescontent { padding: 10px; font-size: 12px; } - -#cookiescontent { padding: 10px; font-size: 12px; } \ No newline at end of file +h4.subtitle { + color: #e36ea2; + margin-bottom: 10px; + font-weight: normal; +} +.table_skin {} +.table_skin td { font-size: 12px; } +.table_skin a { color: #666666 } \ No newline at end of file diff --git a/themes/site_mobile/lang/fr.php b/themes/site_mobile/lang/fr.php index e1ebf3bf..eb22dc74 100755 --- a/themes/site_mobile/lang/fr.php +++ b/themes/site_mobile/lang/fr.php @@ -255,6 +255,7 @@ $_LANG['my-account_a82be0f551b8708bc08eb33cd9ded0cf'] = 'Informations'; $_LANG['my-account_4c8a50af0ebcf49be0cf4e0f67f37595'] = 'Mes informations personnelles'; $_LANG['my-account_a82868319826fb092b73968e661b5b38'] = 'Bons de réduction'; $_LANG['my-account_95d2137c196c7f84df5753ed78f18332'] = 'Mes bons de réductions'; +$_LANG['my-account_543e659147f37d7a3dce4bf8ffc4cc74'] = 'Gérer mes moyens de paiement'; $_LANG['my-account_4b877ba8588b19f1b278510bf2b57ebb'] = 'Déconnexion'; $_LANG['my-account_8cf04a9734132302f96da8e113e80ce5'] = 'Accueil'; $_LANG['new-products_9ff0635f5737513b1a6f559ac2bff745'] = 'Nouveaux produits'; @@ -305,29 +306,10 @@ $_LANG['order-confirmation_58d27df1d25a432c074a0dd39485298c'] = 'Vous venez de c $_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'; @@ -340,11 +322,6 @@ $_LANG['order-detail_44749712dbec183e983dcd78a7736c41'] = 'Date'; $_LANG['order-detail_ec53a8c4f07baed5d8825072c89799be'] = 'Statut'; $_LANG['order-detail_01abfc750a0c942167651c40d088531d'] = 'n°'; $_LANG['order-detail_466eadd40b3c10580e3ab4e8061161ce'] = 'Facture'; -$_LANG['order-detail_18b93acb5387c525d664081d654c0d33'] = 'Historique des envois'; -$_LANG['order-detail_914419aa32f04011357d3b604a86d7eb'] = 'Transporteur'; -$_LANG['order-detail_910d956cb2615e5739ac06c7f08fba26'] = 'Numéro de suivi'; -$_LANG['order-detail_ac5dbcf2a792f6c6408aaaf29d7fd0a8'] = 'Lien de suivi'; -$_LANG['order-detail_d2001ff0bad0662ccc25ffacdc66da96'] = 'Cliquez ici pour suivre la livraison de votre colis'; $_LANG['order-detail_2ca3deb5cd68fa9119b285804fab572f'] = 'Commande :'; $_LANG['order-detail_f8617a92ba0a0a4eabee724eab7c9f48'] = 'Transporteur :'; $_LANG['order-detail_c1f6368d15f7c13c4e5e8f70c68c747f'] = 'Méthode de paiement :'; diff --git a/themes/site_mobile/modules/blockcms/fr.php b/themes/site_mobile/modules/blockcms/fr.php index 7986e6af..5da56126 100755 --- a/themes/site_mobile/modules/blockcms/fr.php +++ b/themes/site_mobile/modules/blockcms/fr.php @@ -2,7 +2,6 @@ global $_MODULE; $_MODULE = array(); -$_MODULE['<{blockcms}site_mobile>blockcms_34c869c542dee932ef8cd96d2f91cae6'] = 'Nos magasins'; $_MODULE['<{blockcms}site_mobile>blockcms_d1aa22a3126f04664e0fe3f598994014'] = 'Promotions'; $_MODULE['<{blockcms}site_mobile>blockcms_9ff0635f5737513b1a6f559ac2bff745'] = 'Nouveaux produits'; $_MODULE['<{blockcms}site_mobile>blockcms_3cb29f0ccc5fd220a97df89dafe46290'] = 'Meilleures ventes'; diff --git a/themes/site_mobile/modules/blockprivatesalescategories/fr.php b/themes/site_mobile/modules/blockprivatesalescategories/fr.php new file mode 100644 index 00000000..e69de29b diff --git a/themes/site_mobile/modules/paymentinfo/fr.php b/themes/site_mobile/modules/paymentinfo/fr.php new file mode 100644 index 00000000..5d389f86 --- /dev/null +++ b/themes/site_mobile/modules/paymentinfo/fr.php @@ -0,0 +1,11 @@ +paymentinfo_bea8d9e6a0d57c4a264756b4f9822ed9'] = 'Mon compte'; +$_MODULE['<{paymentinfo}site_mobile>paymentinfo_a01492dafb4b0f7a2266228095bcaf2c'] = 'Gérer mes moyens de paiement'; +$_MODULE['<{paymentinfo}site_mobile>paymentinfo_8de5b7d46e51b994328c75c8ee9c7759'] = 'Suppression réussie'; +$_MODULE['<{paymentinfo}site_mobile>paymentinfo_4aa701fb7e287f19cb129f57bffb834b'] = 'Mes comptes paypal'; +$_MODULE['<{paymentinfo}site_mobile>paymentinfo_729a51874fe901b092899e9e8b31c97a'] = 'Êtes-vous sur ?'; +$_MODULE['<{paymentinfo}site_mobile>paymentinfo_f2a6c498fb90ee345d997f888fce3b18'] = 'Supprimer'; +$_MODULE['<{paymentinfo}site_mobile>paymentinfo_fe8aa01ce44668df439a8db46d95dd2d'] = 'Aucun compte enregistré'; diff --git a/themes/site_mobile/modules/paymentinfo/paymentinfo.tpl b/themes/site_mobile/modules/paymentinfo/paymentinfo.tpl new file mode 100644 index 00000000..00dac6ec --- /dev/null +++ b/themes/site_mobile/modules/paymentinfo/paymentinfo.tpl @@ -0,0 +1,36 @@ +{capture name=path}{l s='My Account' mod='paymentinfo'}{$navigationPipe}{l s='Manage payment info' mod='paymentinfo'}{/capture} +{include file="$tpl_dir./breadcrumb.tpl"} + +

    {l s='Manage payment info' mod='paymentinfo'}

    + +{if isset($delete) && $delete} +
    +

    {l s='Delete success' mod='paymentinfo'}

    +
    +
    +{/if} + +

    {l s='My paypal account' mod='paymentinfo'}

    + +{if $paypal_accounts} + + + {foreach from=$paypal_accounts item=paypal} + + + + + {/foreach} + +
    + {$paypal.name} +
    + {$paypal.email} +
    + {$paypal.city} +     		{l s='Delete' mod='paymentinfo'}
    +{else} +
    +

    {l s='No account register' mod='paymentinfo'}

    +
    +{/if} \ 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 0be50096..ca54717e 100755 --- a/themes/site_mobile/modules/paypal/fr.php +++ b/themes/site_mobile/modules/paypal/fr.php @@ -35,9 +35,9 @@ $_MODULE['<{paypal}site_mobile>error_a40cab5994f36d4c48103a22ca082e8f'] = 'Votre $_MODULE['<{paypal}site_mobile>error_ad69e733ebae8d264bccaa38d68830e8'] = 'PayPal'; $_MODULE['<{paypal}site_mobile>error_425551a2289ed60c9260933d1c45ef00'] = 'Merci de vous reférer aux logs :'; $_MODULE['<{paypal}site_mobile>error_0557fa923dcee4d0f86b1409f5c2167f'] = 'Précédent'; +$_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'; $_MODULE['<{paypal}site_mobile>payment_dac2693baa5c5c9a5318609ed81c4f2a'] = 'Payer par PayPal'; $_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/modules/privatesales/fr.php b/themes/site_mobile/modules/privatesales/fr.php index 64c55b4f..ccf5df9b 100755 --- a/themes/site_mobile/modules/privatesales/fr.php +++ b/themes/site_mobile/modules/privatesales/fr.php @@ -41,7 +41,6 @@ $_MODULE['<{privatesales}site_mobile>trailer_a2f2b3a89c2d8b47c5583a3966cf4096'] $_MODULE['<{privatesales}site_mobile>trailer_71524f0c109f06bf5b2ef553d3407679'] = 'Votre inscription est terminée, vous serez averti(e) avant le commencement de la vente'; $_MODULE['<{privatesales}site_mobile>trailer_c9bca243cf727d056ebb543590479857'] = 'Vous êtes déjà inscrit(e) à cette vente'; $_MODULE['<{privatesales}site_mobile>trailer_62d73d7c9e4c31f41288f4553b994fb1'] = 'Votre inscription à cette vente a été supprimée'; -$_MODULE['<{privatesales}site_mobile>trailer_fcccf6b730f76e0342442e5c34bb90f6'] = 'Accéder à la vente'; $_MODULE['<{privatesales}site_mobile>trailer_268c7c7527fcf836fc2beecb817b4e55'] = 'Cette vente n\'a pas encore démarré.'; $_MODULE['<{privatesales}site_mobile>trailer_0447791604a8de509ebda3f86e5ad5c5'] = 'Cliquez ici pour voir d\'autres ventes'; $_MODULE['<{privatesales}site_mobile>trailer_faa2106f4b96e2d95ca70fe4f5eec420'] = 'Connectez-vous ou créez un compte pour voir d\'autres ventes'; diff --git a/themes/site_mobile/my-account.tpl b/themes/site_mobile/my-account.tpl index 85269536..98c24871 100755 --- a/themes/site_mobile/my-account.tpl +++ b/themes/site_mobile/my-account.tpl @@ -40,6 +40,7 @@ {if $voucherAllowed}
  • {l s='My vouchers'}
    • {/if} +
  • {l s='Manage Payments infos'}
    • {$HOOK_CUSTOMER_ACCOUNT}