dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bootstrap' of https://github.com/djfm/PrestaShop into bootstrap

Browse Source
This commit is contained in:
djfm
2013-11-07 10:02:24 +00:00
parent 3d22303b90 1aadb10fb2
commit 8ef9064355
72 changed files with 179 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mails/en/account.html
+1 -1
View File
@@ -87,7 +87,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Your {shop_name} login details </p>
<span style="color:#777">
Here are your login details:<br />
mails/en/account.txt
+3 -3
View File
@@ -5,13 +5,13 @@ Hi {firstname} {lastname},
Thank you for creating a customer account at {shop_name}.
Your {shop_name} login details Here are your login details:
Here are your login details:
E-MAIL ADDRESS: {EMAIL}
E-MAIL ADDRESS: {email}
PASSWORD: {passwd}
Important Security Tips:
Important Security Tips:
* Always keep your account details safe.
mails/en/backoffice_order.txt
+4 -3
View File
@@ -3,9 +3,10 @@
Hi {firstname} {lastname},
A new order has been generated on your behalf. Please go on
{order_link} [{order_link}] to finalize the
payment.
A new order has been generated on your behalf.
Please go on {order_link} [{order_link}] to
finalize the payment.
{shop_name} [{shop_url}] powered by
PrestaShop(tm) [http://www.prestashop.com/]
mails/en/bankwire.html
+1 -1
View File
@@ -87,7 +87,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Order {order_name}&nbsp;-&nbsp;Awaiting wire payment
</p>
<span style="color:#777">
mails/en/bankwire.txt
+5 -5
View File
@@ -5,12 +5,12 @@ Hi {firstname} {lastname},
Thank you for shopping with {shop_name}!
Order {order_name} - Awaiting wire payment Your order with the
reference {ORDER_NAME} has been placed successfully and will be
SHIPPED AS SOON AS WE RECEIVE YOUR PAYMENT.
Your order with the reference {order_name} has been placed
successfully and will be SHIPPED AS SOON AS WE RECEIVE YOUR PAYMENT.
You have selected to pay by wire transfer. Here are the bank details
for your transfer:
You have selected to pay by wire transfer.
Here are the bank details for your transfer:
AMOUNT: {total_paid}
mails/en/cheque.html
+1 -1
View File
@@ -87,7 +87,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Order {order_name}&nbsp;-&nbsp;Awaiting check payment </p>
<span style="color:#777">
Your order with the reference <span style="color:#333"><strong>{order_name}</strong></span> has been placed successfully and will be <strong>shipped as soon as we receive your payment</strong>. </span>
mails/en/cheque.txt
+5 -5
View File
@@ -5,12 +5,12 @@ Hi {firstname} {lastname},
Thank you for shopping with {shop_name}!
Order {order_name} - Awaiting check payment Your order with the
reference {ORDER_NAME} has been placed successfully and will be
SHIPPED AS SOON AS WE RECEIVE YOUR PAYMENT.
Your order with the reference {order_name} has been placed
successfully and will be SHIPPED AS SOON AS WE RECEIVE YOUR PAYMENT.
You have selected to pay by check. Here are the bank details for your
check:
You have selected to pay by check.
Here are the bank details for your check:
AMOUNT: {total_paid}
mails/en/contact.txt
+3 -1
View File
@@ -3,7 +3,9 @@
Hi {firstname} {lastname},
Message from a {shop_name} customer CUSTOMER E-MAIL ADDRESS: {EMAIL}
Message from a {shop_name} customer
CUSTOMER E-MAIL ADDRESS: {email}
CUSTOMER MESSAGE: {message}
mails/en/contact_form.html
+1 -1
View File
@@ -86,7 +86,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Your message to {shop_name} Customer Service </p>
<span style="color:#777">
Your message has been sent successfully.<br /><br />
mails/en/contact_form.txt
+1 -2
View File
@@ -3,8 +3,7 @@
Hi {firstname} {lastname},
Your message to {shop_name} Customer Service Your message has been
sent successfully.
Your message has been sent successfully.
MESSAGE: {message}
mails/en/credit_slip.html
+1 -1
View File
@@ -86,7 +86,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Order {order_name}&nbsp;-&nbsp;Credit slip created </p>
<span style="color:#777">
We have generated a credit slip in your name for order with the reference <span style="color:#333"><strong>{order_name}</strong></span>. </span>
mails/en/credit_slip.txt
+2 -2
View File
@@ -3,8 +3,8 @@
Hi {firstname} {lastname},
Order {order_name} - Credit slip created We have generated a credit
slip in your name for order with the reference {ORDER_NAME}.
We have generated a credit slip in your name for order with the
reference {order_name}.
You can review this credit slip and download your invoice from the
"My credit slips" [{history_url}] section of your
mails/en/download_product.html
+1 -1
View File
@@ -87,7 +87,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Product(s) now available for download </p>
<span style="color:#777">
You have <span style="color:#333"><strong>{nbProducts}</strong></span> product(s) now available for download using the following link(s):<br/><br/>
mails/en/download_product.txt
+4 -4
View File
@@ -4,12 +4,12 @@
Hi {firstname} {lastname},
Thank you for your order with the reference {order_name} from
{SHOP_NAME}
{shop_name}
Product(s) now available for download You have {NBPRODUCTS}
product(s) now available for download using the following link(s):
You have {nbproducts} product(s) now available for download using the
following link(s):
{virtualProducts}
{virtualproducts}
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
mails/en/employee_password.html
+1 -1
View File
@@ -86,7 +86,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Your {shop_name} login information </p>
<span style="color:#777">
Here is your personal login information for <span style="color:#333"><strong>{shop_name}</strong></span>:<br/><br/>
mails/en/employee_password.txt
+1 -2
View File
@@ -3,8 +3,7 @@
Hi {firstname} {lastname},
Your {shop_name} login information Here is your personal login
information for {SHOP_NAME}:
Here is your personal login information for {shop_name}:
FIRST NAME: {firstname}
mails/en/forward_msg.html
+1 -1
View File
@@ -86,7 +86,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Customer service - Forwarded discussion </p>
<span style="color:#777">
<span style="color:#333"><strong>{employee}</strong></span> wanted to forward this discussion to you. <br /><br />
mails/en/forward_msg.txt
+2 -3
View File
@@ -3,12 +3,11 @@
Hi {firstname} {lastname},
Customer service - Forwarded discussion {EMPLOYEE} wanted to forward
this discussion to you.
{employee} wanted to forward this discussion to you.
DISCUSSION HISTORY: {messages}
{EMPLOYEE} added "{COMMENT}"
{employee} added "{comment}"
{shop_name} [{shop_url}] powered by
PrestaShop(tm) [http://www.prestashop.com/]
mails/en/guest_to_customer.html
+1 -1
View File
@@ -86,7 +86,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Your customer account creation </p>
<span style="color:#777">
Your guest account for <span style="color:#333"><strong>{shop_name}</strong></span> has been transformed into a customer account. <br /><br />
mails/en/guest_to_customer.txt
+3 -3
View File
@@ -3,8 +3,8 @@
Hi {firstname} {lastname},
Your customer account creation Your guest account for {SHOP_NAME} has
been transformed into a customer account.
Your guest account for {shop_name} has been transformed into a
customer account.
E-MAIL ADDRESS: {email}
@@ -12,7 +12,7 @@ PASSWORD: {passwd}
Please be careful when sharing these login details with others.
You can access your customer account on our shop: {SHOP_URL}
You can access your customer account on our shop: {shop_url}
{shop_name} [{shop_url}] powered by
PrestaShop(tm) [http://www.prestashop.com/]
mails/en/in_transit.html
+1 -1
View File
@@ -86,7 +86,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Order {order_name}&nbsp;-&nbsp;In transit </p>
<span style="color:#777">
Your order with the reference <span style="color:#333"><strong>{order_name}</strong></span> is currently in transit. <br /><br />
mails/en/in_transit.txt
+1 -2
View File
@@ -3,8 +3,7 @@
Hi {firstname} {lastname},
Order {order_name} - In transit Your order with the reference
{ORDER_NAME} is currently in transit.
Your order with the reference {order_name} is currently in transit.
You can track your package using the following link: {followup}
[{followup}]
mails/en/log_alert.html
+1 -1
View File
@@ -86,7 +86,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
You have received a new log alert </p>
<span style="color:#777">
<span style="color:#333"><strong>Warning:</strong></span> you have received a new log alert in your Back Office.<br /><br />
mails/en/log_alert.txt
+1 -2
View File
@@ -3,8 +3,7 @@
Hi {firstname} {lastname},
You have received a new log alert WARNING: you have received a new
log alert in your Back Office.
WARNING: you have received a new log alert in your Back Office.
You can check for it in the "TOOLS" > "LOGS" section of your Back
Office.
mails/en/order_canceled.html
+1 -1
View File
@@ -86,7 +86,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Order {order_name}&nbsp;-&nbsp;Order cancelled </p>
<span style="color:#777">
Your order with the reference <span style="color:#333"><strong>{order_name}</strong></span> from <span style="color:#333"><strong>{shop_name}</strong></span> has been cancelled.<br />
mails/en/order_canceled.txt
+2 -2
View File
@@ -3,8 +3,8 @@
Hi {firstname} {lastname},
Order {order_name} - Order cancelled Your order with the reference
{ORDER_NAME} from {SHOP_NAME} has been cancelled.
Your order with the reference {order_name} from {shop_name} has been
cancelled.
You can check for it in the "TOOLS" > "LOGS" section of your Back
Office.
mails/en/order_changed.html
+1 -1
View File
@@ -86,7 +86,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Order {order_name}&nbsp;-&nbsp;Order changed </p>
<span style="color:#777">
Your order with the reference <span style="color:#333"><strong>{order_name}</strong></span> from <span style="color:#333"><strong>{shop_name}</strong></span> has been changed by the merchant.<br />
mails/en/order_changed.txt
+2 -2
View File
@@ -3,8 +3,8 @@
Hi {firstname} {lastname},
Order {order_name} - Order changed Your order with the reference
{ORDER_NAME} from {SHOP_NAME} has been changed by the merchant.
Your order with the reference {order_name} from {shop_name} has been
changed by the merchant.
You can check for it in the "TOOLS" > "LOGS" section of your Back
Office.
mails/en/order_conf.txt
+12 -4
View File
@@ -5,7 +5,9 @@ Hi {firstname} {lastname},
Thank you for shopping with {shop_name}!
Order details ORDER: {order_name} Placed on {date}
Order details
ORDER: {order_name} Placed on {date}
PAYMENT: {payment}
@@ -47,13 +49,19 @@ TOTAL PAID
{total_paid}
Shipping CARRIER: {carrier}
Shipping
CARRIER: {carrier}
PAYMENT: {payment}
Delivery address {delivery_block_html}
Delivery address
Billing address {invoice_block_html}
{delivery_block_html}
Billing address
{invoice_block_html}
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
mails/en/order_customer_comment.html
+1 -1
View File
@@ -86,7 +86,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Message from a customer </p>
<span style="color:#777">
You have received a new message regarding order with the reference <span style="color:#333"><strong>{order_name}</strong></span>.<br /><br />
mails/en/order_customer_comment.txt
+2 -2
View File
@@ -3,8 +3,8 @@
Hi {firstname} {lastname},
Message from a customer You have received a new message regarding
order with the reference {ORDER_NAME}.
You have received a new message regarding order with the reference
{order_name}.
CUSTOMER: {firstname} {lastname} ({email})
mails/en/order_merchant_comment.html
+1 -1
View File
@@ -86,7 +86,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Message from {shop_name} </p>
<span style="color:#777">
You have received a new message from <span style="color:#333"><strong>{shop_name}</strong></span> regarding order with the reference <span style="color:#333"><strong>{order_name}</strong></span>.<br /><br />
mails/en/order_merchant_comment.txt
+2 -2
View File
@@ -3,8 +3,8 @@
Hi {firstname} {lastname},
Message from {shop_name} You have received a new message from
{SHOP_NAME} regarding order with the reference {ORDER_NAME}.
You have received a new message from {shop_name} regarding order with
the reference {order_name}.
MESSAGE: {message}
mails/en/order_return_state.html
+1 -1
View File
@@ -86,7 +86,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Return #{id_order_return} - update </p>
<span style="color:#777">
We have updated the progress on your return #{id_order_return}, the new status is: <span style="color:#333"><strong>"{state_order_return}"</strong></span><br /><br />
mails/en/order_return_state.txt
+2 -3
View File
@@ -3,9 +3,8 @@
Hi {firstname} {lastname},
Return #{id_order_return} - update We have updated the progress on
your return #{id_order_return}, the new status is:
"{STATE_ORDER_RETURN}"
We have updated the progress on your return #{id_order_return}, the
new status is: "{state_order_return}"
MESSAGE: {message}
mails/en/outofstock.html
+1 -1
View File
@@ -87,7 +87,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Order {order_name}&nbsp;-&nbsp;Item(s) out of stock </p>
<span style="color:#777">
Unfortunately, one or more items are currently out of stock. This may cause a slight delay in your delivery. Please accept our apologies and rest assured that we are working hard to rectify this. </span>
mails/en/outofstock.txt
+3 -4
View File
@@ -6,10 +6,9 @@ Hi {firstname} {lastname},
Thanks for your order with the reference {order_name} from
{shop_name}.
Order {order_name} - Item(s) out of stock Unfortunately, one or more
items are currently out of stock. This may cause a slight delay in
your delivery. Please accept our apologies and rest assured that we
are working hard to rectify this.
Unfortunately, one or more items are currently out of stock. This
may cause a slight delay in your delivery. Please accept our apologies
and rest assured that we are working hard to rectify this.
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
mails/en/password.txt
+3 -1
View File
@@ -3,7 +3,9 @@
Hi {firstname} {lastname},
Your new {shop_name} login details E-MAIL ADDRESS: {email}
Your new {shop_name} login details
E-MAIL ADDRESS: {email}
PASSWORD: {passwd}
mails/en/password_query.html
+1 -1
View File
@@ -86,7 +86,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Password reset request for {shop_name} </p>
<span style="color:#777">
You have requested to reset your <span style="color:#333"><strong>{shop_name}</strong></span> login details.<br/><br/>
mails/en/password_query.txt
+1 -2
View File
@@ -3,8 +3,7 @@
Hi {firstname} {lastname},
Password reset request for {shop_name} You have requested to reset
your {SHOP_NAME} login details.
You have requested to reset your {shop_name} login details.
Please note that this will change your current password.
mails/en/payment.html
+1 -1
View File
@@ -87,7 +87,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Order {order_name}&nbsp;-&nbsp;Payment processed </p>
<span style="color:#777">
Your payment for order with the reference <strong><span style="color:#333">{order_name}</span></strong> was successfully processed. </span>
mails/en/payment.txt
+2 -2
View File
@@ -5,8 +5,8 @@ Hi {firstname} {lastname},
Thank you for shopping with {shop_name}!
Order {order_name} - Payment processed Your payment for order with
the reference {ORDER_NAME} was successfully processed.
Your payment for order with the reference {order_name} was
successfully processed.
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
mails/en/payment_error.html
+1 -1
View File
@@ -86,7 +86,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Order {order_name}&nbsp;-&nbsp;Payment processing error </p>
<span style="color:#777">
There is a problem with your payment for <strong><span style="color:#333">{shop_name}</span></strong> order with the reference <strong><span style="color:#333">{order_name}</span></strong>. Please contact us at your earliest convenience.<br/>
mails/en/payment_error.txt
+3 -3
View File
@@ -3,9 +3,9 @@
Hi {firstname} {lastname},
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.
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.
mails/en/preparation.html
+1 -1
View File
@@ -86,7 +86,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Order {order_name}&nbsp;-&nbsp;Processing </p>
<span style="color:#777">
We are currently processing your <strong><span style="color:#333">{shop_name}</span></strong> order with the reference <strong><span style="color:#333">{order_name}</span></strong>. </span>
mails/en/preparation.txt
+2 -2
View File
@@ -3,8 +3,8 @@
Hi {firstname} {lastname},
Order {order_name} - Processing We are currently processing your
{SHOP_NAME} order with the reference {ORDER_NAME}.
We are currently processing your {shop_name} order with the
reference {order_name}.
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
mails/en/refund.html
+1 -1
View File
@@ -86,7 +86,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Order {order_name}&nbsp;-&nbsp;Refund processed </p>
<span style="color:#777">
We have processed your <strong><span style="color:#333">{shop_name}</span></strong> refund for order with the reference <strong><span style="color:#333">{order_name}</span></strong>. </span>
mails/en/refund.txt
+2 -2
View File
@@ -3,8 +3,8 @@
Hi {firstname} {lastname},
Order {order_name} - Refund processed We have processed your
{SHOP_NAME} refund for order with the reference {ORDER_NAME}.
We have processed your {shop_name} refund for order with the
reference {order_name}.
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
mails/en/shipped.html
+1 -1
View File
@@ -87,7 +87,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Order {order_name}&nbsp;-&nbsp;Shipped </p>
<span style="color:#777">
Your order with the reference <span style="color:#333"><strong>{order_name}</strong></span> has been shipped.<br />
mails/en/shipped.txt
+1 -2
View File
@@ -5,8 +5,7 @@ Hi {firstname} {lastname},
Thank you for shopping with {shop_name}!
Order {order_name} - Shipped Your order with the reference
{ORDER_NAME} has been shipped.
Your order with the reference {order_name} has been shipped.
You will soon receive a URL to track the delivery progress of your
package.
mails/en/voucher.html
+1 -1
View File
@@ -86,7 +86,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Order {order_name}&nbsp;-&nbsp;Voucher created </p>
<span style="color:#777">
A voucher has been created in your name as a result of your order with the reference <span style="color:#333"><strong>{order_name}</strong></span>.<br/><br/>
mails/en/voucher.txt
+3 -3
View File
@@ -3,10 +3,10 @@
Hi {firstname} {lastname},
Order {order_name} - Voucher created A voucher has been created in
your name as a result of your order with the reference {ORDER_NAME}.
A voucher has been created in your name as a result of your order
with the reference {order_name}.
VOUCHER CODE: {VOUCHER_NUM} in the amount of {VOUCHER_AMOUNT}
VOUCHER CODE: {voucher_num} in the amount of {voucher_amount}
Simply copy/paste this code during the payment process for your next
order.
mails/en/voucher_new.txt
+3 -2
View File
@@ -3,8 +3,9 @@
Hi {firstname} {lastname},
This is to inform you about the creation of a voucher. Here is the
code of your voucher: {VOUCHER_NUM}
This is to inform you about the creation of a voucher.
Here is the code of your voucher: {voucher_num}
Simply copy/paste this code during the payment process for your next
order.
modules/blocknewsletter/mails/en/newsletter_verif.txt
+1 -1
View File
@@ -6,7 +6,7 @@ Hi,
Thank you for subscribing to our newsletter, please confirm your
request by clicking the link below :
{VERIF_URL} [HTTP://SAFE.SHELL.LA/{VERIF_URL}]
{verif_url} [HTTP://SAFE.SHELL.LA/{verif_url}]
{shop_name} [{shop_url}] powered by
PrestaShop(tm) [http://www.prestashop.com/]
modules/blocknewsletter/mails/en/newsletter_voucher.html
+1 -1
View File
@@ -86,7 +86,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Newsletter subscription </p>
<span style="color:#777">
Regarding your newsletter subscription, we are pleased to offer you the following voucher: <span style="color:#333"><strong>{discount}</strong></span>
modules/blocknewsletter/mails/en/newsletter_voucher.txt
+2 -2
View File
@@ -3,8 +3,8 @@
Hi,
Newsletter subscription Regarding your newsletter subscription, we
are pleased to offer you the following voucher: {DISCOUNT}
Regarding your newsletter subscription, we are pleased to offer
you the following voucher: {discount}
{shop_name} [{shop_url}] powered by
PrestaShop(tm) [http://www.prestashop.com/]
modules/blockwishlist/mails/en/wishlink.txt
+4 -2
View File
@@ -3,8 +3,10 @@
Hi,
Message from {shop_name} {SHOP_NAME} invites you to send this link to
your friends, so they can see your wishlist: {WISHLIST}
Message from {shop_name}
{shop_name} invites you to send this link to your friends, so they
can see your wishlist: {wishlist}
{message} [{message}]
modules/blockwishlist/mails/en/wishlist.txt
+4 -2
View File
@@ -3,8 +3,10 @@
Hi,
Message from {shop_name} {FIRSTNAME} {LASTNAME} indicated you may
want to see his/her wishlist: {WISHLIST}
Message from {shop_name}
{firstname} {lastname} indicated you may want to see his/her
wishlist: {wishlist}
{wishlist} [{message}]
modules/followup/mails/en/followup_1.html
+1 -1
View File
@@ -86,7 +86,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Your cart at {shop_name} </p>
<span style="color:#777">
We noticed that during your last visit on {shop_name}, you did not complete the order you had started.<br /> <br />
modules/followup/mails/en/followup_1.txt
+7 -5
View File
@@ -3,17 +3,19 @@
Hi {firstname} {lastname},
Your cart at {shop_name} We noticed that during your last visit on
{shop_name}, you did not complete the order you had started.
We noticed that during your last visit on {shop_name}, you did not
complete the order you had started.
Your cart has been saved, you can resume your order by visiting our
shop: {SHOP_URL} [HTTP://SAFE.SHELL.LA/{SHOP_URL}]
shop: {shop_url} [HTTP://SAFE.SHELL.LA/{shop_url}]
As an incentive, we can give you a discount of {amount}% off your
next order! This offer is valid for {DAYS} days, so do not waste a
next order! This offer is valid for {days} days, so do not waste a
moment!
Your {shop_name} login details HERE IS YOUR COUPON: {voucher_num}
Your {shop_name} login details
HERE IS YOUR COUPON: {voucher_num}
Enter this code in your shopping cart to get your discount.
modules/followup/mails/en/followup_2.txt
+1 -1
View File
@@ -6,7 +6,7 @@ Hi {firstname} {lastname},
Thank you for your order at {shop_name}.
As our way of saying thanks, we want to give you a discount of
{AMOUNT}% off your next order! This offer is valid for {DAYS} days, so
{amount}% off your next order! This offer is valid for {days} days, so
do not waste a moment!
HERE IS YOUR COUPON: {voucher_num}
modules/followup/mails/en/followup_3.txt
+5 -3
View File
@@ -6,9 +6,11 @@ Hi {firstname} {lastname},
Thanks for your trust.
You are one of our best customers and as such we want to thank you
for your continued patronage. As appreciation for your loyalty, we
want to give you a discount of {AMOUNT}% valid on your next order!
This offer is valid for {DAYS} days, so do not waste a moment!
for your continued patronage.
As appreciation for your loyalty, we want to give you a discount of
{amount}% valid on your next order! This offer is valid for {days}
days, so do not waste a moment!
HERE IS YOUR COUPON: {voucher_num}
modules/followup/mails/en/followup_4.html
+1 -1
View File
@@ -86,7 +86,7 @@
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Your cart at {shop_name} </p>
<span style="color:#777">
You are one of our best customers, however you have not placed an order in {days_threshold} days.<br /> <br />
modules/followup/mails/en/followup_4.txt
+4 -4
View File
@@ -3,15 +3,15 @@
Hi {firstname} {lastname},
Your cart at {shop_name} You are one of our best customers, however
you have not placed an order in {days_threshold} days.
You are one of our best customers, however you have not placed an
order in {days_threshold} days.
Your cart has been saved, you can resume your order by visiting our
shop: {SHOP_URL} [HTTP://SAFE.SHELL.LA/{SHOP_URL}]
shop: {shop_url} [HTTP://SAFE.SHELL.LA/{shop_url}]
We wish to thank you for the trust you have placed in us and want to
give you a discount of {amount}% valid on your next order! This offer
is valid for {DAYS} days, so do not waste a moment!
is valid for {days} days, so do not waste a moment!
HERE IS YOUR COUPON: {voucher_num}
modules/mailalerts/mails/en/customer_qty.txt
+5 -3
View File
@@ -3,10 +3,12 @@
Hi,
{product} is now available. This item is once again in-stock.
{product} is now available.
You can access the product page by clicking on the link: {PRODUCT}
[HTTP://SAFE.SHELL.LA/{PRODUCT_LINK}]
This item is once again in-stock.
You can access the product page by clicking on the link: {product}
[HTTP://SAFE.SHELL.LA/{product_link}]
You can order it right now from our online shop.
modules/mailalerts/mails/en/new_order.txt
+15 -5
View File
@@ -6,7 +6,9 @@ Congratulations!
A new order was placed on {shop_name} from the following customer:
{firstname} {lastname} ({email})
Order details ORDER: {order_name} Placed on {date}
Order details
ORDER: {order_name} Placed on {date}
PAYMENT: {payment}
@@ -46,13 +48,21 @@ TOTAL PAID
{total_paid}
Carrier: {carrier}
Carrier:
Delivery address {delivery_block_html}
{carrier}
Billing address {invoice_block_html}
Delivery address
Customer message: {message}
{delivery_block_html}
Billing address
{invoice_block_html}
Customer message:
{message}
{shop_name} [{shop_url}] powered by
PrestaShop(tm) [http://www.prestashop.com/]
modules/mailalerts/mails/en/productcoverage.txt
+4 -2
View File
@@ -3,8 +3,10 @@
Hi,
{product} is almost out of stock. The stock cover is now less than
the specified minimum of: {WARNING_COVERAGE}.
{product} is almost out of stock.
The stock cover is now less than the specified minimum of:
{warning_coverage}.
CURRENT STOCK COVER: {current_coverage}
modules/mailalerts/mails/en/productoutofstock.txt
+4 -2
View File
@@ -3,8 +3,10 @@
Hi,
{product} is nearly out of stock. The remaining stock is now less
than the specified minimum of {LAST_QTY}.
{product} is nearly out of stock.
The remaining stock is now less than the specified minimum of
{last_qty}.
REMAINING STOCK: {qty}
modules/referralprogram/mails/en/referralprogram-congratulations.txt
+3 -3
View File
@@ -3,12 +3,12 @@
Congratulations!
Your referred friend {SPONSORED_FIRSTNAME} {SPONSORED_LASTNAME} has
Your referred friend {sponsored_firstname} {sponsored_lastname} has
placed his or her first order on {shop_name}
[{shop_url}]!
We are pleased to offer you a voucher worth {DISCOUNT_DISPLAY}
(VOUCHER # {DISCOUNT_NAME}) that you can use on your next order.
We are pleased to offer you a voucher worth {discount_display}
(VOUCHER # {discount_name}) that you can use on your next order.
Best regards,
modules/referralprogram/mails/en/referralprogram-invitation.txt
+5 -5
View File
@@ -3,16 +3,16 @@
{firstname_friend} {lastname_friend}, join us!
Your friend {FIRSTNAME} {LASTNAME} wants to refer you on {shop_name}
Your friend {firstname} {lastname} wants to refer you on {shop_name}
[{shop_url}]!
We are pleased to offer you a voucher worth {DISCOUNT_DISPLAY}
(VOUCHER # {DISCOUNT_NAME}) that you can use on your next order. Get
referred and earn a discount voucher of {DISCOUNT}! It's very easy to
We are pleased to offer you a voucher worth {discount_display}
(VOUCHER # {discount_name}) that you can use on your next order. Get
referred and earn a discount voucher of {discount}! It's very easy to
sign up. Just click here! [{link}]
When signing up, don't forget to provide the e-mail address of your
referring friend: {EMAIL}.
referring friend: {email}.
Best regards,
modules/referralprogram/mails/en/referralprogram-voucher.txt
+5 -4
View File
@@ -3,11 +3,12 @@
Hi {firstname} {lastname},
Referral Program We have created a voucher in your name for referring
a friend.
Referral Program
Here is the code of your voucher: {VOUCHER_NUM}, with an amount of
{VOUCHER_AMOUNT}.
We have created a voucher in your name for referring a friend.
Here is the code of your voucher: {voucher_num}, with an amount of
{voucher_amount}.
Simply copy/paste this code during the payment process for your next
order.
modules/sendtoafriend/mails/en/send_to_a_friend.txt
+3 -1
View File
@@ -6,7 +6,9 @@ Hi {name},
Thank you for creating a customer account at {shop_name}.
{customer} has sent you a link to a product that (s)he thinks may
interest you. Click here to view this item: {product}
interest you.
Click here to view this item: {product}
[{product_link}]
{shop_name} [{shop_url}] powered by