From e9bbc08af6c191b04013ca0aa0d37f643dcb6bc1 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Wed, 17 Apr 2024 12:38:14 +0530 Subject: [PATCH 1/5] Update: The link in email templated will now open in tab --- mails/en/account.html | 56 +++++++++---------- mails/en/awaiting_payment.html | 8 +-- mails/en/backoffice_order.html | 6 +- mails/en/contact.html | 52 ++++++++--------- mails/en/contact_form.html | 4 +- mails/en/credit_slip.html | 6 +- mails/en/credit_slip_voucher.html | 4 +- mails/en/download_product.html | 8 +-- mails/en/employee_password.html | 4 +- mails/en/footer.html | 2 +- mails/en/forward_msg.html | 4 +- mails/en/guest_to_customer.html | 4 +- mails/en/header.html | 2 +- mails/en/header_order_conf.html | 2 +- mails/en/in_transit.html | 10 ++-- mails/en/log_alert.html | 4 +- mails/en/newsletter.html | 4 +- mails/en/order_canceled.html | 10 ++-- mails/en/order_changed.html | 8 +-- mails/en/order_conf.html | 8 +-- mails/en/order_conf_admin.html | 4 +- mails/en/order_customer_comment.html | 4 +- mails/en/order_merchant_comment.html | 4 +- mails/en/order_refund_completed_admin.html | 4 +- mails/en/order_refund_completed_customer.html | 6 +- mails/en/order_refund_denied_admin.html | 4 +- mails/en/order_refund_denied_customer.html | 6 +- mails/en/order_refund_pending_admin.html | 4 +- mails/en/order_refund_pending_customer.html | 6 +- mails/en/order_return_state.html | 6 +- mails/en/overbooking.html | 8 +-- mails/en/overbooking_admin.html | 4 +- mails/en/password.html | 8 +-- mails/en/password_query.html | 6 +- mails/en/payment_accepted.html | 8 +-- mails/en/payment_error.html | 8 +-- mails/en/processing.html | 8 +-- mails/en/refund.html | 8 +-- mails/en/reply_msg.html | 6 +- mails/en/shipped.html | 6 +- mails/en/test.html | 4 +- mails/en/voucher.html | 4 +- mails/en/voucher_new.html | 4 +- .../mails/ag/newsletter_conf.html | 4 +- .../mails/ag/newsletter_verif.html | 6 +- .../mails/ag/newsletter_voucher.html | 4 +- .../mails/ar/newsletter_conf.html | 4 +- .../mails/ar/newsletter_verif.html | 6 +- .../mails/ar/newsletter_voucher.html | 4 +- .../mails/bg/newsletter_conf.html | 4 +- .../mails/bg/newsletter_verif.html | 6 +- .../mails/bg/newsletter_voucher.html | 4 +- .../mails/br/newsletter_conf.html | 4 +- .../mails/br/newsletter_verif.html | 6 +- .../mails/br/newsletter_voucher.html | 4 +- .../mails/ca/newsletter_conf.html | 4 +- .../mails/ca/newsletter_verif.html | 6 +- .../mails/ca/newsletter_voucher.html | 4 +- .../mails/de/newsletter_conf.html | 4 +- .../mails/de/newsletter_verif.html | 6 +- .../mails/de/newsletter_voucher.html | 4 +- .../mails/en/newsletter_conf.html | 4 +- .../mails/en/newsletter_verif.html | 6 +- .../mails/en/newsletter_voucher.html | 4 +- .../mails/es/newsletter_conf.html | 4 +- .../mails/es/newsletter_verif.html | 6 +- .../mails/es/newsletter_voucher.html | 4 +- .../mails/fr/newsletter_conf.html | 4 +- .../mails/fr/newsletter_verif.html | 6 +- .../mails/fr/newsletter_voucher.html | 4 +- .../mails/gl/newsletter_conf.html | 4 +- .../mails/gl/newsletter_verif.html | 6 +- .../mails/gl/newsletter_voucher.html | 4 +- .../mails/id/newsletter_conf.html | 4 +- .../mails/id/newsletter_verif.html | 6 +- .../mails/id/newsletter_voucher.html | 4 +- .../mails/nl/newsletter_conf.html | 4 +- .../mails/nl/newsletter_verif.html | 6 +- .../mails/nl/newsletter_voucher.html | 4 +- .../mails/en/review_approve.html | 10 ++-- .../mails/en/review_reply_with_link.html | 10 ++-- .../mails/en/review_reply_without_link.html | 8 +-- .../mails/en/review_request.html | 10 ++-- 83 files changed, 271 insertions(+), 271 deletions(-) diff --git a/mails/en/account.html b/mails/en/account.html index 574320227..d4e5a77c9 100644 --- a/mails/en/account.html +++ b/mails/en/account.html @@ -4,51 +4,51 @@ Message from {shop_name} - - - @@ -61,7 +61,7 @@ @@ -88,7 +88,7 @@

Your {shop_name} login details

- Here are your login details:
+ Here are your login details:
E-mail address: {email}
@@ -128,7 +128,7 @@ @@ -138,7 +138,7 @@
- You can now place orders on our website: {shop_name} + You can now place orders on our website: {shop_name}
diff --git a/mails/en/awaiting_payment.html b/mails/en/awaiting_payment.html index 6829f65e4..f75a12ca5 100644 --- a/mails/en/awaiting_payment.html +++ b/mails/en/awaiting_payment.html @@ -61,7 +61,7 @@ @@ -105,7 +105,7 @@ @@ -113,7 +113,7 @@ @@ -124,7 +124,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 website. + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
diff --git a/mails/en/backoffice_order.html b/mails/en/backoffice_order.html index 1eabbebf8..0b40f8b35 100644 --- a/mails/en/backoffice_order.html +++ b/mails/en/backoffice_order.html @@ -61,7 +61,7 @@ @@ -87,7 +87,7 @@

A new order has been generated on your behalf.

- Please go on {order_link} to finalize the payment. + Please go on {order_link} to finalize the payment. @@ -102,7 +102,7 @@
 
diff --git a/mails/en/contact.html b/mails/en/contact.html index 7b5e30715..2d8de950f 100644 --- a/mails/en/contact.html +++ b/mails/en/contact.html @@ -4,51 +4,51 @@ Message from {shop_name} - - - @@ -61,7 +61,7 @@ @@ -103,7 +103,7 @@
diff --git a/mails/en/contact_form.html b/mails/en/contact_form.html index 7feebeff6..73a8a7143 100644 --- a/mails/en/contact_form.html +++ b/mails/en/contact_form.html @@ -61,7 +61,7 @@ @@ -115,7 +115,7 @@
diff --git a/mails/en/credit_slip.html b/mails/en/credit_slip.html index 29a654f9b..6aee0c304 100644 --- a/mails/en/credit_slip.html +++ b/mails/en/credit_slip.html @@ -61,7 +61,7 @@ @@ -102,7 +102,7 @@ @@ -112,7 +112,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 website. + 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 website.
diff --git a/mails/en/credit_slip_voucher.html b/mails/en/credit_slip_voucher.html index 1a9da8f38..e864fd62b 100644 --- a/mails/en/credit_slip_voucher.html +++ b/mails/en/credit_slip_voucher.html @@ -63,7 +63,7 @@ @@ -108,7 +108,7 @@
diff --git a/mails/en/download_product.html b/mails/en/download_product.html index d3e6a6b38..a9d6b6e9a 100644 --- a/mails/en/download_product.html +++ b/mails/en/download_product.html @@ -61,7 +61,7 @@ @@ -105,7 +105,7 @@ @@ -113,7 +113,7 @@ @@ -123,7 +123,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 website. + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
diff --git a/mails/en/employee_password.html b/mails/en/employee_password.html index 6c6ac6b59..7b1b059c9 100644 --- a/mails/en/employee_password.html +++ b/mails/en/employee_password.html @@ -61,7 +61,7 @@ @@ -106,7 +106,7 @@
diff --git a/mails/en/footer.html b/mails/en/footer.html index 4dfdfa115..c2a71a11f 100644 --- a/mails/en/footer.html +++ b/mails/en/footer.html @@ -3,7 +3,7 @@ - {shop_name} powered by Webkul™ + {shop_name} powered by Webkul™ diff --git a/mails/en/forward_msg.html b/mails/en/forward_msg.html index 77eb6cfe1..07728db09 100644 --- a/mails/en/forward_msg.html +++ b/mails/en/forward_msg.html @@ -61,7 +61,7 @@ @@ -104,7 +104,7 @@
diff --git a/mails/en/guest_to_customer.html b/mails/en/guest_to_customer.html index 0f3307c2d..0dc1e5c9a 100644 --- a/mails/en/guest_to_customer.html +++ b/mails/en/guest_to_customer.html @@ -61,7 +61,7 @@ @@ -124,7 +124,7 @@
diff --git a/mails/en/header.html b/mails/en/header.html index d690de932..0e48e8437 100644 --- a/mails/en/header.html +++ b/mails/en/header.html @@ -61,7 +61,7 @@ diff --git a/mails/en/header_order_conf.html b/mails/en/header_order_conf.html index 238b2486d..706451c33 100644 --- a/mails/en/header_order_conf.html +++ b/mails/en/header_order_conf.html @@ -63,7 +63,7 @@
diff --git a/mails/en/in_transit.html b/mails/en/in_transit.html index 594b31183..6c5318515 100644 --- a/mails/en/in_transit.html +++ b/mails/en/in_transit.html @@ -61,7 +61,7 @@
@@ -88,7 +88,7 @@ Order {order_name} - In transit

Your order with the reference {order_name} is currently in transit.

- You can track your package using the following link: {followup} + You can track your package using the following link: {followup}
@@ -104,7 +104,7 @@ @@ -112,7 +112,7 @@ @@ -122,7 +122,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 website. + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
diff --git a/mails/en/log_alert.html b/mails/en/log_alert.html index 1a77ff503..13766029f 100644 --- a/mails/en/log_alert.html +++ b/mails/en/log_alert.html @@ -61,7 +61,7 @@ @@ -102,7 +102,7 @@
diff --git a/mails/en/newsletter.html b/mails/en/newsletter.html index 16e34da6a..062b6e17b 100644 --- a/mails/en/newsletter.html +++ b/mails/en/newsletter.html @@ -61,7 +61,7 @@ @@ -83,7 +83,7 @@
diff --git a/mails/en/order_canceled.html b/mails/en/order_canceled.html index 6b8af18f2..ed7045329 100644 --- a/mails/en/order_canceled.html +++ b/mails/en/order_canceled.html @@ -61,7 +61,7 @@ @@ -85,7 +85,7 @@ @@ -147,7 +147,7 @@ @@ -157,7 +157,7 @@

- Order canceled - {order_name} + Order canceled - {order_name}

Your order with the reference {order_name} from {shop_name} has been canceled.
@@ -139,7 +139,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 website. + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
diff --git a/mails/en/order_changed.html b/mails/en/order_changed.html index 3c9205457..bf5703e10 100644 --- a/mails/en/order_changed.html +++ b/mails/en/order_changed.html @@ -61,7 +61,7 @@ @@ -102,7 +102,7 @@ @@ -110,7 +110,7 @@ @@ -120,7 +120,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 website. + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
diff --git a/mails/en/order_conf.html b/mails/en/order_conf.html index 1f701f139..188ff5e9a 100755 --- a/mails/en/order_conf.html +++ b/mails/en/order_conf.html @@ -63,7 +63,7 @@ @@ -351,7 +351,7 @@ @@ -359,7 +359,7 @@ @@ -369,7 +369,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 website. + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
diff --git a/mails/en/order_conf_admin.html b/mails/en/order_conf_admin.html index c6e2a41a1..09e4d6937 100755 --- a/mails/en/order_conf_admin.html +++ b/mails/en/order_conf_admin.html @@ -63,7 +63,7 @@ @@ -336,7 +336,7 @@
diff --git a/mails/en/order_customer_comment.html b/mails/en/order_customer_comment.html index dfb5202cb..83cb0223e 100644 --- a/mails/en/order_customer_comment.html +++ b/mails/en/order_customer_comment.html @@ -61,7 +61,7 @@ @@ -104,7 +104,7 @@
diff --git a/mails/en/order_merchant_comment.html b/mails/en/order_merchant_comment.html index 25e523a91..941533196 100644 --- a/mails/en/order_merchant_comment.html +++ b/mails/en/order_merchant_comment.html @@ -61,7 +61,7 @@ @@ -103,7 +103,7 @@
diff --git a/mails/en/order_refund_completed_admin.html b/mails/en/order_refund_completed_admin.html index 8d46587e4..e9511e78f 100755 --- a/mails/en/order_refund_completed_admin.html +++ b/mails/en/order_refund_completed_admin.html @@ -63,7 +63,7 @@ @@ -144,7 +144,7 @@
diff --git a/mails/en/order_refund_completed_customer.html b/mails/en/order_refund_completed_customer.html index 00e2b81fc..fb34b7f7d 100755 --- a/mails/en/order_refund_completed_customer.html +++ b/mails/en/order_refund_completed_customer.html @@ -63,7 +63,7 @@ @@ -127,7 +127,7 @@ @@ -137,7 +137,7 @@
- You can review your booking cancelation requests from the "Booking Refund Requests" section of your customer account by clicking "My account". + You can review your booking cancelation requests from the "Booking Refund Requests" section of your customer account by clicking "My account".
diff --git a/mails/en/order_refund_denied_admin.html b/mails/en/order_refund_denied_admin.html index 4a16973d2..31bc56282 100755 --- a/mails/en/order_refund_denied_admin.html +++ b/mails/en/order_refund_denied_admin.html @@ -63,7 +63,7 @@ @@ -141,7 +141,7 @@
diff --git a/mails/en/order_refund_denied_customer.html b/mails/en/order_refund_denied_customer.html index 9d4fd6822..647d87e1a 100755 --- a/mails/en/order_refund_denied_customer.html +++ b/mails/en/order_refund_denied_customer.html @@ -63,7 +63,7 @@ @@ -124,7 +124,7 @@ @@ -134,7 +134,7 @@
- You can review your booking cancelation requests from the "Booking Refund Requests" section of your customer account by clicking "My account". + You can review your booking cancelation requests from the "Booking Refund Requests" section of your customer account by clicking "My account".
diff --git a/mails/en/order_refund_pending_admin.html b/mails/en/order_refund_pending_admin.html index 3c5a93547..8e9316723 100755 --- a/mails/en/order_refund_pending_admin.html +++ b/mails/en/order_refund_pending_admin.html @@ -63,7 +63,7 @@ @@ -142,7 +142,7 @@
diff --git a/mails/en/order_refund_pending_customer.html b/mails/en/order_refund_pending_customer.html index 82fa782a6..8d284d28c 100755 --- a/mails/en/order_refund_pending_customer.html +++ b/mails/en/order_refund_pending_customer.html @@ -63,7 +63,7 @@ @@ -124,7 +124,7 @@ @@ -134,7 +134,7 @@
- You can review your booking cancelation requests from the "Booking Refund Requests" section of your customer account by clicking "My account". + You can review your booking cancelation requests from the "Booking Refund Requests" section of your customer account by clicking "My account".
diff --git a/mails/en/order_return_state.html b/mails/en/order_return_state.html index a313e0dd1..fd3de585a 100644 --- a/mails/en/order_return_state.html +++ b/mails/en/order_return_state.html @@ -61,7 +61,7 @@ @@ -104,7 +104,7 @@ @@ -114,7 +114,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 website. + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
diff --git a/mails/en/overbooking.html b/mails/en/overbooking.html index 4fc0e43c6..d6087da85 100755 --- a/mails/en/overbooking.html +++ b/mails/en/overbooking.html @@ -63,7 +63,7 @@ @@ -351,7 +351,7 @@ @@ -359,7 +359,7 @@ @@ -369,7 +369,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.
- 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/overbooking_admin.html b/mails/en/overbooking_admin.html index 505142081..e00f822dd 100755 --- a/mails/en/overbooking_admin.html +++ b/mails/en/overbooking_admin.html @@ -63,7 +63,7 @@ @@ -341,7 +341,7 @@
diff --git a/mails/en/password.html b/mails/en/password.html index b3721eef5..15409e37d 100644 --- a/mails/en/password.html +++ b/mails/en/password.html @@ -61,7 +61,7 @@ @@ -104,7 +104,7 @@ @@ -112,7 +112,7 @@ @@ -122,7 +122,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 website. + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
diff --git a/mails/en/password_query.html b/mails/en/password_query.html index 2364b606e..3a9071826 100644 --- a/mails/en/password_query.html +++ b/mails/en/password_query.html @@ -61,7 +61,7 @@ @@ -89,7 +89,7 @@ You have requested to reset your {shop_name} login details.

Please note that this will change your current password.

- To confirm this action, please use the following link:
{url} + To confirm this action, please use the following link:
{url}
@@ -104,7 +104,7 @@
diff --git a/mails/en/payment_accepted.html b/mails/en/payment_accepted.html index e0f738fcd..e24700a11 100644 --- a/mails/en/payment_accepted.html +++ b/mails/en/payment_accepted.html @@ -61,7 +61,7 @@ @@ -104,7 +104,7 @@ @@ -112,7 +112,7 @@ @@ -122,7 +122,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 website. + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
diff --git a/mails/en/payment_error.html b/mails/en/payment_error.html index c4af52612..f2fd29139 100644 --- a/mails/en/payment_error.html +++ b/mails/en/payment_error.html @@ -61,7 +61,7 @@ @@ -105,7 +105,7 @@ @@ -113,7 +113,7 @@ @@ -123,7 +123,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 website. + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
diff --git a/mails/en/processing.html b/mails/en/processing.html index 695a8e484..de01bd0ab 100644 --- a/mails/en/processing.html +++ b/mails/en/processing.html @@ -61,7 +61,7 @@ @@ -103,7 +103,7 @@ @@ -111,7 +111,7 @@ @@ -121,7 +121,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 website. + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
diff --git a/mails/en/refund.html b/mails/en/refund.html index aa55b592f..5004f8183 100644 --- a/mails/en/refund.html +++ b/mails/en/refund.html @@ -61,7 +61,7 @@ @@ -103,7 +103,7 @@ @@ -111,7 +111,7 @@ @@ -121,7 +121,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 website. + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
diff --git a/mails/en/reply_msg.html b/mails/en/reply_msg.html index f89dfd5f1..b26a5a41d 100644 --- a/mails/en/reply_msg.html +++ b/mails/en/reply_msg.html @@ -61,7 +61,7 @@ @@ -87,7 +87,7 @@ @@ -96,7 +96,7 @@
Please do not reply directly to this email, we will not receive it.
- In order to reply, please use the following link: {link}
+ In order to reply, please use the following link: {link}
diff --git a/mails/en/shipped.html b/mails/en/shipped.html index 214d45f0b..f0e3c9a5e 100644 --- a/mails/en/shipped.html +++ b/mails/en/shipped.html @@ -61,7 +61,7 @@ @@ -100,7 +100,7 @@ @@ -109,7 +109,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 website. + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
diff --git a/mails/en/test.html b/mails/en/test.html index 9487d832b..a421f131d 100644 --- a/mails/en/test.html +++ b/mails/en/test.html @@ -61,7 +61,7 @@ @@ -88,7 +88,7 @@
diff --git a/mails/en/voucher.html b/mails/en/voucher.html index 6175a08e5..5be2a4031 100644 --- a/mails/en/voucher.html +++ b/mails/en/voucher.html @@ -61,7 +61,7 @@ @@ -103,7 +103,7 @@
diff --git a/mails/en/voucher_new.html b/mails/en/voucher_new.html index 8b34c5249..634666db7 100644 --- a/mails/en/voucher_new.html +++ b/mails/en/voucher_new.html @@ -61,7 +61,7 @@ @@ -102,7 +102,7 @@
diff --git a/modules/blocknewsletter/mails/ag/newsletter_conf.html b/modules/blocknewsletter/mails/ag/newsletter_conf.html index fbe0760b7..2198b2c2a 100644 --- a/modules/blocknewsletter/mails/ag/newsletter_conf.html +++ b/modules/blocknewsletter/mails/ag/newsletter_conf.html @@ -61,7 +61,7 @@ @@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/ag/newsletter_verif.html b/modules/blocknewsletter/mails/ag/newsletter_verif.html index a952c3ced..d358c86c0 100644 --- a/modules/blocknewsletter/mails/ag/newsletter_verif.html +++ b/modules/blocknewsletter/mails/ag/newsletter_verif.html @@ -61,7 +61,7 @@ @@ -86,7 +86,7 @@ Gracias por suscribirse a nuestro boletín de noticias, confirmar su solicitud haciendo clic en enlace de té abajo:
- {verif_url} + {verif_url}
@@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/ag/newsletter_voucher.html b/modules/blocknewsletter/mails/ag/newsletter_voucher.html index 2ecbd685c..5cd1ceba3 100644 --- a/modules/blocknewsletter/mails/ag/newsletter_voucher.html +++ b/modules/blocknewsletter/mails/ag/newsletter_voucher.html @@ -61,7 +61,7 @@ @@ -102,7 +102,7 @@
diff --git a/modules/blocknewsletter/mails/ar/newsletter_conf.html b/modules/blocknewsletter/mails/ar/newsletter_conf.html index ff868f9a0..17047e47a 100644 --- a/modules/blocknewsletter/mails/ar/newsletter_conf.html +++ b/modules/blocknewsletter/mails/ar/newsletter_conf.html @@ -61,7 +61,7 @@ @@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/ar/newsletter_verif.html b/modules/blocknewsletter/mails/ar/newsletter_verif.html index 484b9fc93..5bc51ff37 100644 --- a/modules/blocknewsletter/mails/ar/newsletter_verif.html +++ b/modules/blocknewsletter/mails/ar/newsletter_verif.html @@ -61,7 +61,7 @@ @@ -86,7 +86,7 @@ شكرا لك لانضمامك الى خدمة الرسائل الاخبارية، الرجاء تأكيد طلب الانضمام الى الخدمة من خلال الضعط على الرابط التالي:
- {verif_url} + {verif_url}
@@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/ar/newsletter_voucher.html b/modules/blocknewsletter/mails/ar/newsletter_voucher.html index c70980924..886afb232 100644 --- a/modules/blocknewsletter/mails/ar/newsletter_voucher.html +++ b/modules/blocknewsletter/mails/ar/newsletter_voucher.html @@ -61,7 +61,7 @@ @@ -102,7 +102,7 @@
diff --git a/modules/blocknewsletter/mails/bg/newsletter_conf.html b/modules/blocknewsletter/mails/bg/newsletter_conf.html index 793781cc2..a4182dc5e 100644 --- a/modules/blocknewsletter/mails/bg/newsletter_conf.html +++ b/modules/blocknewsletter/mails/bg/newsletter_conf.html @@ -61,7 +61,7 @@ @@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/bg/newsletter_verif.html b/modules/blocknewsletter/mails/bg/newsletter_verif.html index 0145480f1..07174d0b3 100644 --- a/modules/blocknewsletter/mails/bg/newsletter_verif.html +++ b/modules/blocknewsletter/mails/bg/newsletter_verif.html @@ -61,7 +61,7 @@ @@ -86,7 +86,7 @@ Благодарим Ви, че се абонирахте за нашият бюлетин, моля потвърдете Вашето желание с линка по-долу:
- {verif_url} + {verif_url}
@@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/bg/newsletter_voucher.html b/modules/blocknewsletter/mails/bg/newsletter_voucher.html index d4391a314..baa015f3a 100644 --- a/modules/blocknewsletter/mails/bg/newsletter_voucher.html +++ b/modules/blocknewsletter/mails/bg/newsletter_voucher.html @@ -61,7 +61,7 @@ @@ -102,7 +102,7 @@
diff --git a/modules/blocknewsletter/mails/br/newsletter_conf.html b/modules/blocknewsletter/mails/br/newsletter_conf.html index 65182a377..555602d13 100644 --- a/modules/blocknewsletter/mails/br/newsletter_conf.html +++ b/modules/blocknewsletter/mails/br/newsletter_conf.html @@ -61,7 +61,7 @@ @@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/br/newsletter_verif.html b/modules/blocknewsletter/mails/br/newsletter_verif.html index 699ac1686..d97ae1cb9 100644 --- a/modules/blocknewsletter/mails/br/newsletter_verif.html +++ b/modules/blocknewsletter/mails/br/newsletter_verif.html @@ -61,7 +61,7 @@ @@ -86,7 +86,7 @@ Obrigado por se cadastrar na nossa newsletter, por favor confirme sua solicitação clicando no link abaixo:
- {verif_url} + {verif_url}
@@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/br/newsletter_voucher.html b/modules/blocknewsletter/mails/br/newsletter_voucher.html index f64be61bb..0e78bc860 100644 --- a/modules/blocknewsletter/mails/br/newsletter_voucher.html +++ b/modules/blocknewsletter/mails/br/newsletter_voucher.html @@ -61,7 +61,7 @@ @@ -102,7 +102,7 @@
diff --git a/modules/blocknewsletter/mails/ca/newsletter_conf.html b/modules/blocknewsletter/mails/ca/newsletter_conf.html index 73255ea90..f9fcc9afe 100644 --- a/modules/blocknewsletter/mails/ca/newsletter_conf.html +++ b/modules/blocknewsletter/mails/ca/newsletter_conf.html @@ -61,7 +61,7 @@ @@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/ca/newsletter_verif.html b/modules/blocknewsletter/mails/ca/newsletter_verif.html index 3f59de622..f09df0bd0 100644 --- a/modules/blocknewsletter/mails/ca/newsletter_verif.html +++ b/modules/blocknewsletter/mails/ca/newsletter_verif.html @@ -61,7 +61,7 @@ @@ -86,7 +86,7 @@ Gràcies per subscriure-us al nostre butlletí, si us plau confirmeu la petició fent clic sobre l'enllaç de sota:
- {verif_url} + {verif_url}
@@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/ca/newsletter_voucher.html b/modules/blocknewsletter/mails/ca/newsletter_voucher.html index 93405054c..10febaa3a 100644 --- a/modules/blocknewsletter/mails/ca/newsletter_voucher.html +++ b/modules/blocknewsletter/mails/ca/newsletter_voucher.html @@ -61,7 +61,7 @@ @@ -102,7 +102,7 @@
diff --git a/modules/blocknewsletter/mails/de/newsletter_conf.html b/modules/blocknewsletter/mails/de/newsletter_conf.html index f4a5e86b0..6ba8f8c94 100644 --- a/modules/blocknewsletter/mails/de/newsletter_conf.html +++ b/modules/blocknewsletter/mails/de/newsletter_conf.html @@ -61,7 +61,7 @@ @@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/de/newsletter_verif.html b/modules/blocknewsletter/mails/de/newsletter_verif.html index e92c98552..45e3e0b54 100644 --- a/modules/blocknewsletter/mails/de/newsletter_verif.html +++ b/modules/blocknewsletter/mails/de/newsletter_verif.html @@ -61,7 +61,7 @@ @@ -86,7 +86,7 @@ Sie haben sich soeben für unseren Newsletter angemeldet. Bitte bestätigen Sie Ihre Anmeldung durch Klick auf den folgenden Link:
- {verif_url} + {verif_url}
@@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/de/newsletter_voucher.html b/modules/blocknewsletter/mails/de/newsletter_voucher.html index 4f7dd65ed..038dc2dfe 100644 --- a/modules/blocknewsletter/mails/de/newsletter_voucher.html +++ b/modules/blocknewsletter/mails/de/newsletter_voucher.html @@ -61,7 +61,7 @@ @@ -102,7 +102,7 @@
diff --git a/modules/blocknewsletter/mails/en/newsletter_conf.html b/modules/blocknewsletter/mails/en/newsletter_conf.html index a5de1a2d8..bc1c10e07 100644 --- a/modules/blocknewsletter/mails/en/newsletter_conf.html +++ b/modules/blocknewsletter/mails/en/newsletter_conf.html @@ -61,7 +61,7 @@ @@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/en/newsletter_verif.html b/modules/blocknewsletter/mails/en/newsletter_verif.html index 8b4281ea7..983cb2697 100644 --- a/modules/blocknewsletter/mails/en/newsletter_verif.html +++ b/modules/blocknewsletter/mails/en/newsletter_verif.html @@ -61,7 +61,7 @@ @@ -86,7 +86,7 @@ Thank you for subscribing to our newsletter, please confirm your request by clicking the link below :
- {verif_url} + {verif_url}
@@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/en/newsletter_voucher.html b/modules/blocknewsletter/mails/en/newsletter_voucher.html index cb8e3db1e..d4d3ef7e6 100644 --- a/modules/blocknewsletter/mails/en/newsletter_voucher.html +++ b/modules/blocknewsletter/mails/en/newsletter_voucher.html @@ -61,7 +61,7 @@ @@ -102,7 +102,7 @@
diff --git a/modules/blocknewsletter/mails/es/newsletter_conf.html b/modules/blocknewsletter/mails/es/newsletter_conf.html index fbe0760b7..2198b2c2a 100644 --- a/modules/blocknewsletter/mails/es/newsletter_conf.html +++ b/modules/blocknewsletter/mails/es/newsletter_conf.html @@ -61,7 +61,7 @@ @@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/es/newsletter_verif.html b/modules/blocknewsletter/mails/es/newsletter_verif.html index a952c3ced..d358c86c0 100644 --- a/modules/blocknewsletter/mails/es/newsletter_verif.html +++ b/modules/blocknewsletter/mails/es/newsletter_verif.html @@ -61,7 +61,7 @@ @@ -86,7 +86,7 @@ Gracias por suscribirse a nuestro boletín de noticias, confirmar su solicitud haciendo clic en enlace de té abajo:
- {verif_url} + {verif_url}
@@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/es/newsletter_voucher.html b/modules/blocknewsletter/mails/es/newsletter_voucher.html index 2ecbd685c..5cd1ceba3 100644 --- a/modules/blocknewsletter/mails/es/newsletter_voucher.html +++ b/modules/blocknewsletter/mails/es/newsletter_voucher.html @@ -61,7 +61,7 @@ @@ -102,7 +102,7 @@
diff --git a/modules/blocknewsletter/mails/fr/newsletter_conf.html b/modules/blocknewsletter/mails/fr/newsletter_conf.html index 79d43ea4b..eeb9462fd 100644 --- a/modules/blocknewsletter/mails/fr/newsletter_conf.html +++ b/modules/blocknewsletter/mails/fr/newsletter_conf.html @@ -61,7 +61,7 @@ @@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/fr/newsletter_verif.html b/modules/blocknewsletter/mails/fr/newsletter_verif.html index 800f50df2..d2e841eea 100644 --- a/modules/blocknewsletter/mails/fr/newsletter_verif.html +++ b/modules/blocknewsletter/mails/fr/newsletter_verif.html @@ -61,7 +61,7 @@ @@ -86,7 +86,7 @@ Merci de vous être inscrit à notre newsletter, veuillez confirmer votre inscription en cliquant sur le lien ci-dessous :
- {verif_url} + {verif_url}
@@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/fr/newsletter_voucher.html b/modules/blocknewsletter/mails/fr/newsletter_voucher.html index 08daeeccf..7558ce3a1 100644 --- a/modules/blocknewsletter/mails/fr/newsletter_voucher.html +++ b/modules/blocknewsletter/mails/fr/newsletter_voucher.html @@ -61,7 +61,7 @@ @@ -102,7 +102,7 @@
diff --git a/modules/blocknewsletter/mails/gl/newsletter_conf.html b/modules/blocknewsletter/mails/gl/newsletter_conf.html index a5de1a2d8..bc1c10e07 100644 --- a/modules/blocknewsletter/mails/gl/newsletter_conf.html +++ b/modules/blocknewsletter/mails/gl/newsletter_conf.html @@ -61,7 +61,7 @@ @@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/gl/newsletter_verif.html b/modules/blocknewsletter/mails/gl/newsletter_verif.html index 8b4281ea7..983cb2697 100644 --- a/modules/blocknewsletter/mails/gl/newsletter_verif.html +++ b/modules/blocknewsletter/mails/gl/newsletter_verif.html @@ -61,7 +61,7 @@ @@ -86,7 +86,7 @@ Thank you for subscribing to our newsletter, please confirm your request by clicking the link below :
- {verif_url} + {verif_url}
@@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/gl/newsletter_voucher.html b/modules/blocknewsletter/mails/gl/newsletter_voucher.html index cb8e3db1e..d4d3ef7e6 100644 --- a/modules/blocknewsletter/mails/gl/newsletter_voucher.html +++ b/modules/blocknewsletter/mails/gl/newsletter_voucher.html @@ -61,7 +61,7 @@ @@ -102,7 +102,7 @@
diff --git a/modules/blocknewsletter/mails/id/newsletter_conf.html b/modules/blocknewsletter/mails/id/newsletter_conf.html index 67d88e810..d07aa9d67 100644 --- a/modules/blocknewsletter/mails/id/newsletter_conf.html +++ b/modules/blocknewsletter/mails/id/newsletter_conf.html @@ -61,7 +61,7 @@ @@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/id/newsletter_verif.html b/modules/blocknewsletter/mails/id/newsletter_verif.html index 1dd4d302c..6c2310294 100644 --- a/modules/blocknewsletter/mails/id/newsletter_verif.html +++ b/modules/blocknewsletter/mails/id/newsletter_verif.html @@ -61,7 +61,7 @@ @@ -86,7 +86,7 @@ Terima kasih telah berlangganan newsletter, silahkan konfirmasi dengan klik pada tautan berikut :
- {verif_url} + {verif_url}
@@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/id/newsletter_voucher.html b/modules/blocknewsletter/mails/id/newsletter_voucher.html index 6ed00b777..da7e4e013 100644 --- a/modules/blocknewsletter/mails/id/newsletter_voucher.html +++ b/modules/blocknewsletter/mails/id/newsletter_voucher.html @@ -61,7 +61,7 @@ @@ -102,7 +102,7 @@
diff --git a/modules/blocknewsletter/mails/nl/newsletter_conf.html b/modules/blocknewsletter/mails/nl/newsletter_conf.html index ffda37f12..f3406490f 100644 --- a/modules/blocknewsletter/mails/nl/newsletter_conf.html +++ b/modules/blocknewsletter/mails/nl/newsletter_conf.html @@ -61,7 +61,7 @@ @@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/nl/newsletter_verif.html b/modules/blocknewsletter/mails/nl/newsletter_verif.html index a3ba18da4..7078e3ab7 100644 --- a/modules/blocknewsletter/mails/nl/newsletter_verif.html +++ b/modules/blocknewsletter/mails/nl/newsletter_verif.html @@ -61,7 +61,7 @@ @@ -86,7 +86,7 @@ Hartelijk dank voor uw inschrijving op onze nieuwsbrief. Bevestig uw aanvraag door te klikken op de volgende link:
- {verif_url} + {verif_url}
@@ -101,7 +101,7 @@
diff --git a/modules/blocknewsletter/mails/nl/newsletter_voucher.html b/modules/blocknewsletter/mails/nl/newsletter_voucher.html index 3b35d7189..62d182683 100644 --- a/modules/blocknewsletter/mails/nl/newsletter_voucher.html +++ b/modules/blocknewsletter/mails/nl/newsletter_voucher.html @@ -61,7 +61,7 @@ @@ -102,7 +102,7 @@
diff --git a/modules/qlohotelreview/mails/en/review_approve.html b/modules/qlohotelreview/mails/en/review_approve.html index a4dba3584..eff0f4fa4 100644 --- a/modules/qlohotelreview/mails/en/review_approve.html +++ b/modules/qlohotelreview/mails/en/review_approve.html @@ -186,7 +186,7 @@ @@ -235,7 +235,7 @@

- You can view your review from here. + You can view your review from here. @@ -251,7 +251,7 @@ @@ -260,7 +260,7 @@ @@ -272,7 +272,7 @@ diff --git a/modules/qlohotelreview/mails/en/review_reply_with_link.html b/modules/qlohotelreview/mails/en/review_reply_with_link.html index 86b8290c5..56de1edbc 100644 --- a/modules/qlohotelreview/mails/en/review_reply_with_link.html +++ b/modules/qlohotelreview/mails/en/review_reply_with_link.html @@ -186,7 +186,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 website. + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
@@ -242,7 +242,7 @@

- You can view your review from here. + You can view your review from here. @@ -258,7 +258,7 @@ @@ -267,7 +267,7 @@ @@ -279,7 +279,7 @@ diff --git a/modules/qlohotelreview/mails/en/review_reply_without_link.html b/modules/qlohotelreview/mails/en/review_reply_without_link.html index baecbbebb..5c3b9a84a 100644 --- a/modules/qlohotelreview/mails/en/review_reply_without_link.html +++ b/modules/qlohotelreview/mails/en/review_reply_without_link.html @@ -186,7 +186,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 website. + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
@@ -252,7 +252,7 @@ @@ -261,7 +261,7 @@ @@ -273,7 +273,7 @@ diff --git a/modules/qlohotelreview/mails/en/review_request.html b/modules/qlohotelreview/mails/en/review_request.html index 77a5b5c7a..60d1c5269 100644 --- a/modules/qlohotelreview/mails/en/review_request.html +++ b/modules/qlohotelreview/mails/en/review_request.html @@ -186,7 +186,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 website. + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
@@ -219,7 +219,7 @@ Please review us!

- Could you please take a moment to review us? Please review your stay at {hotel_name} by clicking here. + Could you please take a moment to review us? Please review your stay at {hotel_name} by clicking here. We would love to hear your feedback and use it to improve our services! @@ -236,7 +236,7 @@ @@ -245,7 +245,7 @@ @@ -257,7 +257,7 @@ From 933279f3dce5af38033fb75914a6bd9720f50752 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Wed, 1 May 2024 17:29:34 +0530 Subject: [PATCH 2/5] Fixed: Email subject from the contact mail and removed the order information --- controllers/front/ContactController.php | 2 +- mails/en/contact.html | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php index ba68dd08c..8900d20ec 100644 --- a/controllers/front/ContactController.php +++ b/controllers/front/ContactController.php @@ -196,7 +196,7 @@ class ContactControllerCore extends FrontController } if (!empty($contact->email)) { - if (!Mail::Send($this->context->language->id, 'contact', Mail::l('Message from contact form').' [no_sync]', + if (!Mail::Send($this->context->language->id, 'contact', Mail::l('Message from contact form'), $var_list, $contact->email, $contact->name, null, null, $file_attachment, null, _PS_MAIL_DIR_, false, null, null, $from)) { $this->errors[] = Tools::displayError('An error occurred while sending the message.'); diff --git a/mails/en/contact.html b/mails/en/contact.html index 2d8de950f..3ebbf35d5 100644 --- a/mails/en/contact.html +++ b/mails/en/contact.html @@ -87,7 +87,6 @@ Customer e-mail address: {email}

Customer message: {message}

- Order ID: {order_name}
Attached file: {attached_file}
From d33854eb38f1b2e9474c2dbf5a35370468d61c09 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Wed, 1 May 2024 17:35:24 +0530 Subject: [PATCH 3/5] Removed: Text related to shipment from the payment failed email --- mails/en/payment_error.html | 1 - mails/en/payment_error.txt | 2 -- 2 files changed, 3 deletions(-) diff --git a/mails/en/payment_error.html b/mails/en/payment_error.html index f2fd29139..ba3a129d7 100644 --- a/mails/en/payment_error.html +++ b/mails/en/payment_error.html @@ -88,7 +88,6 @@ Order {order_name} - Payment processing error

There is a problem with your payment for {shop_name} order with the reference {order_name}. Please contact us at your earliest convenience.
- We cannot ship your order until we receive your payment.
diff --git a/mails/en/payment_error.txt b/mails/en/payment_error.txt index af2b38851..619ffbb80 100644 --- a/mails/en/payment_error.txt +++ b/mails/en/payment_error.txt @@ -7,8 +7,6 @@ There is a problem with your payment for {shop_name} order with the reference {order_name}. Please contact us at your earliest convenience. -WE CANNOT SHIP YOUR ORDER UNTIL WE RECEIVE YOUR PAYMENT. - {extra_mail_content_txt} You can review your order and download your invoice from the From 373281c5b294509f4322ac95fb8a0235cf99e3b5 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 13 Aug 2024 10:08:16 +0530 Subject: [PATCH 4/5] updated the newly added/updated mail template files --- mails/en/account.html | 132 +++++++++--------- mails/en/partial_payment_accepted.html | 110 +++++++-------- .../mails/en/newsletter_conf.html | 60 ++++---- 3 files changed, 148 insertions(+), 154 deletions(-) diff --git a/mails/en/account.html b/mails/en/account.html index d4e5a77c9..c80631219 100644 --- a/mails/en/account.html +++ b/mails/en/account.html @@ -66,73 +66,71 @@ - -
- - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/mails/en/partial_payment_accepted.html b/mails/en/partial_payment_accepted.html index 45940907a..fc9b577e8 100644 --- a/mails/en/partial_payment_accepted.html +++ b/mails/en/partial_payment_accepted.html @@ -61,72 +61,70 @@
- You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
- - Hi {firstname} {lastname},
- Thank you for creating a customer account at {shop_name}. -
-
- - - - - - -
  - -

- Your {shop_name} login details

- - Here are your login details:
- E-mail address: {email}
-
-
-
 
-
- - - - - - -
  - -

Important Security Tips:

-
    -
  1. Always keep your account details safe.
  2. -
  3. Never disclose your login details to anyone.
  4. -
  5. Change your password regularly.
  6. -
  7. Should you suspect someone is using your account illegally, please notify us immediately.
  8. -
-
-
 
-
- - You can now place orders on our website: {shop_name} - -
+ + Hi {firstname} {lastname},
+ Thank you for creating a customer account at {shop_name}. +
+
+ + + + + + +
  + +

+ Your {shop_name} login details

+ + Here are your login details:
+ E-mail address: {email}
+
+
+
 
+
+ + + + + + +
  + +

Important Security Tips:

+
    +
  1. Always keep your account details safe.
  2. +
  3. Never disclose your login details to anyone.
  4. +
  5. Change your password regularly.
  6. +
  7. Should you suspect someone is using your account illegally, please notify us immediately.
  8. +
+
+
 
+
+ + You can now place orders on our website: {shop_name} + +
+ + + + + + + + + + + + + {extra_mail_content_html} + + + + + +
+ + Hi {firstname} {lastname},
+ Thank you for booking with {shop_name}! +
+
+ + + + - - - - - - - - - - - -{extra_mail_content_html} - - - - - - - + Total Booking Amount: {total_paid}

+ Partial Payment Amount: {advance_paid_amount}

+ Total Paid Amount: {total_paid_real}

+ + + + +
  + +

+ Order {order_name} - Payment processed

+ + Your payment for order with the reference {order_name} was successfully processed.

-
- - Hi {firstname} {lastname},
- Thank you for booking with {shop_name}! -
-
- - - - - - -
  - -

- Order {order_name} - Payment processed

- - Your payment for order with the reference {order_name} was successfully processed.

- - Total Booking Amount: {total_paid}

- Partial Payment Amount: {advance_paid_amount}

- Total Paid Amount: {total_paid_real}

-
-
 
-
- - - You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - -
- - - If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. - -
 
+
+ + + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. + +
+ + + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. + +
diff --git a/modules/blocknewsletter/mails/en/newsletter_conf.html b/modules/blocknewsletter/mails/en/newsletter_conf.html index b2241c32c..cff837649 100644 --- a/modules/blocknewsletter/mails/en/newsletter_conf.html +++ b/modules/blocknewsletter/mails/en/newsletter_conf.html @@ -66,37 +66,35 @@ - - - - - Hi, - - - - -   - - - - - - - - - -
  - - - - Thank you for subscribing to our newsletter! If you wish to unsubscribe, please click here. - - - -  
- - - + + + + Hi, + + + + +   + + + + + + + + + +
  + + + + Thank you for subscribing to our newsletter! If you wish to unsubscribe, please click here. + + + +  
+ +   From 17969f88d6f04526aa7ee3ef019c7f7d759798c2 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Wed, 9 Oct 2024 10:05:54 +0530 Subject: [PATCH 5/5] Added: target as blank in the tag for the updated emails after merge with develop --- mails/en/partial_payment_accepted.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mails/en/partial_payment_accepted.html b/mails/en/partial_payment_accepted.html index 1c1ef6c2f..1da613ba5 100644 --- a/mails/en/partial_payment_accepted.html +++ b/mails/en/partial_payment_accepted.html @@ -61,7 +61,7 @@