From 9bf8ef0dc970750189b1032bf342a8fceba847f5 Mon Sep 17 00:00:00 2001 From: Michael RICOIS Date: Tue, 26 Sep 2017 10:54:30 +0200 Subject: [PATCH] Update module Amzpayments --- modules/amzpayments/amzpayments.php | 2 +- .../mails/de/amazon_hard_decline.html | 15 ++++++++ .../mails/de/amazon_hard_decline.txt | 5 +++ .../mails/de/amazon_soft_decline.html | 20 +++++++++++ .../mails/de/amazon_soft_decline.txt | 8 +++++ modules/amzpayments/mails/de/index.php | 35 +++++++++++++++++++ .../mails/es/amazon_hard_decline.html | 15 ++++++++ .../mails/es/amazon_hard_decline.txt | 5 +++ .../mails/es/amazon_soft_decline.html | 19 ++++++++++ .../mails/es/amazon_soft_decline.txt | 7 ++++ modules/amzpayments/mails/es/index.php | 35 +++++++++++++++++++ .../mails/fr/amazon_hard_decline.html | 15 ++++++++ .../mails/fr/amazon_hard_decline.txt | 5 +++ .../mails/fr/amazon_soft_decline.html | 18 ++++++++++ .../mails/fr/amazon_soft_decline.txt | 7 ++++ modules/amzpayments/mails/fr/index.php | 35 +++++++++++++++++++ modules/amzpayments/mails/index.php | 35 +++++++++++++++++++ .../mails/it/amazon_hard_decline.html | 15 ++++++++ .../mails/it/amazon_hard_decline.txt | 5 +++ .../mails/it/amazon_soft_decline.html | 19 ++++++++++ .../mails/it/amazon_soft_decline.txt | 9 +++++ modules/amzpayments/mails/it/index.php | 35 +++++++++++++++++++ modules/amzpayments/translations/de.php | 9 ++--- modules/amzpayments/translations/es.php | 20 ++++++----- modules/amzpayments/translations/fr.php | 4 ++- modules/amzpayments/translations/it.php | 20 ++++++----- .../views/js/amzpayments_checkout.js | 15 ++++++++ .../views/templates/front/amzpayments.tpl | 1 + .../views/templates/front/amzpayments_bs.tpl | 1 + 29 files changed, 410 insertions(+), 24 deletions(-) create mode 100644 modules/amzpayments/mails/de/amazon_hard_decline.html create mode 100644 modules/amzpayments/mails/de/amazon_hard_decline.txt create mode 100644 modules/amzpayments/mails/de/amazon_soft_decline.html create mode 100644 modules/amzpayments/mails/de/amazon_soft_decline.txt create mode 100755 modules/amzpayments/mails/de/index.php create mode 100644 modules/amzpayments/mails/es/amazon_hard_decline.html create mode 100644 modules/amzpayments/mails/es/amazon_hard_decline.txt create mode 100644 modules/amzpayments/mails/es/amazon_soft_decline.html create mode 100644 modules/amzpayments/mails/es/amazon_soft_decline.txt create mode 100755 modules/amzpayments/mails/es/index.php create mode 100644 modules/amzpayments/mails/fr/amazon_hard_decline.html create mode 100644 modules/amzpayments/mails/fr/amazon_hard_decline.txt create mode 100644 modules/amzpayments/mails/fr/amazon_soft_decline.html create mode 100644 modules/amzpayments/mails/fr/amazon_soft_decline.txt create mode 100755 modules/amzpayments/mails/fr/index.php create mode 100755 modules/amzpayments/mails/index.php create mode 100644 modules/amzpayments/mails/it/amazon_hard_decline.html create mode 100644 modules/amzpayments/mails/it/amazon_hard_decline.txt create mode 100644 modules/amzpayments/mails/it/amazon_soft_decline.html create mode 100644 modules/amzpayments/mails/it/amazon_soft_decline.txt create mode 100755 modules/amzpayments/mails/it/index.php diff --git a/modules/amzpayments/amzpayments.php b/modules/amzpayments/amzpayments.php index b1fc8877..9f8c462b 100644 --- a/modules/amzpayments/amzpayments.php +++ b/modules/amzpayments/amzpayments.php @@ -156,7 +156,7 @@ class AmzPayments extends PaymentModule { $this->name = 'amzpayments'; $this->tab = 'payments_gateways'; - $this->version = '2.0.62'; + $this->version = '2.0.63'; $this->author = 'patworx multimedia GmbH'; $this->need_instance = 1; diff --git a/modules/amzpayments/mails/de/amazon_hard_decline.html b/modules/amzpayments/mails/de/amazon_hard_decline.html new file mode 100644 index 00000000..c2debdfa --- /dev/null +++ b/modules/amzpayments/mails/de/amazon_hard_decline.html @@ -0,0 +1,15 @@ + + + + + Message de {shop_name} + + +
{shop_name}
+Sehr geehrter Kunde,
+
+Leider wurde die Zahlung zu Ihrer Bestellung {$ORDER_NR} vom {$ORDER_DATE} in unserem Onlineshop von Amazon Pay zurückgewiesen. Bitte kontaktieren Sie uns. +
+
+ + diff --git a/modules/amzpayments/mails/de/amazon_hard_decline.txt b/modules/amzpayments/mails/de/amazon_hard_decline.txt new file mode 100644 index 00000000..730def4f --- /dev/null +++ b/modules/amzpayments/mails/de/amazon_hard_decline.txt @@ -0,0 +1,5 @@ + +Sehr geehrter Kunde, + +Leider wurde die Zahlung zu Ihrer Bestellung {$ORDER_NR} vom {$ORDER_DATE} in unserem Onlineshop von Amazon Pay zurückgewiesen. Bitte kontaktieren Sie uns. + diff --git a/modules/amzpayments/mails/de/amazon_soft_decline.html b/modules/amzpayments/mails/de/amazon_soft_decline.html new file mode 100644 index 00000000..3aa7dcc2 --- /dev/null +++ b/modules/amzpayments/mails/de/amazon_soft_decline.html @@ -0,0 +1,20 @@ + + + + + Message de {shop_name} + + +
{shop_name}
+Sehr geehrter Kunde,
+
+ Vielen Dank für Ihre Bestellung Nr. {$ORDER_NR} vom {$ORDER_DATE}.
+
+ Leider wurde Ihre Bezahlung von Amazon Pay abgelehnt.
+Sie können unter https://payments.amazon.de/overview die Zahlungsinformationen für Ihre Bestellung aktualisieren, indem Sie eine andere Zahlungsweise auswählen oder eine neue Zahlungsweise eingeben.
+Mit der neuen Zahlungsweise wird dann ein erneuter +Zahlungsversuch vorgenommen und Sie erhalten eine Bestätigungsemail.
+
+
+ + \ No newline at end of file diff --git a/modules/amzpayments/mails/de/amazon_soft_decline.txt b/modules/amzpayments/mails/de/amazon_soft_decline.txt new file mode 100644 index 00000000..33a623fd --- /dev/null +++ b/modules/amzpayments/mails/de/amazon_soft_decline.txt @@ -0,0 +1,8 @@ + +Sehr geehrter Kunde, + +Vielen Dank für Ihre Bestellung {$ORDER_NR} vom {$ORDER_DATE}. +Leider wurde Ihre Bezahlung von Amazon Pay abgelehnt. +Sie können unter https://payments.amazon.de/overview die Zahlungsinformationen für Ihre Bestellung aktualisieren, indem Sie eine andere Zahlungsweise auswählen oder eine neue Zahlungsweise eingeben. +Mit der neuen Zahlungsweise wird dann ein erneuter Zahlungsversuch vorgenommen und Sie erhalten eine Bestätigungsemail. + diff --git a/modules/amzpayments/mails/de/index.php b/modules/amzpayments/mails/de/index.php new file mode 100755 index 00000000..1ff0753f --- /dev/null +++ b/modules/amzpayments/mails/de/index.php @@ -0,0 +1,35 @@ + +* @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 +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../../"); +exit; \ No newline at end of file diff --git a/modules/amzpayments/mails/es/amazon_hard_decline.html b/modules/amzpayments/mails/es/amazon_hard_decline.html new file mode 100644 index 00000000..eba492c9 --- /dev/null +++ b/modules/amzpayments/mails/es/amazon_hard_decline.html @@ -0,0 +1,15 @@ + + + + + Message de {shop_name} + + +
{shop_name}
+Saludos,
+
+Desgraciadamente, Amazon Pay ha rechazado el pago de tu pedido en nuestra tienda online {$ORDER_NR} de {$ORDER_DATE}. Por favor, ponte en contacto con nosotros. +
+
+ + diff --git a/modules/amzpayments/mails/es/amazon_hard_decline.txt b/modules/amzpayments/mails/es/amazon_hard_decline.txt new file mode 100644 index 00000000..ce524356 --- /dev/null +++ b/modules/amzpayments/mails/es/amazon_hard_decline.txt @@ -0,0 +1,5 @@ + +Saludos, + +Desgraciadamente, Amazon Pay ha rechazado el pago de tu pedido en nuestra tienda online {$ORDER_NR} de {$ORDER_DATE}. Por favor, ponte en contacto con nosotros. + diff --git a/modules/amzpayments/mails/es/amazon_soft_decline.html b/modules/amzpayments/mails/es/amazon_soft_decline.html new file mode 100644 index 00000000..9a4bf4e7 --- /dev/null +++ b/modules/amzpayments/mails/es/amazon_soft_decline.html @@ -0,0 +1,19 @@ + + + + + Message de {shop_name} + + +
{shop_name}
+Saludos,
+
+ Muchas gracias por tu pedido {$ORDER_NR} de {$ORDER_DATE}.
+
+ Desgraciadamente, Amazon Pay ha rechazado tu pago.
+Por favor, dirígete a https://payments.amazon.es/overview y revisa la información de pago de tu pedido.
+ Una vez hayas actualizado tu información de pago, solicitaremos automáticamente un nuevo pago en Amazon Pay y recibirás un correo electrónico de confirmación.
+
+
+ + \ No newline at end of file diff --git a/modules/amzpayments/mails/es/amazon_soft_decline.txt b/modules/amzpayments/mails/es/amazon_soft_decline.txt new file mode 100644 index 00000000..a7617b21 --- /dev/null +++ b/modules/amzpayments/mails/es/amazon_soft_decline.txt @@ -0,0 +1,7 @@ + +Saludos, + +Muchas gracias por tu pedido {$ORDER_NR} de {$ORDER_DATE}. +Desgraciadamente, Amazon Pay ha rechazado tu pago. +Por favor, dirígete a https://payments.amazon.es/overview y revisa la información de pago de tu pedido. +Una vez hayas actualizado tu información de pago, solicitaremos automáticamente un nuevo pago en Amazon Pay y recibirás un correo electrónico de confirmación. \ No newline at end of file diff --git a/modules/amzpayments/mails/es/index.php b/modules/amzpayments/mails/es/index.php new file mode 100755 index 00000000..1ff0753f --- /dev/null +++ b/modules/amzpayments/mails/es/index.php @@ -0,0 +1,35 @@ + +* @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 +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../../"); +exit; \ No newline at end of file diff --git a/modules/amzpayments/mails/fr/amazon_hard_decline.html b/modules/amzpayments/mails/fr/amazon_hard_decline.html new file mode 100644 index 00000000..4060368f --- /dev/null +++ b/modules/amzpayments/mails/fr/amazon_hard_decline.html @@ -0,0 +1,15 @@ + + + + + Message de {shop_name} + + +
{shop_name}
+Cher client,
+
+Malheureusement Amazon Pay n’a pas pu traier le paiement pour votre commande auprès {$ORDER_NR} de {$ORDER_DATE}. Veuillez nous contacter concernant cette commande. +
+
+ + diff --git a/modules/amzpayments/mails/fr/amazon_hard_decline.txt b/modules/amzpayments/mails/fr/amazon_hard_decline.txt new file mode 100644 index 00000000..c3750f85 --- /dev/null +++ b/modules/amzpayments/mails/fr/amazon_hard_decline.txt @@ -0,0 +1,5 @@ + +Cher client, + +Malheureusement Amazon Pay n’a pas pu traier le paiement pour votre commande auprès {$ORDER_NR} de {$ORDER_DATE}. Veuillez nous contacter concernant cette commande. + diff --git a/modules/amzpayments/mails/fr/amazon_soft_decline.html b/modules/amzpayments/mails/fr/amazon_soft_decline.html new file mode 100644 index 00000000..01a3e577 --- /dev/null +++ b/modules/amzpayments/mails/fr/amazon_soft_decline.html @@ -0,0 +1,18 @@ + + + + + Message de {shop_name} + + +
{shop_name}
+Cher client,
+
+ Merci pour votre commande auprès {$ORDER_NR} de {$ORDER_DATE}.
+
+ Malheureusement Amazon Pay n’a pas pu traiter le paiement.
+Veuillez aller sur https://payments.amazon.fr/overview et mettez à jour les informations de paiement pour votre commande.
+
+
+ + \ No newline at end of file diff --git a/modules/amzpayments/mails/fr/amazon_soft_decline.txt b/modules/amzpayments/mails/fr/amazon_soft_decline.txt new file mode 100644 index 00000000..feb3e7bf --- /dev/null +++ b/modules/amzpayments/mails/fr/amazon_soft_decline.txt @@ -0,0 +1,7 @@ + +Cher client, + +Merci pour votre commande auprès {$ORDER_NR} de {$ORDER_DATE}. +Malheureusement Amazon Pay n’a pas pu traiter le paiement. +Veuillez aller sur https://payments.amazon.fr/overview et mettez à jour les informations de paiement pour votre commande. + diff --git a/modules/amzpayments/mails/fr/index.php b/modules/amzpayments/mails/fr/index.php new file mode 100755 index 00000000..1ff0753f --- /dev/null +++ b/modules/amzpayments/mails/fr/index.php @@ -0,0 +1,35 @@ + +* @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 +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../../"); +exit; \ No newline at end of file diff --git a/modules/amzpayments/mails/index.php b/modules/amzpayments/mails/index.php new file mode 100755 index 00000000..a41987df --- /dev/null +++ b/modules/amzpayments/mails/index.php @@ -0,0 +1,35 @@ + +* @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 +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/amzpayments/mails/it/amazon_hard_decline.html b/modules/amzpayments/mails/it/amazon_hard_decline.html new file mode 100644 index 00000000..61240296 --- /dev/null +++ b/modules/amzpayments/mails/it/amazon_hard_decline.html @@ -0,0 +1,15 @@ + + + + + Message de {shop_name} + + +
{shop_name}
+Gentile Cliente,
+
+Purtroppo Amazon Pay ha rifiutato il pagamento del suo ordine nel nostro negozio on-line {$ORDER_NR} de {$ORDER_DATE}. Non esiti a contattarci per ulteriori informazioni a riguardo. +
+
+ + diff --git a/modules/amzpayments/mails/it/amazon_hard_decline.txt b/modules/amzpayments/mails/it/amazon_hard_decline.txt new file mode 100644 index 00000000..b2c35f21 --- /dev/null +++ b/modules/amzpayments/mails/it/amazon_hard_decline.txt @@ -0,0 +1,5 @@ + +Gentile Cliente, + +Purtroppo Amazon Pay ha rifiutato il pagamento del suo ordine nel nostro negozio on-line {$ORDER_NR} de {$ORDER_DATE}. Non esiti a contattarci per ulteriori informazioni a riguardo. + diff --git a/modules/amzpayments/mails/it/amazon_soft_decline.html b/modules/amzpayments/mails/it/amazon_soft_decline.html new file mode 100644 index 00000000..100d66b2 --- /dev/null +++ b/modules/amzpayments/mails/it/amazon_soft_decline.html @@ -0,0 +1,19 @@ + + + + + Message de {shop_name} + + +
{shop_name}
+Gentile Cliente,
+
+ La ringraziamo molto per il suo ordine {$ORDER_NR} de {$ORDER_DATE}.
+
+ Purtroppo Amazon Pay ha rifiutato il suo pagamento.
+La preghiamo di andare all‘indirizzo https://payments.amazon.it/overview selezionando un altro metodo di pagamento o inserendone uno nuovo.
+ Una volta inserito il nuovo metodo di pagamento, verrà effettuato un nuovo tentativo di pagamento e inviata un'e-mail di conferma.
+
+
+ + \ No newline at end of file diff --git a/modules/amzpayments/mails/it/amazon_soft_decline.txt b/modules/amzpayments/mails/it/amazon_soft_decline.txt new file mode 100644 index 00000000..e86cbf8d --- /dev/null +++ b/modules/amzpayments/mails/it/amazon_soft_decline.txt @@ -0,0 +1,9 @@ + +Gentile Cliente, + +La ringraziamo molto per il suo ordine {$ORDER_NR} de {$ORDER_DATE}. +Purtroppo Amazon Pay ha rifiutato il suo pagamento. +La preghiamo di andare all‘indirizzo https://payments.amazon.it/overview selezionando un altro metodo di pagamento o inserendone uno nuovo. +Una volta inserito il nuovo metodo di pagamento, verrà effettuato un nuovo tentativo di pagamento e inviata un'e-mail di conferma. + + diff --git a/modules/amzpayments/mails/it/index.php b/modules/amzpayments/mails/it/index.php new file mode 100755 index 00000000..1ff0753f --- /dev/null +++ b/modules/amzpayments/mails/it/index.php @@ -0,0 +1,35 @@ + +* @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 +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../../"); +exit; \ No newline at end of file diff --git a/modules/amzpayments/translations/de.php b/modules/amzpayments/translations/de.php index f9a36765..ea450529 100644 --- a/modules/amzpayments/translations/de.php +++ b/modules/amzpayments/translations/de.php @@ -176,10 +176,12 @@ $_MODULE['<{amzpayments}prestashop>address_field_46a2a41cc6e552044816a2d04634545 $_MODULE['<{amzpayments}prestashop>amzpayments_fa31ce6046882558f0637d428a96abeb'] = 'Ich möchte ein Kundenkonto erstellen.'; $_MODULE['<{amzpayments}prestashop>amzpayments_9a1ff3881b92951d9663aaef38e8b637'] = 'Sie müssen nichts weiter hierfür tun, es werden die Daten auf Ihrer aktuellen Bestellung verwendet, um das Konto zu erstellen.'; $_MODULE['<{amzpayments}prestashop>amzpayments_eeceac1af4e7620894d6d2083921bb73'] = 'Jetzt kaufen!'; -$_MODULE['<{amzpayments}prestashop>amzpayments_bs_c9cc8cce247e49bae79f15173ce97354'] = 'Save'; +$_MODULE['<{amzpayments}prestashop>amzpayments_ed2d210dda2538d57f8f3a455fbf54ef'] = 'Es tut uns leid, die von Ihnen ausgewählte Adresse wird von uns nicht beliefert. Bitte wählen Sie eine andere Adresse aus.'; +$_MODULE['<{amzpayments}prestashop>amzpayments_bs_c9cc8cce247e49bae79f15173ce97354'] = 'Speichern'; $_MODULE['<{amzpayments}prestashop>amzpayments_bs_fa31ce6046882558f0637d428a96abeb'] = 'Ich möchte ein Kundenkonto erstellen.'; $_MODULE['<{amzpayments}prestashop>amzpayments_bs_9a1ff3881b92951d9663aaef38e8b637'] = 'Sie müssen nichts weiter hierfür tun, es werden die Daten auf Ihrer aktuellen Bestellung verwendet, um das Konto zu erstellen.'; $_MODULE['<{amzpayments}prestashop>amzpayments_bs_eeceac1af4e7620894d6d2083921bb73'] = 'Jetzt kaufen!'; +$_MODULE['<{amzpayments}prestashop>amzpayments_bs_ed2d210dda2538d57f8f3a455fbf54ef'] = 'Es tut uns leid, die von Ihnen ausgewählte Adresse wird von uns nicht beliefert. Bitte wählen Sie eine andere Adresse aus.'; $_MODULE['<{amzpayments}prestashop>connect_accounts_633dfeead551299f8224bc60eb5aaca9'] = 'Vielen Dank für Ihre Anmeldung mit Amazon Pay'; $_MODULE['<{amzpayments}prestashop>connect_accounts_eafa313a0fc72443ff59653adb7fdebb'] = 'In unserem Shop existiert bereits ein Benutzerkonto mit dieser E-Mail-Addresse. Bitte geben Sie Ihr Passwort ein, um dieses mit Ihrem Amazon-Konto zu verknüpfen.'; $_MODULE['<{amzpayments}prestashop>connect_accounts_dc647eb65e6711e155375218212b3964'] = 'Passwort'; @@ -188,11 +190,10 @@ $_MODULE['<{amzpayments}prestashop>process_login_599100c527155892f4359effc359a76 $_MODULE['<{amzpayments}prestashop>process_login_633dfeead551299f8224bc60eb5aaca9'] = 'Vielen Dank für Ihre Anmeldung mit Amazon Pay'; $_MODULE['<{amzpayments}prestashop>process_login_1d90cfb5cc90a32ee0146e7a9aec46b9'] = 'Sie werden in wenigen Sekunden weitergeleitet...'; $_MODULE['<{amzpayments}prestashop>select_address_3e9e333adde6e70086bd29441c8c45eb'] = 'Adresse wählen'; -$_MODULE['<{amzpayments}prestashop>select_address_a5058d1398eb35e54f561de54459aece'] = 'Bitte wählen Sie Ihre Adresse'; -$_MODULE['<{amzpayments}prestashop>select_address_a0bfb8e59e6c13fc8d990781f77694fe'] = 'Weiter'; -$_MODULE['<{amzpayments}prestashop>select_address_daa6b483e9f6ca081ec7e0b4a352f9e9'] = 'Adresse Speichern'; $_MODULE['<{amzpayments}prestashop>select_address_7d5fd5da702c79b9fcb4fa1b7c63ee7f'] = 'Danke, dass Sie Login mit Amazon in unseren Shop nutzen.'; $_MODULE['<{amzpayments}prestashop>select_address_50842b129a33396a62b7dc81a73a7c1a'] = 'Bitte wählen Sie noch eine Standardadresse für Ihren Account. Sie können unabhängig von dieser später für Ihre Bestellung eine beliebige Lieferanschrift wählen.'; +$_MODULE['<{amzpayments}prestashop>select_address_a0bfb8e59e6c13fc8d990781f77694fe'] = 'Weiter'; +$_MODULE['<{amzpayments}prestashop>select_address_daa6b483e9f6ca081ec7e0b4a352f9e9'] = 'Adresse Speichern'; $_MODULE['<{amzpayments}prestashop>confirmation_2e2117b7c81aa9ea6931641ea2c6499f'] = 'Ihre Bestellung bei'; $_MODULE['<{amzpayments}prestashop>confirmation_75fbf512d744977d62599cc3f0ae2bb4'] = 'ist vollständig.'; $_MODULE['<{amzpayments}prestashop>confirmation_fb4ea5a18e5f77bece3219a4171320a9'] = 'Sie haben Amazon Pay als Bezahlmethode gewählt.'; diff --git a/modules/amzpayments/translations/es.php b/modules/amzpayments/translations/es.php index 8937abcc..ace1cae2 100644 --- a/modules/amzpayments/translations/es.php +++ b/modules/amzpayments/translations/es.php @@ -176,7 +176,9 @@ $_MODULE['<{amzpayments}prestashop>address_field_46a2a41cc6e552044816a2d04634545 $_MODULE['<{amzpayments}prestashop>amzpayments_fa31ce6046882558f0637d428a96abeb'] = 'Crear cuenta de cliente.'; $_MODULE['<{amzpayments}prestashop>amzpayments_9a1ff3881b92951d9663aaef38e8b637'] = 'No necesitas hacer nada más. Crearemos la cuenta con los datos de tu pedido actual.'; $_MODULE['<{amzpayments}prestashop>amzpayments_eeceac1af4e7620894d6d2083921bb73'] = '¡Comprar ahora!'; -$_MODULE['<{amzpayments}prestashop>amzpayments_bs_c9cc8cce247e49bae79f15173ce97354'] = 'Save'; +$_MODULE['<{amzpayments}prestashop>amzpayments_ed2d210dda2538d57f8f3a455fbf54ef'] = 'Lo sentimos, no podemos entregar a la dirección que ha seleccionado. Por favor, selecciona una diferente.'; +$_MODULE['<{amzpayments}prestashop>amzpayments_bs_ed2d210dda2538d57f8f3a455fbf54ef'] = 'Lo sentimos, no podemos entregar a la dirección que ha seleccionado. Por favor, selecciona una diferente.'; +$_MODULE['<{amzpayments}prestashop>amzpayments_bs_c9cc8cce247e49bae79f15173ce97354'] = 'Continuar'; $_MODULE['<{amzpayments}prestashop>amzpayments_bs_fa31ce6046882558f0637d428a96abeb'] = 'Crear cuenta de cliente.'; $_MODULE['<{amzpayments}prestashop>amzpayments_bs_9a1ff3881b92951d9663aaef38e8b637'] = 'No necesitas hacer nada más. Crearemos la cuenta con los datos de tu pedido actual.'; $_MODULE['<{amzpayments}prestashop>amzpayments_bs_eeceac1af4e7620894d6d2083921bb73'] = '¡Comprar ahora!'; @@ -193,13 +195,13 @@ $_MODULE['<{amzpayments}prestashop>select_address_a0bfb8e59e6c13fc8d990781f77694 $_MODULE['<{amzpayments}prestashop>select_address_daa6b483e9f6ca081ec7e0b4a352f9e9'] = 'Guardar cambios'; $_MODULE['<{amzpayments}prestashop>select_address_7d5fd5da702c79b9fcb4fa1b7c63ee7f'] = 'Gracias por utilizar Login con Amazon en nuestra tienda.'; $_MODULE['<{amzpayments}prestashop>select_address_50842b129a33396a62b7dc81a73a7c1a'] = 'Por favor, seleccione una dirección predeterminada para la creación de su cuenta. Usted podrá elegir una dirección de envío durante el proceso de checkout.'; -$_MODULE['<{amzpayments}prestashop>confirmation_2e2117b7c81aa9ea6931641ea2c6499f'] = 'Your order at '; -$_MODULE['<{amzpayments}prestashop>confirmation_75fbf512d744977d62599cc3f0ae2bb4'] = 'is complete.'; -$_MODULE['<{amzpayments}prestashop>confirmation_fb4ea5a18e5f77bece3219a4171320a9'] = 'You have chosen Amazon Pay for your payment.'; -$_MODULE['<{amzpayments}prestashop>confirmation_e6dc7945b557a1cd949bea92dd58963e'] = 'Your order will be dispatched shortly.'; -$_MODULE['<{amzpayments}prestashop>confirmation_0db71da7150c27142eef9d22b843b4a9'] = 'For further questions, please contact our'; -$_MODULE['<{amzpayments}prestashop>confirmation_64430ad2835be8ad60c59e7d44e4b0b1'] = 'customer-support.'; -$_MODULE['<{amzpayments}prestashop>displaytopcolumn_2e2117b7c81aa9ea6931641ea2c6499f'] = 'Your order at '; -$_MODULE['<{amzpayments}prestashop>displaytopcolumn_75fbf512d744977d62599cc3f0ae2bb4'] = 'is complete.'; +$_MODULE['<{amzpayments}prestashop>confirmation_2e2117b7c81aa9ea6931641ea2c6499f'] = 'Su orden en '; +$_MODULE['<{amzpayments}prestashop>confirmation_75fbf512d744977d62599cc3f0ae2bb4'] = 'está completa.'; +$_MODULE['<{amzpayments}prestashop>confirmation_fb4ea5a18e5f77bece3219a4171320a9'] = 'Usted ha elegido Amazon Pay para su pago.'; +$_MODULE['<{amzpayments}prestashop>confirmation_e6dc7945b557a1cd949bea92dd58963e'] = 'Su orden será enviada dentro de poco.'; +$_MODULE['<{amzpayments}prestashop>confirmation_0db71da7150c27142eef9d22b843b4a9'] = 'Para más información, por favor contacte a '; +$_MODULE['<{amzpayments}prestashop>confirmation_64430ad2835be8ad60c59e7d44e4b0b1'] = 'nuestro Atención al cliente.'; +$_MODULE['<{amzpayments}prestashop>displaytopcolumn_2e2117b7c81aa9ea6931641ea2c6499f'] = 'Su orden en '; +$_MODULE['<{amzpayments}prestashop>displaytopcolumn_75fbf512d744977d62599cc3f0ae2bb4'] = 'está completa.'; $_MODULE['<{amzpayments}prestashop>payment_ed20689b0d8d53ec534166a88b67f259'] = 'Pagar con Amazon'; $_MODULE['<{amzpayments}prestashop>payment_8811becbf523354e20e2017242326f70'] = '(Pagos cómodos y seguros con tu cuenta de Amazon)'; diff --git a/modules/amzpayments/translations/fr.php b/modules/amzpayments/translations/fr.php index 0afface2..06e23ec3 100644 --- a/modules/amzpayments/translations/fr.php +++ b/modules/amzpayments/translations/fr.php @@ -176,7 +176,9 @@ $_MODULE['<{amzpayments}prestashop>address_field_46a2a41cc6e552044816a2d04634545 $_MODULE['<{amzpayments}prestashop>amzpayments_fa31ce6046882558f0637d428a96abeb'] = 'Créer un compte client.'; $_MODULE['<{amzpayments}prestashop>amzpayments_9a1ff3881b92951d9663aaef38e8b637'] = 'Vous n\'avez rien à faire. Nous nous occupons de créer le compte avec les données de votre commande actuelle.'; $_MODULE['<{amzpayments}prestashop>amzpayments_eeceac1af4e7620894d6d2083921bb73'] = 'Acheter maintenant'; -$_MODULE['<{amzpayments}prestashop>amzpayments_bs_c9cc8cce247e49bae79f15173ce97354'] = 'Save'; +$_MODULE['<{amzpayments}prestashop>amzpayments_ed2d210dda2538d57f8f3a455fbf54ef'] = 'Nous sommes désolés mais nous ne pouvons pas livrer à l’adresse sélectionnée, veuillez s’il vous plait en choisir une autre.'; +$_MODULE['<{amzpayments}prestashop>amzpayments_bs_ed2d210dda2538d57f8f3a455fbf54ef'] = 'Nous sommes désolés mais nous ne pouvons pas livrer à l’adresse sélectionnée, veuillez s’il vous plait en choisir une autre.'; +$_MODULE['<{amzpayments}prestashop>amzpayments_bs_c9cc8cce247e49bae79f15173ce97354'] = 'Continuer'; $_MODULE['<{amzpayments}prestashop>amzpayments_bs_fa31ce6046882558f0637d428a96abeb'] = 'Créer un compte client.'; $_MODULE['<{amzpayments}prestashop>amzpayments_bs_9a1ff3881b92951d9663aaef38e8b637'] = 'Vous n\'avez rien à faire. Nous nous occupons de créer le compte avec les données de votre commande actuelle.'; $_MODULE['<{amzpayments}prestashop>amzpayments_bs_eeceac1af4e7620894d6d2083921bb73'] = 'Acheter maintenant'; diff --git a/modules/amzpayments/translations/it.php b/modules/amzpayments/translations/it.php index da9c3e0b..3293bc7c 100644 --- a/modules/amzpayments/translations/it.php +++ b/modules/amzpayments/translations/it.php @@ -176,7 +176,9 @@ $_MODULE['<{amzpayments}prestashop>address_field_46a2a41cc6e552044816a2d04634545 $_MODULE['<{amzpayments}prestashop>amzpayments_fa31ce6046882558f0637d428a96abeb'] = 'Crea account cliente.'; $_MODULE['<{amzpayments}prestashop>amzpayments_9a1ff3881b92951d9663aaef38e8b637'] = 'Non devi fare nulla. L\'account verrà creato con i dati del tuo ordine attuale.'; $_MODULE['<{amzpayments}prestashop>amzpayments_eeceac1af4e7620894d6d2083921bb73'] = 'Acquista ora!'; -$_MODULE['<{amzpayments}prestashop>amzpayments_bs_c9cc8cce247e49bae79f15173ce97354'] = 'Save'; +$_MODULE['<{amzpayments}prestashop>amzpayments_ed2d210dda2538d57f8f3a455fbf54ef'] = 'Siamo spiacenti, non possiamo spedire all’indirizzo selezionato. Selezionane uno differente.'; +$_MODULE['<{amzpayments}prestashop>amzpayments_bs_ed2d210dda2538d57f8f3a455fbf54ef'] = 'Siamo spiacenti, non possiamo spedire all’indirizzo selezionato. Selezionane uno differente.'; +$_MODULE['<{amzpayments}prestashop>amzpayments_bs_c9cc8cce247e49bae79f15173ce97354'] = 'Continua'; $_MODULE['<{amzpayments}prestashop>amzpayments_bs_fa31ce6046882558f0637d428a96abeb'] = 'Crea account cliente.'; $_MODULE['<{amzpayments}prestashop>amzpayments_bs_9a1ff3881b92951d9663aaef38e8b637'] = 'Non devi fare nulla. L\'account verrà creato con i dati del tuo ordine attuale.'; $_MODULE['<{amzpayments}prestashop>amzpayments_bs_eeceac1af4e7620894d6d2083921bb73'] = 'Acquista ora!'; @@ -193,13 +195,13 @@ $_MODULE['<{amzpayments}prestashop>select_address_a0bfb8e59e6c13fc8d990781f77694 $_MODULE['<{amzpayments}prestashop>select_address_daa6b483e9f6ca081ec7e0b4a352f9e9'] = 'Salva modifiche'; $_MODULE['<{amzpayments}prestashop>select_address_7d5fd5da702c79b9fcb4fa1b7c63ee7f'] = 'Grazie per aver utilizzato Accedi con Amazon sul nostro sito.'; $_MODULE['<{amzpayments}prestashop>select_address_50842b129a33396a62b7dc81a73a7c1a'] = 'Seleziona un indirizzo predefinito per la creazione del tuo account. Potrai poi scegliere un indirizzo di spedizione differente durante il checkout.'; -$_MODULE['<{amzpayments}prestashop>confirmation_2e2117b7c81aa9ea6931641ea2c6499f'] = 'Ihre Bestellung bei'; -$_MODULE['<{amzpayments}prestashop>confirmation_75fbf512d744977d62599cc3f0ae2bb4'] = 'ist vollständig.'; -$_MODULE['<{amzpayments}prestashop>confirmation_fb4ea5a18e5f77bece3219a4171320a9'] = 'Sie haben Amazon Pay als Bezahlmethode gewählt.'; -$_MODULE['<{amzpayments}prestashop>confirmation_e6dc7945b557a1cd949bea92dd58963e'] = 'Ihre Bestellung wird in Kürze versandt.'; -$_MODULE['<{amzpayments}prestashop>confirmation_0db71da7150c27142eef9d22b843b4a9'] = 'Für weitere Fragen wenden Sie sich bitte an unseren'; -$_MODULE['<{amzpayments}prestashop>confirmation_64430ad2835be8ad60c59e7d44e4b0b1'] = 'Kunden-Support.'; -$_MODULE['<{amzpayments}prestashop>displaytopcolumn_2e2117b7c81aa9ea6931641ea2c6499f'] = 'Your order at '; -$_MODULE['<{amzpayments}prestashop>displaytopcolumn_75fbf512d744977d62599cc3f0ae2bb4'] = 'is complete.'; +$_MODULE['<{amzpayments}prestashop>confirmation_2e2117b7c81aa9ea6931641ea2c6499f'] = 'Il tuo ordine su'; +$_MODULE['<{amzpayments}prestashop>confirmation_75fbf512d744977d62599cc3f0ae2bb4'] = 'è completato.'; +$_MODULE['<{amzpayments}prestashop>confirmation_fb4ea5a18e5f77bece3219a4171320a9'] = 'Hai scelto Amazon Pay per il tuo pagamento.'; +$_MODULE['<{amzpayments}prestashop>confirmation_e6dc7945b557a1cd949bea92dd58963e'] = 'Il tuo ordine verrà inviato a breve.'; +$_MODULE['<{amzpayments}prestashop>confirmation_0db71da7150c27142eef9d22b843b4a9'] = 'Per ulteriori domande, contatta il nostro'; +$_MODULE['<{amzpayments}prestashop>confirmation_64430ad2835be8ad60c59e7d44e4b0b1'] = 'servizio clienti.'; +$_MODULE['<{amzpayments}prestashop>displaytopcolumn_2e2117b7c81aa9ea6931641ea2c6499f'] = 'Il tuo ordine su '; +$_MODULE['<{amzpayments}prestashop>displaytopcolumn_75fbf512d744977d62599cc3f0ae2bb4'] = 'è completato.'; $_MODULE['<{amzpayments}prestashop>payment_ed20689b0d8d53ec534166a88b67f259'] = 'Paga con Amazon'; $_MODULE['<{amzpayments}prestashop>payment_8811becbf523354e20e2017242326f70'] = '(Pagamento pratico e sicuro con il tuo account Amazon)'; diff --git a/modules/amzpayments/views/js/amzpayments_checkout.js b/modules/amzpayments/views/js/amzpayments_checkout.js index 526144d2..714ea212 100644 --- a/modules/amzpayments/views/js/amzpayments_checkout.js +++ b/modules/amzpayments/views/js/amzpayments_checkout.js @@ -28,6 +28,14 @@ function checkVoucherForm() } } +setInterval(checkPPBtn, 500); +function checkPPBtn() +{ + if ($("#amz_cart_widgets_summary #container_express_checkout").length > 0) { + $("#container_express_checkout").remove(); + } +} + function updateCarrierSelectionAndGift() { if (!requestIsRunning) { @@ -225,6 +233,13 @@ function updateAddressSelection(amazonOrderReferenceId) } updateCarrierList(jsonData.carrier_data); + if (typeof amazonCarrierErrorMessage !== 'undefined' || amazonCarrierErrorMessage !== null) { + if ($("#noCarrierWarning").length > 0) { + $("#noCarrierWarning").hide(); + $("#noCarrierWarning").html(amazonCarrierErrorMessage); + $("#noCarrierWarning").show(); + } + } updateCartSummary(jsonData.summary); updateHookShoppingCart(jsonData.HOOK_SHOPPING_CART); updateHookShoppingCartExtra(jsonData.HOOK_SHOPPING_CART_EXTRA); diff --git a/modules/amzpayments/views/templates/front/amzpayments.tpl b/modules/amzpayments/views/templates/front/amzpayments.tpl index 5b121004..692bec64 100644 --- a/modules/amzpayments/views/templates/front/amzpayments.tpl +++ b/modules/amzpayments/views/templates/front/amzpayments.tpl @@ -55,6 +55,7 @@ {literal}