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

// Merge -> revision 9352

Browse Source
This commit is contained in:
rMalie
2011-10-14 08:20:54 +00:00
parent 85937793ec
commit d79fcf00fb
332 changed files with 6104 additions and 2643 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mails/de/index.php
+1 -1
View File
@@ -33,4 +33,4 @@ header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;
exit;
mails/de/order_conf.html
+4 -8
View File
@@ -92,12 +92,8 @@
<th style="text-align: left; padding: 0.3em 1em;">Lieferanschrift</th> <th style="text-align: left; padding: 0.3em 1em;">Rechnungsanschrift</th>
</tr>
<tr>
<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">
{delivery_block_html}
</td>
<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">
{invoice_block_html}
</td>
<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{delivery_company} <br /><span style="color: #db3484; font-weight: bold;">{delivery_firstname} {delivery_lastname}</span> <br />{delivery_address1} <br />{delivery_address2} <br />{delivery_city} {delivery_postal_code} <br />{delivery_country} {delivery_state} <br />{delivery_phone} <br />{delivery_other}</td>
<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{invoice_company} <br /><span style="color: #db3484; font-weight: bold;">{invoice_firstname} {invoice_lastname}</span> <br />{invoice_address1} <br />{invoice_address2} <br />{invoice_city} {invoice_postal_code} <br />{invoice_country} {invoice_state} <br />{invoice_phone} <br />{invoice_other}</td>
</tr>
</tbody>
</table>
@@ -116,9 +112,9 @@
<td>&nbsp;</td>
</tr>
<tr>
<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="versions/1.4.1.0/mails/en/%7Bshop_url%7D">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
</tr>
</tbody>
</table>
</body>
</html>
</html>
mails/de/order_conf.txt
+16 -3
View File
@@ -18,13 +18,26 @@ Versand
Lieferanschrift:
{delivery_block_txt}
{delivery_company}
{delivery_firstname} {delivery_lastname}
{delivery_address1}
{delivery_address2}
{delivery_postal_code} {delivery_city}
{delivery_country} {delivery_state}
{delivery_other}
Rechnungsanschrift:
{invoice_block_txt}
{invoice_company}
{invoice_vat_number}
{invoice_firstname} {invoice_lastname}
{invoice_address1}
{invoice_address2}
{invoice_postal_code} {invoice_city}
{invoice_country} {invoice_state}
{invoice_other}
Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken.
Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung auf dieser Webseite verfolgen: {shop_url}guest-tracking.php
Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung auf dieser Webseite verfolgen: {shop_url}gast-bestellverfolgung.php
{shop_name} powered with PrestaShop™
mails/en/account.html
+12 -9
View File
@@ -17,11 +17,13 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your account login details</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your {shop_name} login details</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
<b>Thank you for creating a customer account at {shop_name}.</b><br /><br />
Here are your login details:<br /><br />
E-mail address: <strong><span style="color:#DB3484;">{email}</span></strong>
<br >Password: <strong>{passwd}</strong>
</td>
@@ -29,23 +31,24 @@
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
<strong>Safety tips:</strong>
<br><br>Keep your account details safe.
<br>Do not disclose your login details to anyone.
<br>Change your password regularly.
<br>Should you suspect someone is using your account illegally, please notify us immediately.
<strong>Important Security Tips:</strong>
<ol>
<li>Always keep your account details safe.</li>
<li>Never disclose your login details to anyone.</li>
<li>Change your password regularly.</li>
<li>Should you suspect someone is using your account illegally, please notify us immediately.</li>
</ol>
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
You can now place orders on our Website: <a href="{shop_url}">{shop_name}</a>.
You can now place orders on our shop: <a href="{shop_url}">{shop_name}</a>.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
mails/en/account.txt
+8 -9
View File
@@ -1,20 +1,19 @@
Hi {firstname} {lastname},
Thank you for creating your account at {shop_name}.
Thank you for creating a customer account at {shop_name}.
Your account login details :
Here are your login details:
E-mail address: {email}
Password: {passwd}
You can now place orders on our Website: {shop_url}
You can now place orders on our shop: {shop_url}
Safety Tips:
* Keep your account details safe.
* Do not disclose your login details to anyone.
* Change your password regularly.
* Should you suspect someone is using your account illegally, please notify us immediately.
Important Security Tips:
1. Always keep your account details safe.
2. Never disclose your login details to anyone.
3. Change your password regularly.
4. Should you suspect someone is using your account illegally, please notify us immediately.
{shop_url} powered by PrestaShop™
mails/en/bankwire.html
+12 -14
View File
@@ -17,45 +17,43 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order #{id_order} history</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order {order_name} - Awaiting wire payment</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
Your order has been placed successfully, and will be shipped as soon as payment is received.
Thank you for shopping at {shop_name}!<br /><br />
Your order {order_name} has been placed successfully and will be <b>shipped as soon as we receive your payment</b>.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
Please note that you have selected to pay by bank wire. Please send your wire to :
You have selected to pay by wire transfer.<br /><br />Here are the bank details for your wire or transfer:
<br /><br />
<strong>{bankwire_owner}</strong>
<br /><br />
{bankwire_details}
<br /><br />
{bankwire_address}
<br /><br />
Order total amount is {total_paid}
<b>Amount:</b> {total_paid}<br /><br />
<b>Account owner:</b> {bankwire_owner}<br /><br />
<b>Account details:</b><br /><br />{bankwire_details}<br /><br />
<b>Bank address:</b> {bankwire_address}
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
You can review this order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our Website.
You can review your order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your customer account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our shop.<br /><br />
</td>
</tr>
<tr>
<td align="left">
If you have guest account, you can follow your order at <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our Website.
If you have guest account, you can follow your order via the <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our shop.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
</body>
</html>
</html>
mails/en/bankwire.txt
+13 -10
View File
@@ -1,23 +1,26 @@
Hi {firstname} {lastname},
Your order #{id_order} has been placed successfully. Your order will be shipped as soon as payment is received.
Thank you for shopping at {shop_name}!
Please note that you have selected to pay by bank wire. Please send your wire to:
Your order {order_name} has been placed successfully and will be shipped as soon as we receive your payment.
{bankwire_owner}
You have selected to pay by wire transfer.
Here are the bank details for your wire or transfer:
Amount: {total_paid}
Account owner: {bankwire_owner}
Account details:
{bankwire_details}
{bankwire_address}
Bank address: {bankwire_address}
Order total amount is {total_paid}
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 this order and download your invoice from the "Order history" section of your account by clicking "My account" on our Website.
If you have guest account, you can follow your order at this page: {shop_url}guest-tracking.php
Thank you for shopping at {shop_name}.
If you have guest account, you can follow your order using this link: {shop_url}guest-tracking.php
{shop_name} - {shop_url}
{shop_url} powered by PrestaShop™
mails/en/cheque.html
+11 -9
View File
@@ -17,41 +17,43 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order {order_name} history</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order {order_name} - Awaiting cheque payment</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
Your order has been placed successfully, and will be shipped as soon as payment is received.
Thank you for shopping at {shop_name}!<br /><br />
Your order {order_name} has been placed successfully and will be <b>shipped as soon as we receive your payment</b>.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
Please note that you have selected to pay by cheque. Please send your cheque:
You have selected to pay by cheque. Please include on your cheque:
<br /><br />
- an amount of <b>{total_paid}</b>
- Amount: <b>{total_paid}</b>
<br /><br />
- payable to the order of <b>{cheque_name}</b>
- Payable to the order of: <b>{cheque_name}</b>
<br /><br />
- mail to <b>{cheque_address_html}</b>
Please mail your cheque to:<br /><br />
<b>{cheque_address_html}</b>
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
You can review this order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our Website.
You can review your order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your customer account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our shop.<br /><br />
</td>
</tr>
<tr>
<td align="left">
If you have guest account, you can follow your order at <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our Website.
If you have guest account, you can follow your order via the <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our shop.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
mails/en/cheque.txt
+11 -9
View File
@@ -1,21 +1,23 @@
Hi {firstname} {lastname},
Your order {order_name} has been placed successfully. Your order will be shipped as soon as payment is received.
Thank you for shopping at {shop_name}!
Please note that you have selected to pay by cheque. Please include on your cheque:
Your order {order_name} has been placed successfully and will be shipped as soon as we receive your payment.
- an amount of {total_paid}
You have selected to pay by cheque. Please include on your cheque:
- payable to the order of {cheque_name}
Amount: {total_paid}
- mail to {cheque_address}
Payable to the order of: {cheque_name}
You can review this order and download your invoice from the "Order history" section of your account by clicking "My account" on our Website.
If you have guest account, you can follow your order at this page: {shop_url}guest-tracking.php
Please mail your cheque to:
Thank you for shopping at {shop_name}.
{cheque_address}
You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
If you have guest account, you can follow your order using this link: {shop_url}guest-tracking.php
{shop_name} - {shop_url}
{shop_url} powered by PrestaShop™
mails/en/contact.html
+4 -4
View File
@@ -13,20 +13,20 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Message from your shop {shop_name}</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Message from a {shop_name} customer</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
E-mail address: <a href="mailto:{email}"><b>{email}</b></a>
Customer e-mail address: <a href="mailto:{email}"><b>{email}</b></a>
<br><br>
Message: {message}
Customer message: {message}
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
mails/en/contact.txt
+4 -4
View File
@@ -1,10 +1,10 @@
Dear merchant,
You have received a message from a customer via your shop: {shop_name}
Details of message:
Customer e-mail address: {email}
E-mail address: {email}
Message:
Customer message:
{message}
mails/en/contact_form.html
+5 -4
View File
@@ -13,22 +13,23 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your message has been correctly sent to our Customer Service.</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your message to {shop_name} Customer Service</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
Your message: {message}
Your message has been sent successfully.<br /><br />
Message: {message}
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">We will answer as soon as possible.</td>
<td align="left">We will answer as soon as possible.</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
mails/en/contact_form.txt
+4 -3
View File
@@ -1,11 +1,12 @@
Your message has been correctly sent to our Customer Service.
Hello,
Your message has been sent successfully to {shop_name} Customer Service.
Your message:
{message}
We will answer as soon as possible.
We will respond as soon as possible.
Regards,
mails/en/credit_slip.html
+4 -4
View File
@@ -17,24 +17,24 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order #{id_order} history</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order #{id_order} - Credit slip created</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
This is to inform you about the creation of a credit slip in your name based on your order #{id_order}.
<b>We have generated a credit slip in your name for order #{id_order}</b>.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
You can review this credit slip and download your invoice from the <a href="{shop_url}order-follow.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order follow"</a> section of your account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our Website.
You can review this credit slip and download your invoice from the <a href="{shop_url}order-slip.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My credit slips"</a> section of your account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our shop.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
mails/en/credit_slip.txt
+3 -4
View File
@@ -1,12 +1,11 @@
Hi {firstname} {lastname},
This is to inform you about the generation of a credit slip in your name from your order #{id_order}.
Thank you for shopping at {shop_name}!
You can review this credit slip and download the invoice from the "Order follow" section of your account by clicking "My account" on our Website.
We have generated a credit slip in your name for order #{id_order}.
Thank you for shopping at {shop_name}.
You can review this credit slip and download the invoice from the "Order follow" section of your account by clicking "My account" on our shop.
{shop_name} - {shop_url}
{shop_url} powered by PrestaShop™
mails/en/download-product.tpl
+1 -1
View File
@@ -6,7 +6,7 @@
expires on {$product.deadline}
{/if}
{if isset($product.downloadable)}
downloadable {$product.downloadable} times
downloadable {$product.downloadable} time(s)
{/if}
</li>
{/foreach}
mails/en/download_product.html
+8 -7
View File
@@ -13,40 +13,41 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">Hello <strong style="color:#DB3484;">{firstname} {lastname}</strong>, thank you for shopping with <strong>{shop_name}</strong>.</td>
<td align="left">Hello <strong style="color:#DB3484;">{firstname} {lastname}</strong></td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Product(s) to download</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Product(s) now available for download</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
You have {nbProducts} product(s) to download.
Thank you for your order from <strong>{shop_name}</strong>!<br /><br />
You have {nbProducts} product(s) now available for download using the following link(s):<br />
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
Below are direct links to these products:
{virtualProducts}
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
You can review this order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our Website.
You can review your order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your customer account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our shop.<br /><br />
</td>
</tr>
<tr>
<td align="left">
If you have a guest account, you can follow your order at <a href="{shop_url}guest-tracking.php?id_order={id_order}" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our Website.
If you have guest account, you can follow your order via the <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our shop.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
mails/en/download_product.txt
+7 -5
View File
@@ -1,11 +1,13 @@
{firstname} {lastname}, thank you for your order on {shop_name}!
Hi {firstname} {lastname},
You have {nbProducts} product(s) to download.
Thank you for your order from {shop_name}!
You have {nbProducts} product(s) now available for download using the following link(s):
Below are direct links to these products:
{virtualProducts}
You can review this order and download your invoice from the "Order history" section of your account by clicking "My account" on our Website.
If you have a guest account, you can follow your order at this page: {shop_url}guest-tracking.php?id_order={id_order}
You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
If you have guest account, you can follow your order using this link: {shop_url}guest-tracking.php
{shop_url} powered by PrestaShop™
mails/en/employee_password.html
+7 -6
View File
@@ -17,23 +17,24 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your personal login information</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your {shop_name} login information</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
<b>First name</b>: {firstname}<br>
<b>Last name</b>: {lastname}<br>
<b>Password</b>: {passwd}<br>
Here is your personal login information for {shop_name}:<br /><br />
<b>First name</b>: {firstname}<br />
<b>Last name</b>: {lastname}<br />
<b>Password</b>: {passwd}<br />
<b>E-mail address</b>: {email}
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
</body>
</html>
</html>
mails/en/employee_password.txt
+5 -7
View File
@@ -1,14 +1,12 @@
Hi {firstname} {lastname},
Your personal login information for your shop {shop_name}:
Here is your personal login information for {shop_name}:
* First name: {firstname}
* Last name: {lastname}
* Password: {passwd}
* E-mail address: {email}
First name: {firstname}
Last name: {lastname}
Password: {passwd}
E-mail address: {email}
{shop_name} - {shop_url}
{shop_url} powered by PrestaShop™
mails/en/forward_msg.html
+13 -2
View File
@@ -6,13 +6,24 @@
</head>
<body>
<table style="font-family:Verdana,sans-serif; font-size:11px; color:#374953; width: 550px;">
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Customer service - Forwarded discussion</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td style="border:1px solid #CCCCCC;background-color:#FFFFFF;padding:10px;color:#383838;font-size:12px">
{employee} wanted to forward this chat to you.
{employee} wanted to forward this discussion to you.
<br /><br />
Discussion history:<br />
{messages}
<br /><br />
{employee} added "{comment}".
{employee} added "{comment}"
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
mails/en/forward_msg.txt
+9 -2
View File
@@ -1,4 +1,11 @@
{employee} wanted to forward this chat to you.
Comment: {comment}
Hello,
{employee} wanted to forward this discussion to you.
Internal comments: {comment}
Discussion history:
{messages}
Regards,
{shop_name} powered by PrestaShop™
mails/en/guest_to_customer.html
+10 -5
View File
@@ -17,7 +17,13 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your guest account has been transformed into a customer account</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your customer account creation</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
Your guest account for {shop_name} has been transformed into a customer account.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
@@ -31,16 +37,15 @@
<td align="left">
Please be careful when sharing these login details with others.
<br><br>
You can access your account on our website: {shop_url}
You can access your customer account on our shop: {shop_url}
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
</body>
</html>
</html>
mails/en/guest_to_customer.txt
+2 -6
View File
@@ -1,16 +1,12 @@
Hi {firstname} {lastname},
Your guest account has been transformed into a customer account:
Your guest account for {shop_name} has been transformed into a customer account.
E-mail address: {email}
Password: {passwd}
You can access your account on our website: {shop_url}
Please be careful when sharing these login details with others.
{shop_url} powered by PrestaShop™
{shop_url} powered by PrestaShop™
mails/en/in_transit.html
+6 -12
View File
@@ -17,37 +17,31 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order #{id_order} history</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order #{id_order} - In transit</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
<b>Your order is currently in transit.</b>
<b>Your order #{id_order} is currently in transit.</b>.<br /><br />You can track your package using the following link: <a href="{followup}">{followup}</a>
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
You can track your package by clicking on the following link: <a href="{followup}">{followup}</a>
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
You can review this order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our Website.
You can review your order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your customer account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our shop.<br /><br />
</td>
</tr>
<tr>
<td align="left">
If you have a guest account, you can follow your order at <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our Website.
If you have guest account, you can follow your order via the <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our shop.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
</body>
</html>
</html>
mails/en/in_transit.txt
+8 -9
View File
@@ -1,16 +1,15 @@
Hi {firstname} {lastname},
Your order is currently in transit.
You can track your package by clicking on the following link: {followup}
You can also review this order and download your invoice from the "Order history" section of your account by clicking "My account" on our Website.
If you have a guest account, you can follow your order at this page: {shop_url}guest-tracking.php
Thank you for shopping with {shop_name}!
Your order #{id_order} is currently in transit.
You can track your package using the following link: {followup}
You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
If you have guest account, you can follow your order using this link: {shop_url}guest-tracking.php
{shop_name} - {shop_url}
{shop_url} powered by PrestaShop™
mails/en/index.php
+1 -1
View File
@@ -33,4 +33,4 @@ header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;
exit;
mails/en/lang.php
+33
View File
@@ -27,5 +27,38 @@
global $_LANGMAIL;
$_LANGMAIL = array();
$_LANGMAIL['Welcome!'] = 'Welcome!';
$_LANGMAIL['Message from contact form'] = 'Customer message from contact form';
$_LANGMAIL['Your message has been correctly sent'] = 'Your message has been sent successfully';
$_LANGMAIL['New credit slip regarding your order'] = 'New credit slip regarding your order';
$_LANGMAIL['Virtual product to download'] = 'Virtual product(s) available for download';
$_LANGMAIL['Fwd: Customer message'] = 'Fwd: Customer message';
$_LANGMAIL['Your guest account has been transformed to customer account'] = 'Your guest account has been transformed to a customer account';
$_LANGMAIL['Package in transit'] = 'Package in transit';
$_LANGMAIL['[Log'] = '[Log';
$_LANGMAIL['Order confirmation'] = 'Order confirmation';
$_LANGMAIL['Message from a customer'] = 'Message from a customer';
$_LANGMAIL['New message regarding your order'] = 'New message regarding your order';
$_LANGMAIL['Your order return state has changed'] = 'Your order return status has changed';
$_LANGMAIL['Your password'] = 'Your password has been reset';
$_LANGMAIL['Password query confirmation'] = 'Forgot password';
$_LANGMAIL['An answer to your message is available'] = 'New response to your inquiry';
$_LANGMAIL['New voucher regarding your order'] = 'New voucher for your order';
$_LANGMAIL['Happy birthday!'] = 'Happy birthday!';
$_LANGMAIL['Newsletter confirmation'] = 'Newsletter subscription confirmation';
$_LANGMAIL['Newsletter voucher'] = 'Newsletter voucher';
$_LANGMAIL['Your wishlist\\\'s link'] = 'Your wishlist\'s link';
$_LANGMAIL['Message from '] = 'Message from ';
$_LANGMAIL['$subject'] = '';
$_LANGMAIL['Your cart and your discount'] = 'Discount offer for items in your cart';
$_LANGMAIL['Thanks for your order'] = 'Thanks for your order!';
$_LANGMAIL['You are one of our best customers'] = 'Thank you for being one of our best customers';
$_LANGMAIL['We miss you'] = 'We miss you';
$_LANGMAIL['Product available'] = 'Your watched product is now available';
$_LANGMAIL['Product out of stock'] = 'One or more products are almost out of stock';
$_LANGMAIL['Error reporting from your PayPal module'] = 'Error reporting from your PayPal module';
$_LANGMAIL['Congratulations!'] = 'Congratulations!';
$_LANGMAIL['Referral Program'] = 'Referral program';
$_LANGMAIL['A friend sent you a link to'] = 'A friend sent you a link to';
?>
mails/en/log_alert.html
+5 -5
View File
@@ -13,28 +13,28 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">Hi,</td>
<td align="left">Hello,</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">New log alert</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">You have received a new log alert</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
<b>Unfortunately, new log alert message has been saved.</b>
<b>Warning:</b> you have received a new log alert in your Back Office.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
You can check this on your Back office &gt; Tools &gt; Log on our Website.
You can check for it in the "Tools" > "Logs" section of your Back Office.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
mails/en/log_alert.txt
+4 -6
View File
@@ -1,11 +1,9 @@
Hi,
Hello,
New log alert
Warning: you have received a new log alert in your Back Office.
Unfortunately, new log alert message has been saved.
You can check for it in the "Tools" > "Logs" section of your Back Office.
You can check this on your Back office > Tools > Log on our Website.
{shop_name} - {shop_url}
{shop_url} powered by PrestaShop™
{shop_url} powered by PrestaShop™
mails/en/newsletter.html
+2 -2
View File
@@ -22,9 +22,9 @@
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
</body>
</html>
</html>
mails/en/newsletter.txt
-4
View File
@@ -1,9 +1,5 @@
Newsletter from {shop_name}
Message
{message}
{shop_url} powered by PrestaShop™
mails/en/order_canceled.html
+5 -5
View File
@@ -17,29 +17,29 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Concerning your order #{id_order}</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order #{id_order} - Order cancelled</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
<b>Your order has been cancelled.</b>
<b>Your order #{id_order} from {shop_name} has been cancelled.</b>
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
You can review this order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our Website.
You can review your order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your customer account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our shop.<br /><br />
</td>
</tr>
<tr>
<td align="left">
If you have guest account, you can follow your order at <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our Website.
If you have guest account, you can follow your order via the <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our shop.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
mails/en/order_canceled.txt
+3 -6
View File
@@ -1,14 +1,11 @@
Hi {firstname} {lastname},
Concerning your order #{id_order}:
Your order #{id_order} from {shop_name} has been cancelled.
Your order has been cancelled.
You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
You can review this order and download your invoice from the "Order history" section of your account by clicking "My account" on our Website.
If you have guest account, you can follow your order at this page: {shop_url}guest-tracking.php
If you have guest account, you can follow your order using this link: {shop_url}guest-tracking.php
{shop_name} - {shop_url}
{shop_url} powered by PrestaShop™
mails/en/order_conf.html
+4 -4
View File
@@ -13,7 +13,7 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">Hello <strong style="color:#DB3484;">{firstname} {lastname}</strong>, thank you for shopping with <strong>{shop_name}</strong>.</td>
<td align="left">Hi <strong style="color:#DB3484;">{firstname} {lastname}</strong>,<br /><br />Thank you for shopping with <strong>{shop_name}</strong>!</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
@@ -102,18 +102,18 @@
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
You can review this order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our Website.
You can review your order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your customer account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our shop.<br /><br />
</td>
</tr>
<tr>
<td align="left">
If you have a guest account, you can follow your order at <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our Website.
If you have guest account, you can follow your order via the <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our shop.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
mails/en/order_conf.txt
+6 -8
View File
@@ -1,6 +1,6 @@
Hello {firstname} {lastname}, thank you for your order on {shop_name}!
Hi {firstname} {lastname},
Order details
Thank you for your order on {shop_name}!
Order: {order_name} placed on {date}
Payment: {payment}
@@ -11,9 +11,6 @@ Order details
Gift-wrapping: {total_wrapping}
Total paid: {total_paid}
Shipping
Carrier: {carrier}
Delivery address:
@@ -24,7 +21,8 @@ Shipping
{invoice_block_txt}
You can review this order and download your invoice from the "Order history" section of your account by clicking "My account" on our Website.
If you have a guest account, you can follow your order at this page: {shop_url}guest-tracking.php
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.
{shop_url} powered by PrestaShop™
If you have guest account, you can follow your order using this link: {shop_url}guest-tracking.php
{shop_url} powered by PrestaShop™
mails/en/order_customer_comment.html
+5 -4
View File
@@ -17,12 +17,13 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Message from {firstname} {lastname} ({email})</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Message from a customer</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
<b>You have received a new message regarding order #{id_order}:</b>
<b>You have received a new message regarding order #{id_order}.</b><br /><br />
<b>Customer:</b> {firstname} {lastname} ({email})
<br /><br />
{message}
</td>
@@ -30,9 +31,9 @@
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
</body>
</html>
</html>
mails/en/order_customer_comment.txt
+5 -3
View File
@@ -1,8 +1,10 @@
Hi {firstname} {lastname},
Hello,
You have received a new message regarding order #{id_order}:
You have received a new message from a customer regarding order #{id_order}.
Customer: {firstname} {lastname} ({email})
Message:
{message}
{shop_url} powered by PrestaShop™
mails/en/order_merchant_comment.html
+5 -4
View File
@@ -17,20 +17,21 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Message from {shop_name}</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">New message from {shop_name}</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
<b>You have received a new message regarding order #{id_order}:</b>
<br><br>
<b>You have received a new message from {shop_name} regarding order #{id_order}.</b>
<br /><br />
Message:<br />
{message}
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
mails/en/order_merchant_comment.txt
+3 -5
View File
@@ -1,10 +1,8 @@
Message from {shop_name}
Hi {firstname} {lastname},
You have received a new message regarding order #{id_order}:
You have received a new message from {shop_name} regarding your order #{id_order}.
Message:
{message}
{shop_url} powered by PrestaShop™
mails/en/order_return_state.html
+5 -5
View File
@@ -17,26 +17,26 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order return #{id_order_return} history</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Return #{id_order_return} - update</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
<b>Your return order has changed in "{state_order_return}".</b>
We have updated the progress on your return #{id_order_return}, the new status is: <b>"{state_order_return}"</b>
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
You can review this order return from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our Website.
You can review your order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your customer account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our shop.<br /><br />
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
</body>
</html>
</html>
mails/en/order_return_state.txt
+2 -4
View File
@@ -1,11 +1,9 @@
Hi {firstname} {lastname},
Your return order #{id_order_return} history has changed in "{state_order_return}".
We have updated the progress on your return #{id_order_return}, the new status is: "{state_order_return}"
You can review this order return in the "Order history" section of your 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 shop.
{shop_name} - {shop_url}
{shop_url} powered by PrestaShop™
mails/en/outofstock.html
+5 -5
View File
@@ -17,29 +17,29 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order #{id_order} history</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order #{id_order} - Item(s) out of stock</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
<b>Unfortunately, one or more items on your order #{id_order} are currently out of stock. This may cause a slight delay in delivery. Please accept our apologies and rest assured that we are working hard to rectify this.</b>
Thanks for your order #{id_order} from {shop_name}.<br /><br />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.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
You can review this order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our Website.
You can review your order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your customer account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our shop.<br /><br />
</td>
</tr>
<tr>
<td align="left">
If you have guest account, you can follow your order at <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our Website.
If you have guest account, you can follow your order via the <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our shop.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
mails/en/outofstock.txt
+11 -10
View File
@@ -1,14 +1,15 @@
Hi {firstname} {lastname},
Your order #{id_order} history
Unfortunately, one or more items on your order #{id_order} is currently out of stock. This may cause a slight delay in delivery. Please accept our apologies and rest assured that we are working hard to rectify this.
Hi {firstname} {lastname},
You can review this order and download your invoice from the "Order history" section of your account by clicking "My account" on our Website.
If you have guest account, you can follow your order at this page: {shop_url}guest-tracking.php
{shop_name} - {shop_url}
Thanks for your order #{id_order} from {shop_name}.
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" section of your customer account by clicking "My account" on our shop.
{shop_url} powered by PrestaShop™
If you have guest account, you can follow your order using this link: {shop_url}guest-tracking.php
{shop_name} - {shop_url}
{shop_url} powered by PrestaShop™
mails/en/password.html
+4 -6
View File
@@ -17,27 +17,25 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your new login details</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your new {shop_name} login details</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
<b>E-mail address:</b> {email}<br>
<b>E-mail address:</b> {email}<br />
<b>Password:</b> {passwd}
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
Please be careful when sharing these login details with others.
<br><br>
You can now order on our Website: {shop_url}
Please be careful when sharing these login details with others.<br /><br />You can now order on our shop: {shop_url}
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
mails/en/password.txt
+3 -3
View File
@@ -1,11 +1,11 @@
Hello {firstname} {lastname},
Your new login details:
Here are your new {shop_name} login details:
E-mail address: {email}
Password: {passwd}
You can now place an order on our Website: {shop_url}
You can now place an order on our shop: {shop_url}
Please be careful when sharing these login details with others.
mails/en/password_query.html
+8 -4
View File
@@ -13,17 +13,21 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">Hello <strong style="color:#DB3484;">{firstname} {lastname}</strong>,</td>
<td align="left">Hi <strong style="color:#DB3484;">{firstname} {lastname}</strong>,</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">You asked to get back your {shop_name} access codes,<br />
Note that this action will change your current password.</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Password reset request for {shop_name}</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">You have requested to reset your {shop_name} login details.<br /><br />
Please note that this will change your current password.</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
If you really want to do it, click the following link :<br />
To confirm this action, please use the following link:<br />
<a href="{url}">{url}</a>
</td>
</tr>
mails/en/password_query.txt
+6 -5
View File
@@ -1,9 +1,10 @@
Hello {firstname} {lastname},
Hi {firstname} {lastname},
You asked to get back your {shop_name} access codes.
Note that this action will change your current password.
You have requested to reset your {shop_name} login details.
If you really want to do it, click the following link :
Please note that this will change your current password.
To confirm this action, please use the following link:
{url}
{shop_url} powered by PrestaShop™
{shop_url} powered by PrestaShop™
mails/en/payment.html
+10 -4
View File
@@ -17,24 +17,30 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order #{id_order} history</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order #{id_order} - Payment processed</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
<b>Payment for your order was successfully processed.</b>
Thank you for shopping with {shop_name}!<br /><br />
<b>Your payment for order #{id_order} was successfully processed.</b>
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
You can review this order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our Website.
You can review your order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your customer account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our shop.<br /><br />
</td>
</tr>
<tr>
<td align="left">
If you have guest account, you can follow your order via the <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our shop.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
mails/en/payment.txt
+9 -9
View File
@@ -1,13 +1,13 @@
Hi {firstname} {lastname},
Your order #{id_order} history
Payment for your order was successfully processed.
Hi {firstname} {lastname},
You can review this order and download your invoice from the "Order history" section of your account by clicking "My account" on our Website.
Thank you for shopping with {shop_name}!
{shop_name} - {shop_url}
Your payment for order #{id_order} was successfully processed.
Thank you for shopping with {shop_name}.
You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
{shop_url} powered by PrestaShop™
If you have guest account, you can follow your order using this link: {shop_url}guest-tracking.php
{shop_name} - {shop_url}
{shop_url} powered by PrestaShop™
mails/en/payment_error.html
+6 -6
View File
@@ -17,35 +17,35 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order #{id_order} history</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order #{id_order} - Payment processing error</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
<b>There is a problem with your payment for order #{id_order}. Please contact us at your earliest convenience.</b>
<b>There is a problem with your payment for {shop_name} order #{id_order}. Please contact us at your earliest convenience.</b>
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
<b>Your order will not be shipped until we have resolved this problem.</b>
<b>We cannot ship your order until we receive your payment. </b>
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
You can review this order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our Website.
You can review your order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your customer account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our shop.<br /><br />
</td>
</tr>
<tr>
<td align="left">
If you have guest account, you can follow your order at <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our Website.
If you have guest account, you can follow your order via the <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our shop.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
mails/en/payment_error.txt
+5 -6
View File
@@ -1,14 +1,13 @@
Hi {firstname} {lastname},
There is a problem with your payment for order #{id_order}. Please contact us at your earliest convenience.
There is a problem with your payment for {shop_name} order #{id_order}. Please contact us at your earliest convenience.
Your order will not be shipped until we have resolved this problem.
We cannot ship your order until we receive your payment.
You can review this order and download your invoice from the "Order history" section of your account by clicking "My account" on our Website.
If you have guest account, you can follow your order at this page: {shop_url}guest-tracking.php
You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
If you have guest account, you can follow your order using this link: {shop_url}guest-tracking.php
{shop_name} - {shop_url}
{shop_url} powered by PrestaShop™
mails/en/preparation.html
+6 -6
View File
@@ -17,31 +17,31 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order #{id_order} history</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order #{id_order} - Processing</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
<b>We are processing your order.</b>
<b>We are currently processing your {shop_name} order #{id_order}.</b>
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
You can review this order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our Website.
You can review your order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your customer account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our shop.<br /><br />
</td>
</tr>
<tr>
<td align="left">
If you have guest account, you can follow your order at <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our Website.
If you have guest account, you can follow your order via the <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our shop.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
</body>
</html>
</html>
mails/en/preparation.txt
+7 -10
View File
@@ -1,14 +1,11 @@
Hi {firstname} {lastname},
Your order #{id_order} history
We are processing your order.
Hi {firstname} {lastname},
You can review this order and download your invoice from the "Order history" section of your account by clicking "My account" on our Website.
If you have guest account, you can follow your order at this page: {shop_url}guest-tracking.php
{shop_name} - {shop_url}
We are currently processing your {shop_name} order #{id_order}.
You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
If you have guest account, you can follow your order using this link: {shop_url}guest-tracking.php
{shop_url} powered by PrestaShop™
{shop_name} - {shop_url}
{shop_url} powered by PrestaShop™
mails/en/refund.html
+5 -5
View File
@@ -17,29 +17,29 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order #{id_order} history</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Refund processed for order #{id_order}</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
<b>Your order payment has been refunded.</b>
<b>We have processed your {shop_name} refund for order #{id_order}.</b>
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
You can review this order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our Website.
You can review your order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your customer account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our shop.<br /><br />
</td>
</tr>
<tr>
<td align="left">
If you have guest account, you can follow your order at <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our Website.
If you have guest account, you can follow your order via the <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our shop.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
mails/en/refund.txt
+6 -7
View File
@@ -1,12 +1,11 @@
Hi {firstname} {lastname},
Hi {firstname} {lastname},
Your order payment has been refunded.
We have processed your {shop_name} refund for order #{id_order}.
You can review this order and download your invoice from the "Order history" section of your account by clicking "My account" on our Website.
If you have guest account, you can follow your order at this page: {shop_url}guest-tracking.php
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.
{shop_name} - {shop_url}
If you have guest account, you can follow your order using this link: {shop_url}guest-tracking.php
{shop_name} - {shop_url}
{shop_url} powered by PrestaShop™
{shop_url} powered by PrestaShop™
mails/en/reply_msg.html
+2 -2
View File
@@ -9,8 +9,8 @@
<tr>
<td style="border:1px solid #CCCCCC;background-color:#FFFFFF;padding:10px;color:#383838;font-size:12px">
{reply}<br /><br />
<span style="color:red;font-weight:bold">Please do not reply to this message with your e-mail client</span>, we would not receive your message.<br />
In order to reply, please use exclusively the following link: <a href="{link}">{link}</a>.
<span style="color:#CC0000;font-weight:bold">Please do not reply to this message</span>, we will not receive it.<br /><br />
In order to reply, please use the following link: <a href="{link}">{link}</a>.
</td>
</tr>
</table>
mails/en/reply_msg.txt
+3 -2
View File
@@ -1,4 +1,5 @@
{reply}
Please do not reply to this message using your e-mail client, we would not receive your message.
In order to reply, please use exclusively the following link: {link}
Please do not reply to this message, we will not receive it.
In order to reply, please use the following link: {link}
mails/en/shipped.html
+6 -6
View File
@@ -17,31 +17,31 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order #{id_order} history</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order #{id_order} - Shipped</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
<b>Your order has been shipped.</b><br />You will soon receive a URL to click on in order to track the delivery progress of your package.
Thank you for shopping with {shop_name}!<br /><br /><b>Your order #{id_order} has been shipped.</b><br />You will soon receive a URL to track the delivery progress of your package.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
You can review this order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our Website.
You can review your order and download your invoice from the <a href="{shop_url}history.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Order history"</a> section of your customer account by clicking <a href="{shop_url}my-account.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"My account"</a> on our shop.<br /><br />
</td>
</tr>
<tr>
<td align="left">
If you have guest account, you can follow your order at <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our Website.
If you have guest account, you can follow your order via the <a href="{shop_url}guest-tracking.php" style="color:#DB3484; font-weight:bold; text-decoration:none;">"Guest Tracking"</a> section on our shop.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
</body>
</html>
</html>
mails/en/shipped.txt
+8 -9
View File
@@ -1,16 +1,15 @@
Hi {firstname} {lastname},
Your order has just been shipped.
You will soon receive a URL to click on in order to track the delivery progress of your package.
You can review this order and download your invoice from the "Order history" section of your account by clicking "My account" on our Website.
If you have guest account, you can follow your order at this page: {shop_url}guest-tracking.php
Thank you for shopping with {shop_name}!
Your order #{id_order} has just been shipped.
You will soon receive a URL to track the delivery progress of your package.
You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
If you have guest account, you can follow your order using this link: {shop_url}guest-tracking.php
{shop_name} - {shop_url}
{shop_url} powered by PrestaShop™
mails/en/test.html
+5 -4
View File
@@ -8,16 +8,17 @@
<table style="font-family:Verdana,sans-serif; font-size:11px; color:#374953; width: 550px;">
<tr>
<td>
Hello,<br><br>
This is a <b>test mail</b> from your shop.
Hello,<br /><br />
This is a <b>test e-mail</b> from your shop.<br /><br />
If you can read this, the test was successful!
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
</body>
</html>
</html>
mails/en/test.txt
+6 -1
View File
@@ -1,3 +1,8 @@
Hello,
This is a test mail from your PrestaShop™ online shop.
This is a test e-mail from your PrestaShop™ online shop.
If you can read this, the test was successful!
Regards,
{shop_name} powered by PrestaShop™
mails/en/voucher.html
+4 -4
View File
@@ -17,25 +17,25 @@
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order #{id_order} history</td>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Your order #{id_order} - Voucher created</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
This is to inform you about the creation of a voucher in your name as a result of your order #{id_order}.
A voucher has been created in your name as a result of your order #{id_order}.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
Here is the code of your voucher : <b>{voucher_num}</b>, with an amount of <b>{voucher_amount}</b>.<br />
Voucher code: <b>{voucher_num}</b>, in the amount of <b>{voucher_amount}</b>.<br />
Simply copy/paste this code during the payment process for your next order.
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered with <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
</tr>
</table>
mails/en/voucher.txt
+2 -3
View File
@@ -1,8 +1,8 @@
Hi {firstname} {lastname},
This is to inform you about the creation of a voucher in your name as a result of your order #{id_order}.
A voucher has been created in your name as a result of your order #{id_order}.
Here is the code of your voucher : {voucher_num}, to 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.
@@ -10,5 +10,4 @@ Thank you for shopping at {shop_name}.
{shop_name} - {shop_url}
{shop_url} powered by PrestaShop™
mails/es/account.html
-1
View File
@@ -48,6 +48,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/bankwire.html
-1
View File
@@ -51,6 +51,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/cheque.html
-1
View File
@@ -51,6 +51,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/contact.html
-1
View File
@@ -30,6 +30,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/contact_form.html
-1
View File
@@ -36,6 +36,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/credit_slip.html
-1
View File
@@ -42,6 +42,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/download_product.html
-1
View File
@@ -51,6 +51,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/employee_password.html
-1
View File
@@ -6,6 +6,5 @@
</head>
<body>
</body>
</html>
mails/es/forward_msg.html
-1
View File
@@ -12,6 +12,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/guest_to_customer.html
-1
View File
@@ -42,6 +42,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/in_transit.html
-1
View File
@@ -51,6 +51,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/lang.php
+7 -7
View File
@@ -10,7 +10,7 @@ $_LANGMAIL['Virtual product to download'] = '';
$_LANGMAIL['Fwd: Customer message'] = '';
$_LANGMAIL['Your guest account has been transformed to customer account'] = '';
$_LANGMAIL['Package in transit'] = '';
$_LANGMAIL['[Log'] = '';
$_LANGMAIL['Log: You have a new alert from your shop'] = '';
$_LANGMAIL['Order confirmation'] = 'Confirmacion de pedido';
$_LANGMAIL['Message from a customer'] = 'Mensaje de un cliente';
$_LANGMAIL['New message regarding your order'] = '';
@@ -23,17 +23,17 @@ $_LANGMAIL['Happy birthday!'] = '';
$_LANGMAIL['Newsletter confirmation'] = '';
$_LANGMAIL['Newsletter voucher'] = '';
$_LANGMAIL['Your wishlist\\\'s link'] = '';
$_LANGMAIL['Message from '] = '';
$_LANGMAIL['Message from \').$customer->lastname.\' '] = '';
$_LANGMAIL[' $subject'] = '';
$_LANGMAIL['Your cart and your discount'] = '';
$_LANGMAIL['Thanks for your order'] = '';
$_LANGMAIL['You are one of our best customers'] = '';
$_LANGMAIL['We miss you'] = '';
$_LANGMAIL['Your cart and your discount'] = 'Su cesta y su descuento';
$_LANGMAIL['Thanks for your order'] = 'Gracias por su pedido';
$_LANGMAIL['You are one of our best customers'] = 'Usted es uno de nuestros mejores clientes';
$_LANGMAIL['We miss you'] = 'Te extrañamos';
$_LANGMAIL['Product available'] = '';
$_LANGMAIL['Product out of stock'] = '';
$_LANGMAIL['Error reporting from your PayPal module'] = '';
$_LANGMAIL['Congratulations!'] = '';
$_LANGMAIL['Referral Program'] = '';
$_LANGMAIL['A friend sent you a link to'] = '';
$_LANGMAIL['A friend sent you a link to\').\' '] = '';
?>
mails/es/log_alert.html
-1
View File
@@ -42,6 +42,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/newsletter.html
-1
View File
@@ -30,6 +30,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/order_canceled.html
-1
View File
@@ -45,6 +45,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/order_conf.html
+7 -17
View File
@@ -32,14 +32,11 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">
<table style="width: 100%; font-size: 11px; color: #374953;">
<!-- Title -->
<td align="left">{products} {discounts}
<table style="width: 100%; font-size: 11px; color: #374953;"><!-- Title -->
<tbody>
<tr style="background-color: #b9babe; text-align: center;">
<th style="width: 15%; padding: 1em 0;">Referencia</th><th>Producto</th><th style="width: 15%;">Precio Unidad</th><th style="width: 15%;">Cantidad</th><th style="width: 20%;">Precio Total</th>
</tr>
<!-- Products -->{products} {discounts} <!-- Footer: prices -->
<tr style="background-color: #b9babe; text-align: center;"><th style="width: 15%; padding: 1em 0;">Referencia</th><th>Producto</th><th style="width: 15%;">Precio Unidad</th><th style="width: 15%;">Cantidad</th><th style="width: 20%;">Precio Total</th></tr>
<!-- Products --><!-- Footer: prices -->
<tr style="text-align: right;">
<td>&nbsp;</td>
<td style="background-color: #b9babe; padding: 0.6em 0.4em;" colspan="3">Productos</td>
@@ -83,16 +80,10 @@
<td>
<table style="width: 100%; font-size: 11px; color: #374953;">
<tbody>
<tr style="background-color: #b9babe; text-transform: uppercase;">
<th style="text-align: left; padding: 0.3em 1em;">Direcci&oacute;n de Entrega</th><th style="text-align: left; padding: 0.3em 1em;">Direcci&oacute;n de Facturaci&oacute;n</th>
</tr>
<tr style="background-color: #b9babe; text-transform: uppercase;"><th style="text-align: left; padding: 0.3em 1em;">Direcci&oacute;n de Entrega</th><th style="text-align: left; padding: 0.3em 1em;">Direcci&oacute;n de Facturaci&oacute;n</th></tr>
<tr>
<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">
{delivery_block_html}
</td>
<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">
{invoice_block_html}
</td>
<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{delivery_block_html}</td>
<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{invoice_block_html}</td>
</tr>
</tbody>
</table>
@@ -115,6 +106,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/order_customer_comment.html
-1
View File
@@ -36,6 +36,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/order_merchant_comment.html
+20 -18
View File
@@ -6,33 +6,35 @@
</head>
<body>
<table style="font-family:Verdana,sans-serif; font-size:11px; color:#374953; width: 550px;">
<tbody>
<tr>
<td align="left">
<a href="{shop_url}" title="{shop_name}"><img alt="{shop_name}" src="{shop_logo}" style="border:none;" ></a>
</td>
<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">Hola <strong style="color:#DB3484;">{firstname} {lastname}</strong>,</td>
<td>&nbsp;</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left" style="background-color:#DB3484; color:#FFF; font-size: 12px; font-weight:bold; padding: 0.5em 1em;">Mensaje de {shop_name}</td>
<td align="left">Hola <strong style="color: #db3484;">{firstname} {lastname}</strong>,</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="left">
<b>Has recibido un nuevo mensaje sobre el pedido n&#176;{id_order} :</b>
<br><br>
{message}
</td>
<td>&nbsp;</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size:10px; border-top: 1px solid #D9DADE;">
<a href="{shop_url}" style="color:#DB3484; font-weight:bold; text-decoration:none;">{shop_name}</a> desarrollado por <a href="http://www.prestashop.com/" style="text-decoration:none; color:#374953;">PrestaShop™</a>
</td>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Mensaje de {shop_name}</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td align="left"><strong>Has recibido un nuevo mensaje sobre el pedido n&deg;{id_order} :</strong> <br /><br /> {message}</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> desarrollado por <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
</tr>
</tbody>
</table>
</body>
</html>
</html>
mails/es/order_return_state.html
-1
View File
@@ -42,6 +42,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/outofstock.html
-1
View File
@@ -45,6 +45,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/password.html
-1
View File
@@ -42,6 +42,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/password_query.html
+1 -2
View File
@@ -20,7 +20,7 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">You asked to get back your {shop_name}&#039;identifiers,<br />Note that this action will change your actual password.</td>
<td align="left">You asked to get back your {shop_name}identifiers,<br />Note that this action will change your actual password.</td>
</tr>
<tr>
<td>&nbsp;</td>
@@ -36,6 +36,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/payment.html
-1
View File
@@ -45,6 +45,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/payment_error.html
-1
View File
@@ -51,6 +51,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/preparation.html
-1
View File
@@ -45,6 +45,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/refund.html
-1
View File
@@ -45,6 +45,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/reply_msg.html
-1
View File
@@ -12,6 +12,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/shipped.html
-1
View File
@@ -45,6 +45,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/test.html
-1
View File
@@ -18,6 +18,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/es/voucher.html
-1
View File
@@ -42,6 +42,5 @@
</tr>
</tbody>
</table>
</body>
</html>
mails/fr/lang.php
+1 -1
View File
@@ -10,7 +10,7 @@ $_LANGMAIL['Virtual product to download'] = 'Produit virtuel à télécharger';
$_LANGMAIL['Fwd: Customer message'] = 'TR: Message d\'un client';
$_LANGMAIL['Your guest account has been transformed to customer account'] = 'Votre compte invité a été transformé en compte client';
$_LANGMAIL['Package in transit'] = 'Livraison en cours';
$_LANGMAIL['[Log'] = '';
$_LANGMAIL['[Log'] = '[Log';
$_LANGMAIL['Order confirmation'] = 'Confirmation de commande';
$_LANGMAIL['Message from a customer'] = 'Message d\'un client';
$_LANGMAIL['New message regarding your order'] = 'Nouveau message concernant votre commande';