diff --git a/classes/Mail.php b/classes/Mail.php index 4ef7ae511..9a5d5e398 100644 --- a/classes/Mail.php +++ b/classes/Mail.php @@ -234,6 +234,9 @@ class MailCore $template_vars['{shop_name}'] = Tools::safeOutput(Configuration::get('PS_SHOP_NAME')); $template_vars['{shop_url}'] = Tools::getShopDomain(true, true).__PS_BASE_URI__.'index.php'; + $template_vars['{my_account_url}'] = Context::getContext()->link->getPageLink('my-account', true, Context::getContext()->language->id); + $template_vars['{guest_tracking_url}'] = Context::getContext()->link->getPageLink('guest-tracking', true, Context::getContext()->language->id); + $template_vars['{history_url}'] = Context::getContext()->link->getPageLink('history', true, Context::getContext()->language->id); $swift->attachPlugin(new Swift_Plugin_Decorator(array($to_plugin => $template_vars)), 'decorator'); if ($configuration['PS_MAIL_TYPE'] == Mail::TYPE_BOTH || $configuration['PS_MAIL_TYPE'] == Mail::TYPE_TEXT) $message->attach(new Swift_Message_Part($template_txt, 'text/plain', '8bit', 'utf-8')); diff --git a/mails/de/bankwire.html b/mails/de/bankwire.html index ca3bd60ca..8ac1e9d08 100644 --- a/mails/de/bankwire.html +++ b/mails/de/bankwire.html @@ -38,10 +38,10 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   diff --git a/mails/de/cheque.html b/mails/de/cheque.html index 7ced61303..dcae38ab2 100644 --- a/mails/de/cheque.html +++ b/mails/de/cheque.html @@ -38,10 +38,10 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   diff --git a/mails/de/credit_slip.html b/mails/de/credit_slip.html index d00a57428..8b4320ee7 100644 --- a/mails/de/credit_slip.html +++ b/mails/de/credit_slip.html @@ -32,7 +32,7 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverfolgung" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverfolgung" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken.   diff --git a/mails/de/download_product.html b/mails/de/download_product.html index ef4d10daf..8f2d3ecb7 100644 --- a/mails/de/download_product.html +++ b/mails/de/download_product.html @@ -38,10 +38,10 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   diff --git a/mails/de/in_transit.html b/mails/de/in_transit.html index ce1fe3186..c54d878f1 100644 --- a/mails/de/in_transit.html +++ b/mails/de/in_transit.html @@ -38,10 +38,10 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   diff --git a/mails/de/order_canceled.html b/mails/de/order_canceled.html index eb6491ee9..5fca793f4 100644 --- a/mails/de/order_canceled.html +++ b/mails/de/order_canceled.html @@ -32,10 +32,10 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   diff --git a/mails/de/order_changed.html b/mails/de/order_changed.html index 51b8c66b6..18d2fc3d1 100644 --- a/mails/de/order_changed.html +++ b/mails/de/order_changed.html @@ -32,10 +32,10 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   diff --git a/mails/de/order_changed.txt b/mails/de/order_changed.txt index 3e460a8d3..c0c41f3d1 100644 --- a/mails/de/order_changed.txt +++ b/mails/de/order_changed.txt @@ -4,7 +4,7 @@ Your order with the reference {order_name} from {shop_name} has been changed by You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop. -If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order using this link: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/de/order_conf.html b/mails/de/order_conf.html index 1fdbaf55c..22d03fd64 100644 --- a/mails/de/order_conf.html +++ b/mails/de/order_conf.html @@ -103,10 +103,10 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   diff --git a/mails/de/order_conf.txt b/mails/de/order_conf.txt index 06d6ececa..b5e162a30 100644 --- a/mails/de/order_conf.txt +++ b/mails/de/order_conf.txt @@ -25,6 +25,6 @@ Versand {invoice_block_txt} Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung auf dieser Webseite verfolgen: {shop_url}?controller=guest-tracking +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung auf dieser Webseite verfolgen: {guest_tracking_url} {shop_name} powered with PrestaShop™ diff --git a/mails/de/order_return_state.html b/mails/de/order_return_state.html index c82f1acf5..a31814e16 100644 --- a/mails/de/order_return_state.html +++ b/mails/de/order_return_state.html @@ -32,7 +32,7 @@   -Sie können diese Bestellrücksendung im Abschnitt "Bestellverlauf" Ihres Kontos ansehen, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellrücksendung im Abschnitt "Bestellverlauf" Ihres Kontos ansehen, indem Sie auf unserer Webseite auf "Mein Konto" klicken.   diff --git a/mails/de/outofstock.html b/mails/de/outofstock.html index 9f6906adf..ec07e7f5c 100644 --- a/mails/de/outofstock.html +++ b/mails/de/outofstock.html @@ -32,10 +32,10 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   diff --git a/mails/de/payment.html b/mails/de/payment.html index ea7da5dc4..d261e7efc 100644 --- a/mails/de/payment.html +++ b/mails/de/payment.html @@ -32,7 +32,7 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken.   diff --git a/mails/de/payment_error.html b/mails/de/payment_error.html index ff6ebaa75..b54b87343 100644 --- a/mails/de/payment_error.html +++ b/mails/de/payment_error.html @@ -38,10 +38,10 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf"Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf"Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   diff --git a/mails/de/preparation.html b/mails/de/preparation.html index 2f91af982..0bde6833c 100644 --- a/mails/de/preparation.html +++ b/mails/de/preparation.html @@ -32,10 +32,10 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   diff --git a/mails/de/refund.html b/mails/de/refund.html index 2b8a5dcd4..3fb4a61e4 100644 --- a/mails/de/refund.html +++ b/mails/de/refund.html @@ -32,10 +32,10 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   diff --git a/mails/de/shipped.html b/mails/de/shipped.html index 7880028f9..bc2ea167d 100644 --- a/mails/de/shipped.html +++ b/mails/de/shipped.html @@ -32,10 +32,10 @@   -Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. +Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. -Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen. +Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung im Abschnitt "Bestellverfolgung Gast" auf unserer Webseite verfolgen.   diff --git a/mails/en/bankwire.html b/mails/en/bankwire.html index e99e60cdd..3ff23aeed 100644 --- a/mails/en/bankwire.html +++ b/mails/en/bankwire.html @@ -38,10 +38,10 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   diff --git a/mails/en/bankwire.txt b/mails/en/bankwire.txt index 1f1070cb5..4454874a7 100644 --- a/mails/en/bankwire.txt +++ b/mails/en/bankwire.txt @@ -19,7 +19,7 @@ Bank address: {bankwire_address} You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop. -If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order using this link: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/en/cheque.html b/mails/en/cheque.html index 659a048f7..e2a84caa8 100644 --- a/mails/en/cheque.html +++ b/mails/en/cheque.html @@ -38,10 +38,10 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   diff --git a/mails/en/credit_slip.html b/mails/en/credit_slip.html index 59119901d..4d4430eae 100644 --- a/mails/en/credit_slip.html +++ b/mails/en/credit_slip.html @@ -32,7 +32,7 @@   -You can review this credit slip and download your invoice from the "My credit slips" section of your account by clicking "My account" on our shop. +You can review this credit slip and download your invoice from the "My credit slips" section of your account by clicking "My account" on our shop.   diff --git a/mails/en/download_product.html b/mails/en/download_product.html index 64f951bde..89ffc55ec 100644 --- a/mails/en/download_product.html +++ b/mails/en/download_product.html @@ -38,10 +38,10 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   diff --git a/mails/en/download_product.txt b/mails/en/download_product.txt index ccec5aff8..1ea0b4bcc 100644 --- a/mails/en/download_product.txt +++ b/mails/en/download_product.txt @@ -8,6 +8,6 @@ You have {nbProducts} product(s) now available for download using the following You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop. -If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order using this link: {guest_tracking_url} {shop_url} powered by PrestaShop™ \ No newline at end of file diff --git a/mails/en/in_transit.html b/mails/en/in_transit.html index c8c239844..e464c66d0 100755 --- a/mails/en/in_transit.html +++ b/mails/en/in_transit.html @@ -32,10 +32,10 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   diff --git a/mails/en/in_transit.txt b/mails/en/in_transit.txt index 7e906ec34..364fa479a 100755 --- a/mails/en/in_transit.txt +++ b/mails/en/in_transit.txt @@ -8,7 +8,7 @@ You can track your package using the following link: {followup} You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop. -If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order using this link: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/en/order_canceled.html b/mails/en/order_canceled.html index df94f020e..e32c8030d 100644 --- a/mails/en/order_canceled.html +++ b/mails/en/order_canceled.html @@ -32,10 +32,10 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   diff --git a/mails/en/order_canceled.txt b/mails/en/order_canceled.txt index 4fbaa1fee..19017eddc 100644 --- a/mails/en/order_canceled.txt +++ b/mails/en/order_canceled.txt @@ -4,7 +4,7 @@ Your order with the reference {order_name} from {shop_name} has been cancelled. You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop. -If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order using this link: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/en/order_changed.html b/mails/en/order_changed.html index 7eb1b54ef..42c5c9d25 100644 --- a/mails/en/order_changed.html +++ b/mails/en/order_changed.html @@ -32,10 +32,10 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   diff --git a/mails/en/order_changed.txt b/mails/en/order_changed.txt index 3e460a8d3..c0c41f3d1 100644 --- a/mails/en/order_changed.txt +++ b/mails/en/order_changed.txt @@ -4,7 +4,7 @@ Your order with the reference {order_name} from {shop_name} has been changed by You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop. -If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order using this link: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/en/order_conf.html b/mails/en/order_conf.html index 2f753c01a..062ba36ac 100644 --- a/mails/en/order_conf.html +++ b/mails/en/order_conf.html @@ -103,10 +103,10 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   diff --git a/mails/en/order_conf.txt b/mails/en/order_conf.txt index 0723bddee..2da5fc054 100644 --- a/mails/en/order_conf.txt +++ b/mails/en/order_conf.txt @@ -23,6 +23,6 @@ Thank you for your order on {shop_name}! You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop. -If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order using this link: {guest_tracking_url} {shop_url} powered by PrestaShop™ \ No newline at end of file diff --git a/mails/en/order_return_state.html b/mails/en/order_return_state.html index c3807dd79..1d340104a 100644 --- a/mails/en/order_return_state.html +++ b/mails/en/order_return_state.html @@ -32,7 +32,7 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

  diff --git a/mails/en/outofstock.html b/mails/en/outofstock.html index c3170a922..bd3c6e9b7 100644 --- a/mails/en/outofstock.html +++ b/mails/en/outofstock.html @@ -32,10 +32,10 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   diff --git a/mails/en/outofstock.txt b/mails/en/outofstock.txt index 630803c82..1442706bb 100644 --- a/mails/en/outofstock.txt +++ b/mails/en/outofstock.txt @@ -8,7 +8,7 @@ Please accept our apologies and rest assured that we are working hard to rectify You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop. -If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order using this link: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/en/payment.html b/mails/en/payment.html index 5c7c579c8..06149f20a 100644 --- a/mails/en/payment.html +++ b/mails/en/payment.html @@ -32,10 +32,10 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   diff --git a/mails/en/payment.txt b/mails/en/payment.txt index d4cf6138a..2ddce2f23 100644 --- a/mails/en/payment.txt +++ b/mails/en/payment.txt @@ -6,7 +6,7 @@ Your payment for order with the reference {order_name} was successfully processe You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop. -If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order using this link: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/en/payment_error.html b/mails/en/payment_error.html index 73e24ab4f..53a179665 100644 --- a/mails/en/payment_error.html +++ b/mails/en/payment_error.html @@ -38,10 +38,10 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   diff --git a/mails/en/payment_error.txt b/mails/en/payment_error.txt index 2a7b6db86..486853b4f 100644 --- a/mails/en/payment_error.txt +++ b/mails/en/payment_error.txt @@ -6,7 +6,7 @@ We cannot ship your order until we receive your payment. You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop. -If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order using this link: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/en/preparation.html b/mails/en/preparation.html index 3fa9cf0ec..83d013915 100644 --- a/mails/en/preparation.html +++ b/mails/en/preparation.html @@ -32,10 +32,10 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   diff --git a/mails/en/preparation.txt b/mails/en/preparation.txt index 04f5bd3f4..96651c937 100644 --- a/mails/en/preparation.txt +++ b/mails/en/preparation.txt @@ -4,7 +4,7 @@ We are currently processing your {shop_name} order with the reference {order_nam You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop. -If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order using this link: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/en/refund.html b/mails/en/refund.html index 2cff243b4..68a1bff78 100644 --- a/mails/en/refund.html +++ b/mails/en/refund.html @@ -32,10 +32,10 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   diff --git a/mails/en/refund.txt b/mails/en/refund.txt index 35ba27b62..694218d44 100644 --- a/mails/en/refund.txt +++ b/mails/en/refund.txt @@ -4,7 +4,7 @@ We have processed your {shop_name} refund for order with the reference {order_na You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop. -If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order using this link: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/en/shipped.html b/mails/en/shipped.html index ee22b370f..bb8656601 100644 --- a/mails/en/shipped.html +++ b/mails/en/shipped.html @@ -32,10 +32,10 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   diff --git a/mails/en/shipped.txt b/mails/en/shipped.txt index c8f46d2d1..8b6e56066 100644 --- a/mails/en/shipped.txt +++ b/mails/en/shipped.txt @@ -8,7 +8,7 @@ You will soon receive a URL to track the delivery progress of your package. You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop. -If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order using this link: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/es/bankwire.html b/mails/es/bankwire.html index ddde78436..5da9b1bfc 100644 --- a/mails/es/bankwire.html +++ b/mails/es/bankwire.html @@ -38,10 +38,10 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   diff --git a/mails/es/bankwire.txt b/mails/es/bankwire.txt index 11a513e19..717fb4805 100644 --- a/mails/es/bankwire.txt +++ b/mails/es/bankwire.txt @@ -10,7 +10,7 @@ Por favor, recuerda que has seleccionado transferencia bancaria. Envíala a: Total Pedido: {total_paid} Puedes revisar tu pedido y descargar la factura desde tu cuenta de nuestra web en (sección "Historial de Pedidos"). -If you have guest account, you can follow your order at this page: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order at this page: {guest_tracking_url} Muchas gracias por comprar en {shop_name}. diff --git a/mails/es/cheque.html b/mails/es/cheque.html index b718dc296..8fd074420 100644 --- a/mails/es/cheque.html +++ b/mails/es/cheque.html @@ -38,10 +38,10 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   diff --git a/mails/es/cheque.txt b/mails/es/cheque.txt index 5a58dcde0..336bcd768 100644 --- a/mails/es/cheque.txt +++ b/mails/es/cheque.txt @@ -10,7 +10,7 @@ Por favor, recuerda que ha seleccionado pagar con cheque. Rellénalo con: - a {cheque_address} Puedes revisar tu pedido y descargar la factura desde tu cuenta de nuestra web en (historial de pedidos). -If you have guest account, you can follow your order at this page: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order at this page: {guest_tracking_url} Muchas gracias por comprar en {shop_name}. diff --git a/mails/es/credit_slip.html b/mails/es/credit_slip.html index 46405fa45..7c80135be 100644 --- a/mails/es/credit_slip.html +++ b/mails/es/credit_slip.html @@ -32,7 +32,7 @@   -Puedes revisar este pedido y descargar la factura desde la sección "Seguimiento de Pedido" de tu cuenta "Mi Cuenta" en nuestra web. +Puedes revisar este pedido y descargar la factura desde la sección "Seguimiento de Pedido" de tu cuenta "Mi Cuenta" en nuestra web.   diff --git a/mails/es/download_product.html b/mails/es/download_product.html index 7fac2f693..40eba5b90 100644 --- a/mails/es/download_product.html +++ b/mails/es/download_product.html @@ -38,10 +38,10 @@   -Puedes revisar este pedido y descargar su factura desde la sección "Seguimiento de Pedido" de tu cuenta "Mi Cuenta" en nuestra web. +Puedes revisar este pedido y descargar su factura desde la sección "Seguimiento de Pedido" de tu cuenta "Mi Cuenta" en nuestra web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   diff --git a/mails/es/download_product.txt b/mails/es/download_product.txt index 306261a81..b3b195963 100644 --- a/mails/es/download_product.txt +++ b/mails/es/download_product.txt @@ -7,7 +7,7 @@ Este es el acceso directo: Puedes revisar este pedido y descargar la factura desde la sección "Seguimiento de Pedido" de tu cuenta pulsando en "Mi cuenta" en nuestra web. -Si tienes una cuenta invitado, puedes seguir tu pedido en esta página: {shop_url}?controller=guest-tracking?id_order={id_order} +Si tienes una cuenta invitado, puedes seguir tu pedido en esta página: {guest_tracking_url}?id_order={id_order} {shop_url} desarrollado por PrestaShop® diff --git a/mails/es/in_transit.html b/mails/es/in_transit.html index c409acc0d..535db9932 100644 --- a/mails/es/in_transit.html +++ b/mails/es/in_transit.html @@ -38,10 +38,10 @@   -También puedes revisar tus pedidos y descargar tus facturas desde tu "Historial de Pedidos" dentro de tu cuenta en nuestra web. +También puedes revisar tus pedidos y descargar tus facturas desde tu "Historial de Pedidos" dentro de tu cuenta en nuestra web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   diff --git a/mails/es/in_transit.txt b/mails/es/in_transit.txt index 9ecf79541..24ff17e21 100644 --- a/mails/es/in_transit.txt +++ b/mails/es/in_transit.txt @@ -4,7 +4,7 @@ Tu pedido está en camino. Puedes seguir su ubicación actual haciendo clic en este enlace: {followup} También puedes revisar tus pedidos y descargar tus facturas desde tu "Historial de Pedidos" dentro de tu cuenta. -If you have guest account, you can follow your order at this page: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order at this page: {guest_tracking_url} Gracias por comprar en {shop_name}! diff --git a/mails/es/order_canceled.html b/mails/es/order_canceled.html index b50030000..ab85c3f1c 100644 --- a/mails/es/order_canceled.html +++ b/mails/es/order_canceled.html @@ -32,10 +32,10 @@   -Puedes revisar este pedido y descargar tu factura desde la sección "Seguimiento de Pedido" de su cuenta "Mi Cuenta" en nuestra web. +Puedes revisar este pedido y descargar tu factura desde la sección "Seguimiento de Pedido" de su cuenta "Mi Cuenta" en nuestra web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   diff --git a/mails/es/order_canceled.txt b/mails/es/order_canceled.txt index 64def8147..888fd157d 100644 --- a/mails/es/order_canceled.txt +++ b/mails/es/order_canceled.txt @@ -5,7 +5,7 @@ Respecto al pedido #{id_order}: Tu pedido ha sido cancelado. Puedes revisar este pedido y descargar tu factura desde la seccion de "Historial de Pedidos" dentro de tu cuenta en nuestra web. -If you have guest account, you can follow your order at this page: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order at this page: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/es/order_changed.html b/mails/es/order_changed.html index 51b8c66b6..18d2fc3d1 100644 --- a/mails/es/order_changed.html +++ b/mails/es/order_changed.html @@ -32,10 +32,10 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   diff --git a/mails/es/order_changed.txt b/mails/es/order_changed.txt index 3e460a8d3..c0c41f3d1 100644 --- a/mails/es/order_changed.txt +++ b/mails/es/order_changed.txt @@ -4,7 +4,7 @@ Your order with the reference {order_name} from {shop_name} has been changed by You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop. -If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order using this link: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/es/order_conf.html b/mails/es/order_conf.html index 9163dd82b..7fa6743d8 100644 --- a/mails/es/order_conf.html +++ b/mails/es/order_conf.html @@ -98,10 +98,10 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   diff --git a/mails/es/order_conf.txt b/mails/es/order_conf.txt index 298003623..70364a2d7 100644 --- a/mails/es/order_conf.txt +++ b/mails/es/order_conf.txt @@ -22,7 +22,7 @@ {invoice_block_txt} Puedes revisar tu pedido y descargar la factura desde tu cuenta de nuestra web en (historial de pedidos). - If you have guest account, you can follow your order at this page: {shop_url}?controller=guest-tracking + If you have guest account, you can follow your order at this page: {guest_tracking_url} Gracias por comprar en {shop_name}. diff --git a/mails/es/order_customer_comment.html b/mails/es/order_customer_comment.html index 14910b781..02df0d4fb 100644 --- a/mails/es/order_customer_comment.html +++ b/mails/es/order_customer_comment.html @@ -32,7 +32,7 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. diff --git a/mails/es/order_return_state.html b/mails/es/order_return_state.html index 6a3808ba8..3565f1c48 100644 --- a/mails/es/order_return_state.html +++ b/mails/es/order_return_state.html @@ -32,7 +32,7 @@   -Puede acceder al seguimiento de su devolución y descargar su factura en "Histórico de pedidos" en la sección "Mi cuenta" de nuestra Web. +Puede acceder al seguimiento de su devolución y descargar su factura en "Histórico de pedidos" en la sección "Mi cuenta" de nuestra Web.   diff --git a/mails/es/outofstock.html b/mails/es/outofstock.html index fd74aceb2..fbf513767 100644 --- a/mails/es/outofstock.html +++ b/mails/es/outofstock.html @@ -32,10 +32,10 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   diff --git a/mails/es/outofstock.txt b/mails/es/outofstock.txt index ce744c60a..66ed4278c 100644 --- a/mails/es/outofstock.txt +++ b/mails/es/outofstock.txt @@ -8,7 +8,7 @@ Esto puede originar un retraso en el envío. Por favor, acepta nuestras disculpa Puedes revisar tu pedido y descargar la factura desde tu cuenta de nuestra web en (historial de pedidos). -If you have guest account, you can follow your order at this page: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order at this page: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/es/payment.html b/mails/es/payment.html index 541cc55d1..c89a8a20d 100644 --- a/mails/es/payment.html +++ b/mails/es/payment.html @@ -32,10 +32,10 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   diff --git a/mails/es/payment.txt b/mails/es/payment.txt index 69244c2d3..610f4c766 100644 --- a/mails/es/payment.txt +++ b/mails/es/payment.txt @@ -5,7 +5,7 @@ En referencia a tu pedido #{id_order}: El pago de tu pedido fue recibido CORRECTAMENTE . Puedes revisar tu pedido y descargar la factura desde tu cuenta de nuestra web en (historial de pedidos). -If you have guest account, you can follow your order at this page: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order at this page: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/es/payment_error.html b/mails/es/payment_error.html index c4c1d0d13..2fd1a2d86 100644 --- a/mails/es/payment_error.html +++ b/mails/es/payment_error.html @@ -38,10 +38,10 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   diff --git a/mails/es/payment_error.txt b/mails/es/payment_error.txt index 24575eb21..a6b38315e 100644 --- a/mails/es/payment_error.txt +++ b/mails/es/payment_error.txt @@ -7,7 +7,7 @@ Tu pedido no será enviado hasta que resolvamos este problema. Puedes revisar tu pedido y descargar la factura desde tu cuenta de nuestra web en (historial de pedidos). -If you have guest account, you can follow your order at this page: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order at this page: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/es/preparation.html b/mails/es/preparation.html index 09c72e2f9..c8bbe0aaf 100644 --- a/mails/es/preparation.html +++ b/mails/es/preparation.html @@ -32,10 +32,10 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   diff --git a/mails/es/preparation.txt b/mails/es/preparation.txt index 72416b49b..d333af177 100644 --- a/mails/es/preparation.txt +++ b/mails/es/preparation.txt @@ -5,7 +5,7 @@ Sobre tu pedido #{id_order}: Estamos preparando tu pedido. Puedes revisar tu pedido y descargar la factura desde tu cuenta de nuestra web en (historial de pedidos). -If you have guest account, you can follow your order at this page: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order at this page: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/es/refund.html b/mails/es/refund.html index 02e96062b..5e3e62ae0 100644 --- a/mails/es/refund.html +++ b/mails/es/refund.html @@ -32,10 +32,10 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -If you have guest account, you can follow your order at "Guest Tracking" section on our Website. +If you have guest account, you can follow your order at "Guest Tracking" section on our Website.   diff --git a/mails/es/refund.txt b/mails/es/refund.txt index ff255d3ed..c2a65a2ca 100644 --- a/mails/es/refund.txt +++ b/mails/es/refund.txt @@ -3,7 +3,7 @@ Hola {firstname} {lastname}, Se ha reembolsado el pago de tu pedido. Puedes revisar tu pedido y descargar la factura desde tu cuenta de nuestra web en (historial de pedidos). -If you have guest account, you can follow your order at this page: {shop_url}?controller=guest-tracking +If you have guest account, you can follow your order at this page: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/es/shipped.html b/mails/es/shipped.html index 14cdde566..73c008988 100644 --- a/mails/es/shipped.html +++ b/mails/es/shipped.html @@ -32,10 +32,10 @@   -Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. +Puedes revisar tu pedido y descargar la factura aquí: "Historial de Pedidos" dentro de tu cuenta "Entrar en Mi Cuenta" de nuestro sitio web. -Si tiene una cuenta de invitado, puede seguirla desde la sección  "Seguimiento de invitado" en nuestro sitio. +Si tiene una cuenta de invitado, puede seguirla desde la sección  "Seguimiento de invitado" en nuestro sitio.   diff --git a/mails/fr/bankwire.html b/mails/fr/bankwire.html index e4d9745b9..77b9cd6cd 100644 --- a/mails/fr/bankwire.html +++ b/mails/fr/bankwire.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -38,10 +38,10 @@ - + - + @@ -50,6 +50,6 @@ -
 
Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.
 {shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/bankwire.txt b/mails/fr/bankwire.txt index c8cef21d9..05e2239cb 100644 --- a/mails/fr/bankwire.txt +++ b/mails/fr/bankwire.txt @@ -12,7 +12,7 @@ Pour rappel, vous avez sélectionné le mode de paiement par virement bancaire e Le montant total est de {total_paid} Vous pouvez accéder à tout moment au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site {shop_url} -Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {shop_url}?controller=guest-tracking +Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {guest_tracking_url} Merci et à bientôt sur {shop_name}. diff --git a/mails/fr/cheque.html b/mails/fr/cheque.html index 0d4a1bb41..a95040cf5 100644 --- a/mails/fr/cheque.html +++ b/mails/fr/cheque.html @@ -1,10 +1,10 @@ - - - - - Message de {shop_name} - - + + + + + Message de {shop_name} + + @@ -38,10 +38,10 @@ - + - + @@ -50,6 +50,6 @@ -
 
Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.
 {shop_name} réalisé avec PrestaShop™
- + + \ No newline at end of file diff --git a/mails/fr/cheque.txt b/mails/fr/cheque.txt index e20e86c77..6c5b9492b 100644 --- a/mails/fr/cheque.txt +++ b/mails/fr/cheque.txt @@ -12,7 +12,7 @@ Pour rappel, vous avez choisi de régler votre commande par chèque, merci de no - à {cheque_address} Vous pouvez accéder à tout moment au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site {shop_url} -Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {shop_url}?controller=guest-tracking +Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/fr/credit_slip.html b/mails/fr/credit_slip.html index 86d180230..6d8098265 100644 --- a/mails/fr/credit_slip.html +++ b/mails/fr/credit_slip.html @@ -32,7 +32,7 @@   -Vous pouvez accéder à cet avoir et télécharger votre facture dans "Suivi des commandes" de la rubrique "Mon compte" sur notre site. +Vous pouvez accéder à cet avoir et télécharger votre facture dans "Suivi des commandes" de la rubrique "Mon compte" sur notre site.   diff --git a/mails/fr/download_product.html b/mails/fr/download_product.html index 5d1867125..ec6795634 100644 --- a/mails/fr/download_product.html +++ b/mails/fr/download_product.html @@ -38,10 +38,10 @@   -Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. +Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site. +Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.   diff --git a/mails/fr/download_product.txt b/mails/fr/download_product.txt index 21b3127ed..4e3776f8c 100644 --- a/mails/fr/download_product.txt +++ b/mails/fr/download_product.txt @@ -7,6 +7,6 @@ Voici les liens directs vers ceux-ci : Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {shop_url}?controller=guest-tracking?id_order={id_order} +Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {guest_tracking_url}?id_order={id_order} {shop_url} réalisé avec PrestaShop™ \ No newline at end of file diff --git a/mails/fr/in_transit.html b/mails/fr/in_transit.html index 5705bb2fc..8e331dddb 100755 --- a/mails/fr/in_transit.html +++ b/mails/fr/in_transit.html @@ -38,10 +38,10 @@   -Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. +Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site. +Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.   diff --git a/mails/fr/in_transit.txt b/mails/fr/in_transit.txt index f8a8ef073..8c4a97649 100755 --- a/mails/fr/in_transit.txt +++ b/mails/fr/in_transit.txt @@ -5,7 +5,7 @@ La livraison de votre commande est en cours. Vous pouvez suivre l'avancement de la livraison à l'adresse suivante : {followup} Vous pouvez accéder à tout moment au suivi de votre commande dans "Historique de mes commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {shop_url}?controller=guest-tracking +Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/fr/order_canceled.html b/mails/fr/order_canceled.html index 72eb519d8..3e7356b1c 100644 --- a/mails/fr/order_canceled.html +++ b/mails/fr/order_canceled.html @@ -32,10 +32,10 @@   -Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. +Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site. +Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.   diff --git a/mails/fr/order_canceled.txt b/mails/fr/order_canceled.txt index fd587401e..58266794d 100644 --- a/mails/fr/order_canceled.txt +++ b/mails/fr/order_canceled.txt @@ -3,7 +3,7 @@ Bonjour {firstname} {lastname}, Votre commande ayant pour référence {order_name} a été annulée. Vous pouvez accéder à tout moment au suivi de votre commande dans "Historique des commandes" de la rubrique "Mon compte" sur notre site {shop_name}. -Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {shop_url}?controller=guest-tracking +Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/fr/order_changed.html b/mails/fr/order_changed.html index 021b486c2..b1034e616 100644 --- a/mails/fr/order_changed.html +++ b/mails/fr/order_changed.html @@ -32,10 +32,10 @@   -Vous pouvez consulter votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. +Vous pouvez consulter votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez consulter votre commande dans la section "Suivi invité" de notre site. +Si vous avez un compte invité, vous pouvez consulter votre commande dans la section "Suivi invité" de notre site.   diff --git a/mails/fr/order_changed.txt b/mails/fr/order_changed.txt index 475fb85df..c33de15df 100644 --- a/mails/fr/order_changed.txt +++ b/mails/fr/order_changed.txt @@ -3,7 +3,7 @@ Bonjour {firstname} {lastname}, Votre commande ayant pour référence {order_name} a été modifiée par le marchand. Vous pouvez à tout moment consulter votre commande dans "Historique des commandes" de la rubrique "Mon compte" sur notre site {shop_name}. -Si vous avez un compte invité, vous pouvez consulter votre commande à cette adresse : {shop_url}?controller=guest-tracking +Si vous avez un compte invité, vous pouvez consulter votre commande à cette adresse : {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/fr/order_conf.html b/mails/fr/order_conf.html index fa3848108..2ff041941 100644 --- a/mails/fr/order_conf.html +++ b/mails/fr/order_conf.html @@ -103,10 +103,10 @@   -Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. +Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site. +Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.   diff --git a/mails/fr/order_conf.txt b/mails/fr/order_conf.txt index e9f403a1e..7b79cb2d8 100644 --- a/mails/fr/order_conf.txt +++ b/mails/fr/order_conf.txt @@ -23,6 +23,6 @@ Livraison {invoice_block_txt} Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {shop_url}?controller=guest-tracking +Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {guest_tracking_url} {shop_url} réalisé avec PrestaShop™ diff --git a/mails/fr/order_return_state.html b/mails/fr/order_return_state.html index 00d010d30..3614ebefa 100644 --- a/mails/fr/order_return_state.html +++ b/mails/fr/order_return_state.html @@ -32,7 +32,7 @@   -Vous pouvez accéder au suivi de votre bon de retour et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. +Vous pouvez accéder au suivi de votre bon de retour et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.   diff --git a/mails/fr/outofstock.html b/mails/fr/outofstock.html index aa2829c3f..a21de4993 100644 --- a/mails/fr/outofstock.html +++ b/mails/fr/outofstock.html @@ -32,10 +32,10 @@   -Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. +Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site. +Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.   diff --git a/mails/fr/outofstock.txt b/mails/fr/outofstock.txt index fdcab8e34..0fcf9662f 100644 --- a/mails/fr/outofstock.txt +++ b/mails/fr/outofstock.txt @@ -3,7 +3,7 @@ Bonjour {firstname} {lastname}, Votre commande ayant pour référence {order_name} est bien enregistrée mais nécessite un réapprovisionnement. Vous pouvez accéder à tout moment au suivi de votre commande dans la rubrique "Mon compte". -Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {shop_url}?controller=guest-tracking +Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/fr/payment.html b/mails/fr/payment.html index e63f1d75e..8ee42d412 100644 --- a/mails/fr/payment.html +++ b/mails/fr/payment.html @@ -32,10 +32,10 @@   -Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. +Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site. +Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.   diff --git a/mails/fr/payment.txt b/mails/fr/payment.txt index 30309270c..2be608dd6 100644 --- a/mails/fr/payment.txt +++ b/mails/fr/payment.txt @@ -3,7 +3,7 @@ Bonjour {firstname} {lastname}, Le paiement pour votre commande ayant pour référence {order_name} a été accepté. Vous pouvez accéder à tout moment au suivi de votre commande dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {shop_url}?controller=guest-tracking +Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/fr/payment_error.html b/mails/fr/payment_error.html index 4ed691f43..2be2d0ea0 100644 --- a/mails/fr/payment_error.html +++ b/mails/fr/payment_error.html @@ -32,10 +32,10 @@   -Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. +Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site. +Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.   diff --git a/mails/fr/payment_error.txt b/mails/fr/payment_error.txt index 9a2c80b0f..af94d69bb 100644 --- a/mails/fr/payment_error.txt +++ b/mails/fr/payment_error.txt @@ -3,7 +3,7 @@ Bonjour {firstname} {lastname}, Un problème a été constaté pour le paiement de votre commande ayant pour référence {order_name}. Vous pouvez à tout moment accéder au suivi de votre commande dans la rubrique "Mon compte" du site. -Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {shop_url}?controller=guest-tracking +Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/fr/preparation.html b/mails/fr/preparation.html index 6d5480918..2dd2ad381 100644 --- a/mails/fr/preparation.html +++ b/mails/fr/preparation.html @@ -32,10 +32,10 @@   -Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. +Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site. +Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.   diff --git a/mails/fr/preparation.txt b/mails/fr/preparation.txt index c5e6ebc33..96a918b51 100644 --- a/mails/fr/preparation.txt +++ b/mails/fr/preparation.txt @@ -3,7 +3,7 @@ Bonjour {firstname} {lastname}, Votre commande ayant pour référence {order_name} est en cours de préparation. Vous pouvez accéder à tout moment au suivi de votre commande dans "Historique de mes commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {shop_url}?controller=guest-tracking +Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/fr/refund.html b/mails/fr/refund.html index d399f1775..cce98d242 100644 --- a/mails/fr/refund.html +++ b/mails/fr/refund.html @@ -32,10 +32,10 @@   -Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. +Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site. +Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.   diff --git a/mails/fr/refund.txt b/mails/fr/refund.txt index e220f2345..e25f68818 100644 --- a/mails/fr/refund.txt +++ b/mails/fr/refund.txt @@ -3,7 +3,7 @@ Bonjour {firstname} {lastname}, Votre commande ayant pour référence {order_name} vous a bien été remboursée. Vous pouvez accéder à tout moment au suivi de votre commande dans la rubrique "Mon compte" du site. -Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {shop_url}?controller=guest-tracking +Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/fr/shipped.html b/mails/fr/shipped.html index 69fe68a73..7d5b2b2b7 100644 --- a/mails/fr/shipped.html +++ b/mails/fr/shipped.html @@ -32,10 +32,10 @@   -Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. +Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site. +Si vous avez un compte invité, vous pouvez suivre votre commande dans la section "Suivi invité" de notre site.   diff --git a/mails/fr/shipped.txt b/mails/fr/shipped.txt index 527e32cb1..2d68cf283 100644 --- a/mails/fr/shipped.txt +++ b/mails/fr/shipped.txt @@ -5,7 +5,7 @@ Votre commande ayant pour référence {order_name} vient d'être expédiée. Vous recevrez prochainement un lien vous permettant le suivi de votre colis. Vous pouvez accéder à tout moment au suivi de votre commande dans "Historique de mes commandes" de la rubrique "Mon compte" sur notre site. -Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse: {shop_url}?controller=guest-tracking +Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/it/bankwire.html b/mails/it/bankwire.html index 55952678b..bfdbc82e7 100644 --- a/mails/it/bankwire.html +++ b/mails/it/bankwire.html @@ -38,10 +38,10 @@   -Puoi rivedere l'ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account clicando su "Il mio account" nel nostro sito web. +Puoi rivedere l'ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account clicando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordine ospite"nel nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordine ospite"nel nostro sito web.   diff --git a/mails/it/bankwire.txt b/mails/it/bankwire.txt index d64356586..3f30870e7 100644 --- a/mails/it/bankwire.txt +++ b/mails/it/bankwire.txt @@ -13,7 +13,7 @@ Ricorda che hai scelto di pagare con bonifico bancario. Invia il pagamento a: Importo totale dell'ordine {total_paid} Puoi rivedere l'ordine e scaricare la fattura dalla sezione "Cronologia ordini" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {shop_url}?controller=guest-tracking +Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {guest_tracking_url} Grazie di aver acquistato con {shop_name}. diff --git a/mails/it/cheque.html b/mails/it/cheque.html index 00f37fcaa..da67fd741 100644 --- a/mails/it/cheque.html +++ b/mails/it/cheque.html @@ -38,10 +38,10 @@   -Puoi rivedere l'ordine e scaricare la fattura dalla sezione"Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere l'ordine e scaricare la fattura dalla sezione"Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordine ospite" del nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordine ospite" del nostro sito web.   diff --git a/mails/it/cheque.txt b/mails/it/cheque.txt index fe83bb5a8..d4270e924 100644 --- a/mails/it/cheque.txt +++ b/mails/it/cheque.txt @@ -11,7 +11,7 @@ Ricorda che hai scelto di pagare con assegno. Invia il pagamento: - inviato a {cheque_address} Puoi rivedere l'ordine e scaricare la fattura dalla sezione "Cronologia ordini" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {shop_url}?controller=guest-tracking +Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {guest_tracking_url} Grazie di aver acquistato con {shop_name}. diff --git a/mails/it/credit_slip.html b/mails/it/credit_slip.html index 5731406f8..37a9f7cb6 100644 --- a/mails/it/credit_slip.html +++ b/mails/it/credit_slip.html @@ -32,7 +32,7 @@   -Puoi rivedere questa nota di credito e scaricare la fattura dalla sezione "Controllo ordini"del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questa nota di credito e scaricare la fattura dalla sezione "Controllo ordini"del tuo account cliccando su "Il mio account" nel nostro sito web.   diff --git a/mails/it/download_product.html b/mails/it/download_product.html index 75b096831..a023e9381 100644 --- a/mails/it/download_product.html +++ b/mails/it/download_product.html @@ -38,10 +38,10 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite"del nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite"del nostro sito web.   diff --git a/mails/it/download_product.txt b/mails/it/download_product.txt index d31a4b5fc..0d7b2a449 100644 --- a/mails/it/download_product.txt +++ b/mails/it/download_product.txt @@ -6,6 +6,6 @@ Qui di seguito troverai i link per questi prodotti: {virtualProducts} Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordini" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {shop_url}?controller=guest-tracking +Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {guest_tracking_url} {shop_url} powered by PrestaShop™ \ No newline at end of file diff --git a/mails/it/in_transit.html b/mails/it/in_transit.html index 62d47f0df..fb6ab8286 100644 --- a/mails/it/in_transit.html +++ b/mails/it/in_transit.html @@ -38,10 +38,10 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" del nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" del nostro sito web.   diff --git a/mails/it/in_transit.txt b/mails/it/in_transit.txt index 12dfddff9..4af38990a 100644 --- a/mails/it/in_transit.txt +++ b/mails/it/in_transit.txt @@ -5,7 +5,7 @@ Il tuo ordine è attualmente in viaggio. Puoi controllare la posizione del tuo pacco cliccando nel link seguente: {followup} Puoi anche rivedere questo ordine e scaricare la tua fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire l'ordine in questa pagina: {shop_url}?controller=guest-tracking +Se hai un account ospite, puoi seguire l'ordine in questa pagina: {guest_tracking_url} Grazie per aver acquistato con {shop_name}! diff --git a/mails/it/order_canceled.html b/mails/it/order_canceled.html index bd9f65cd6..bf03ef834 100644 --- a/mails/it/order_canceled.html +++ b/mails/it/order_canceled.html @@ -32,10 +32,10 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" nel nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" nel nostro sito web.   diff --git a/mails/it/order_canceled.txt b/mails/it/order_canceled.txt index e7c231705..b1f9b647c 100644 --- a/mails/it/order_canceled.txt +++ b/mails/it/order_canceled.txt @@ -5,7 +5,7 @@ Riguardo al tuo ordine n.{id_order}: Il tuo ordine è stato cancellato. Puoi rivedere questo ordine e scaricare la tua fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire l'ordine in questa pagina: {shop_url}?controller=guest-tracking +Se hai un account ospite, puoi seguire l'ordine in questa pagina: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/it/order_changed.html b/mails/it/order_changed.html index 37396eb52..62b96dadf 100644 --- a/mails/it/order_changed.html +++ b/mails/it/order_changed.html @@ -32,10 +32,10 @@   -You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

+You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.

-If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. +If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.   diff --git a/mails/it/order_conf.html b/mails/it/order_conf.html index fbe14ae59..022d90366 100644 --- a/mails/it/order_conf.html +++ b/mails/it/order_conf.html @@ -103,10 +103,10 @@   -Puoi rivedere l'ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere l'ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" del nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" del nostro sito web.   diff --git a/mails/it/order_conf.txt b/mails/it/order_conf.txt index 91b862536..0c3789a47 100644 --- a/mails/it/order_conf.txt +++ b/mails/it/order_conf.txt @@ -25,6 +25,6 @@ Spedizione {delivery_block_html} Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {shop_url}?controller=guest-tracking +Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {guest_tracking_url} {shop_url} powered by PrestaShop™ diff --git a/mails/it/order_return_state.html b/mails/it/order_return_state.html index 235407801..1d00a9593 100644 --- a/mails/it/order_return_state.html +++ b/mails/it/order_return_state.html @@ -32,7 +32,7 @@   -Puoi rivedere questo ordine nella sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine nella sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web.   diff --git a/mails/it/outofstock.html b/mails/it/outofstock.html index 0d28136fa..e7176cb71 100644 --- a/mails/it/outofstock.html +++ b/mails/it/outofstock.html @@ -32,10 +32,10 @@   -Puoi rivedere questo ordine e scaricare la fattura nella sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura nella sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" nel nostro sito web. +Se hai un account ospite puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" nel nostro sito web.   diff --git a/mails/it/outofstock.txt b/mails/it/outofstock.txt index 0dc48520b..82418ad44 100644 --- a/mails/it/outofstock.txt +++ b/mails/it/outofstock.txt @@ -5,7 +5,7 @@ Purtroppo, uno o più articoli del tuo ordine n.{id_order} sono al momento esauriti. Questo può provocare un leggero ritardo nella consegna. Ti preghiamo di scusarci e ti assicuriamo che stiamo facendo di tutto per risolvere il problema. Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {shop_url}?controller=guest-tracking +Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/it/payment.html b/mails/it/payment.html index 945b4b786..4c2683f4a 100644 --- a/mails/it/payment.html +++ b/mails/it/payment.html @@ -32,7 +32,7 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web.   diff --git a/mails/it/payment_error.html b/mails/it/payment_error.html index 0a83e0fca..e8fa594ea 100644 --- a/mails/it/payment_error.html +++ b/mails/it/payment_error.html @@ -38,10 +38,10 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" del nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" del nostro sito web.   diff --git a/mails/it/payment_error.txt b/mails/it/payment_error.txt index fe9917249..d416aae38 100644 --- a/mails/it/payment_error.txt +++ b/mails/it/payment_error.txt @@ -5,7 +5,7 @@ Si è verificato un problema con il tuo pagamento dell'ordine n.{id_order}. Cont Il tuo ordine non sarà inviato fino a che non avremo risolto il problema. Puoi rivedere questo ordine e scaricare la tua fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {shop_url}?controller=guest-tracking +Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/it/preparation.html b/mails/it/preparation.html index 87011d4fc..976097207 100644 --- a/mails/it/preparation.html +++ b/mails/it/preparation.html @@ -32,10 +32,10 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospitedel nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospitedel nostro sito web.   diff --git a/mails/it/preparation.txt b/mails/it/preparation.txt index 87722be9c..377787db6 100644 --- a/mails/it/preparation.txt +++ b/mails/it/preparation.txt @@ -5,7 +5,7 @@ Stiamo elaborando il tuo ordine. Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. - Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {shop_url}?controller=guest-tracking + Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/it/refund.html b/mails/it/refund.html index 93c01be67..5c2b49233 100644 --- a/mails/it/refund.html +++ b/mails/it/refund.html @@ -32,10 +32,10 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" nel nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite" nel nostro sito web.   diff --git a/mails/it/refund.txt b/mails/it/refund.txt index 98558cd34..132bb88a6 100644 --- a/mails/it/refund.txt +++ b/mails/it/refund.txt @@ -3,7 +3,7 @@ Il pagamento del tuo ordine è stato rimborsato. Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. - Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {shop_url}?controller=guest-tracking + Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {guest_tracking_url} {shop_name} - {shop_url} diff --git a/mails/it/shipped.html b/mails/it/shipped.html index afd1b14ff..c113f8c1c 100644 --- a/mails/it/shipped.html +++ b/mails/it/shipped.html @@ -32,10 +32,10 @@   -Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. +Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. -Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite"nel nostro sito web. +Se hai un account ospite, puoi seguire il tuo ordine nella sezione "Controllo ordini ospite"nel nostro sito web.   diff --git a/mails/it/shipped.txt b/mails/it/shipped.txt index 9a2394240..907b90210 100644 --- a/mails/it/shipped.txt +++ b/mails/it/shipped.txt @@ -5,7 +5,7 @@ Il tuo ordine è stato appena spedito. Riceverai presto un URL su cui cliccare per rintracciare i progressi di consegna del tuo pacco. Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. - Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {shop_url}?controller=guest-tracking + Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {guest_tracking_url} Grazie di aver acquistato con {shop_name}!