From 9a7af809439ad775d03f50f1d8c7bd5526b4919b Mon Sep 17 00:00:00 2001 From: Sarah Lorenzini Date: Wed, 23 Oct 2013 10:13:57 +0200 Subject: [PATCH] // update mail templates --- mails/en/src/account.php | 4 +-- mails/en/src/bankwire.php | 2 +- mails/en/src/cheque.php | 4 +-- mails/en/src/contact.php | 2 +- mails/en/src/credit_slip.php | 2 +- mails/en/src/employee_password.php | 2 +- mails/en/src/forward_msg.php | 2 +- mails/en/src/guest_to_customer.php | 2 +- mails/en/src/header.php | 4 +-- mails/en/src/in_transit.php | 2 +- mails/en/src/order_canceled.php | 2 +- mails/en/src/order_changed.php | 2 +- mails/en/src/order_customer_comment.php | 2 +- mails/en/src/order_merchant_comment.php | 2 +- mails/en/src/password_query.php | 2 +- mails/en/src/payment_error.php | 2 +- mails/en/src/refund.php | 34 +++++++++++++++++++++++++ mails/en/src/reply_msg.php | 28 ++++++++++++++++++++ mails/en/src/shipped.php | 30 ++++++++++++++++++++++ mails/en/src/test.php | 18 +++++++++++++ mails/en/src/voucher.php | 25 ++++++++++++++++++ mails/en/src/voucher_new.php | 23 +++++++++++++++++ 22 files changed, 177 insertions(+), 19 deletions(-) create mode 100644 mails/en/src/refund.php create mode 100644 mails/en/src/reply_msg.php create mode 100644 mails/en/src/shipped.php create mode 100644 mails/en/src/test.php create mode 100644 mails/en/src/voucher.php create mode 100644 mails/en/src/voucher_new.php diff --git a/mails/en/src/account.php b/mails/en/src/account.php index 3117492a0..057828130 100644 --- a/mails/en/src/account.php +++ b/mails/en/src/account.php @@ -17,8 +17,8 @@


- E-mail address: {email}'); ?>
- Password: {passwd}'); ?> + E-mail address: {email}'); ?>
+ Password: {passwd}'); ?> diff --git a/mails/en/src/bankwire.php b/mails/en/src/bankwire.php index b59de538f..1337e58f9 100644 --- a/mails/en/src/bankwire.php +++ b/mails/en/src/bankwire.php @@ -16,7 +16,7 @@

- shipped as soon as we receive your payment.'); ?> + {order_name} has been placed successfully and will be shipped as soon as we receive your payment.'); ?> diff --git a/mails/en/src/cheque.php b/mails/en/src/cheque.php index 6b43b71c2..6b766472f 100644 --- a/mails/en/src/cheque.php +++ b/mails/en/src/cheque.php @@ -16,7 +16,7 @@

- shipped as soon as we receive your payment.'); ?> + {order_name} has been placed successfully and will be shipped as soon as we receive your payment.'); ?> @@ -32,7 +32,7 @@
Amount: {total_paid}'); ?>
Payable to the order of: {cheque_name}'); ?>
- {cheque_address_html}'); ?> + Please mail your check to: {cheque_address_html}'); ?> diff --git a/mails/en/src/contact.php b/mails/en/src/contact.php index a5f904e76..0346561c1 100644 --- a/mails/en/src/contact.php +++ b/mails/en/src/contact.php @@ -15,7 +15,7 @@

- Customer e-mail address: {email}'); ?>

+ Customer e-mail address: {email}'); ?>

Customer message: {message}'); ?>

Order ID: {order_name}'); ?>
Attached file: {attached_file}'); ?> diff --git a/mails/en/src/credit_slip.php b/mails/en/src/credit_slip.php index cbbb5a401..728eae627 100644 --- a/mails/en/src/credit_slip.php +++ b/mails/en/src/credit_slip.php @@ -15,7 +15,7 @@

- + {order_name}.'); ?> diff --git a/mails/en/src/employee_password.php b/mails/en/src/employee_password.php index d6da77e2e..7909a28c1 100644 --- a/mails/en/src/employee_password.php +++ b/mails/en/src/employee_password.php @@ -15,7 +15,7 @@

-
+ {shop_name}:'); ?>
First name: {firstname}'); ?>
Last name: {lastname}'); ?>
Password: {passwd}'); ?>
diff --git a/mails/en/src/forward_msg.php b/mails/en/src/forward_msg.php index e4396f16c..5e4f2323e 100644 --- a/mails/en/src/forward_msg.php +++ b/mails/en/src/forward_msg.php @@ -15,7 +15,7 @@

-

+ {employee} wanted to forward this discussion to you.'); ?>

Discussion history: {messages}'); ?>

{employee} added "{comment}"'); ?> diff --git a/mails/en/src/guest_to_customer.php b/mails/en/src/guest_to_customer.php index affc55333..d03af905c 100644 --- a/mails/en/src/guest_to_customer.php +++ b/mails/en/src/guest_to_customer.php @@ -15,7 +15,7 @@

-

+ {shop_name} has been transformed into a customer account.'); ?>

E-mail address: {email}'); ?>

Password: {passwd}'); ?> diff --git a/mails/en/src/header.php b/mails/en/src/header.php index 330bdb844..5deae05e9 100644 --- a/mails/en/src/header.php +++ b/mails/en/src/header.php @@ -11,8 +11,8 @@ function t($str) <?php echo t('Message from {shop_name}'); ?> - - + + diff --git a/mails/en/src/in_transit.php b/mails/en/src/in_transit.php index 96e93fffd..9758ddeb1 100644 --- a/mails/en/src/in_transit.php +++ b/mails/en/src/in_transit.php @@ -15,7 +15,7 @@

-

+ {order_name} is currently in transit.'); ?>

{followup}'); ?> diff --git a/mails/en/src/order_canceled.php b/mails/en/src/order_canceled.php index 302cdbf86..26311ced8 100644 --- a/mails/en/src/order_canceled.php +++ b/mails/en/src/order_canceled.php @@ -15,7 +15,7 @@

-
+ {order_name} from {shop_name} has been cancelled.'); ?>
"Tools" > "Logs" section of your Back Office.'); ?> diff --git a/mails/en/src/order_changed.php b/mails/en/src/order_changed.php index f25af032c..63c0b732f 100644 --- a/mails/en/src/order_changed.php +++ b/mails/en/src/order_changed.php @@ -15,7 +15,7 @@

-
+ {order_name} from {shop_name} has been changed by the merchant.'); ?>
"Tools" > "Logs" section of your Back Office.'); ?> diff --git a/mails/en/src/order_customer_comment.php b/mails/en/src/order_customer_comment.php index b6a42ffda..624e4d664 100644 --- a/mails/en/src/order_customer_comment.php +++ b/mails/en/src/order_customer_comment.php @@ -15,7 +15,7 @@

-

+ {order_name}.'); ?>

Customer: {firstname} {lastname} ({email})'); ?>

diff --git a/mails/en/src/order_merchant_comment.php b/mails/en/src/order_merchant_comment.php index 3d3601b88..0471c94af 100644 --- a/mails/en/src/order_merchant_comment.php +++ b/mails/en/src/order_merchant_comment.php @@ -15,7 +15,7 @@

-

+ {shop_name} regarding order with the reference {order_name}.'); ?>

Message: {message}'); ?> diff --git a/mails/en/src/password_query.php b/mails/en/src/password_query.php index c5cff7d69..43416937f 100644 --- a/mails/en/src/password_query.php +++ b/mails/en/src/password_query.php @@ -15,7 +15,7 @@

-

+ {shop_name} login details.'); ?>



{url}'); ?> diff --git a/mails/en/src/payment_error.php b/mails/en/src/payment_error.php index a2af258a7..0e3f0b5c6 100644 --- a/mails/en/src/payment_error.php +++ b/mails/en/src/payment_error.php @@ -15,7 +15,7 @@

- {shop_name} order with the reference {order_name}. Please contact us at your earliest convenience.'); ?>
+ {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/src/refund.php b/mails/en/src/refund.php new file mode 100644 index 000000000..ab836a258 --- /dev/null +++ b/mails/en/src/refund.php @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/mails/en/src/reply_msg.php b/mails/en/src/reply_msg.php new file mode 100644 index 000000000..bd079cb87 --- /dev/null +++ b/mails/en/src/reply_msg.php @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + diff --git a/mails/en/src/shipped.php b/mails/en/src/shipped.php new file mode 100644 index 000000000..3bbc27cc9 --- /dev/null +++ b/mails/en/src/shipped.php @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + diff --git a/mails/en/src/test.php b/mails/en/src/test.php new file mode 100644 index 000000000..db40019c7 --- /dev/null +++ b/mails/en/src/test.php @@ -0,0 +1,18 @@ + + + + + + + + + + + + + diff --git a/mails/en/src/voucher.php b/mails/en/src/voucher.php new file mode 100644 index 000000000..26b586fb2 --- /dev/null +++ b/mails/en/src/voucher.php @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/mails/en/src/voucher_new.php b/mails/en/src/voucher_new.php new file mode 100644 index 000000000..a81432c6e --- /dev/null +++ b/mails/en/src/voucher_new.php @@ -0,0 +1,23 @@ + + + + + + + + + + + + + \ No newline at end of file
+ Hi {firstname} {lastname},'); + ?> +
 
+

+ +

+ + {shop_name} refund for order with the reference {order_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 a guest account, you can follow your order via the "Guest Tracking" section on our shop.'); ?> +
+ Hi {firstname} {lastname},'); + ?> +
 
+ {reply}'); ?> +
+ Please do not reply to this message, we will not receive it.'); ?> +
+ In order to reply, please use the following link: {link}.'); ?> +
+ Hi {firstname} {lastname},
+ Thank you for shopping with {shop_name}!'); + ?> +
 
+

+ +

+ + {order_name} has been shipped.'); ?>
+ + +
+ You can now place orders on our shop: {shop_name}'); ?>. +
+ Hello,'); + ?> +
 
+ This is a test e-mail from your shop.

If you can read this, the test was successful!'); ?>. +
+ Hi {firstname} {lastname},'); + ?> +
 
+

+ +

+ + {order_name}.'); ?>

+ Voucher code: {voucher_num} in the amount of {voucher_amount}'); ?>

+ + +
+ Hi {firstname} {lastname},'); + ?> +
 
+

+ +

+ + {voucher_num}'); ?>

+ +