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

[-] CORE : fixed bug #PSCFV-4595

Browse Source
This commit is contained in:
vAugagneur
2012-10-12 14:59:26 +00:00
parent 5172550c37
commit 3ab7ff314c
127 changed files with 210 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mails/en/bankwire.html
+2 -2
View File
@@ -38,10 +38,10 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=history">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=my-account">"My account"</a> on our shop.<br /><br /></td>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{history_url}">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{my_account_url}">"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 via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=guest-tracking">"Guest Tracking"</a> section on our shop.</td>
<td align="left">If you have a guest account, you can follow your order via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/en/bankwire.txt
+1 -1
View File
@@ -19,7 +19,7 @@ Bank address: {bankwire_address}
You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking
If you have guest account, you can follow your order using this link: {guest_tracking_url}
{shop_name} - {shop_url}
mails/en/cheque.html
+2 -2
View File
@@ -38,10 +38,10 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=history">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=my-account">"My account"</a> on our shop.<br /><br /></td>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{history_url}">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{my_account_url}">"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 via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=guest-tracking">"Guest Tracking"</a> section on our shop.</td>
<td align="left">If you have a guest account, you can follow your order via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/en/credit_slip.html
+1 -1
View File
@@ -32,7 +32,7 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">You can review this credit slip and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=history">"My credit slips"</a> section of your account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=my-account">"My account"</a> on our shop.</td>
<td align="left">You can review this credit slip and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{history_url}">"My credit slips"</a> section of your account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{my_account_url}">"My account"</a> on our shop.</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/en/download_product.html
+2 -2
View File
@@ -38,10 +38,10 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=history">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=my-account">"My account"</a> on our shop.<br /><br /></td>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{history_url}">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{my_account_url}">"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 via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=guest-tracking?id_order={order_name}">"Guest Tracking"</a> section on our shop.</td>
<td align="left">If you have a guest account, you can follow your order via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{guest_tracking_url}?id_order={order_name}">"Guest Tracking"</a> section on our shop.</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/en/download_product.txt
+1 -1
View File
@@ -8,6 +8,6 @@ You have {nbProducts} product(s) now available for download using the following
You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking
If you have guest account, you can follow your order using this link: {guest_tracking_url}
{shop_url} powered by PrestaShop™
mails/en/in_transit.html
+2 -2
View File
@@ -32,10 +32,10 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=history">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=my-account">"My account"</a> on our shop.<br /><br /></td>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{history_url}">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{my_account_url}">"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 via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=guest-tracking">"Guest Tracking"</a> section on our shop.</td>
<td align="left">If you have a guest account, you can follow your order via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/en/in_transit.txt
+1 -1
View File
@@ -8,7 +8,7 @@ You can track your package using the following link: {followup}
You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking
If you have guest account, you can follow your order using this link: {guest_tracking_url}
{shop_name} - {shop_url}
mails/en/order_canceled.html
+2 -2
View File
@@ -32,10 +32,10 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=history">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=my-account">"My account"</a> on our shop.<br /><br /></td>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{history_url}">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{my_account_url}">"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 via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=guest-tracking">"Guest Tracking"</a> section on our shop.</td>
<td align="left">If you have a guest account, you can follow your order via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/en/order_canceled.txt
+1 -1
View File
@@ -4,7 +4,7 @@ Your order with the reference {order_name} from {shop_name} has been cancelled.
You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking
If you have guest account, you can follow your order using this link: {guest_tracking_url}
{shop_name} - {shop_url}
mails/en/order_changed.html
+2 -2
View File
@@ -32,10 +32,10 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=history">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=my-account">"My account"</a> on our shop.<br /><br /></td>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{history_url}">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{my_account_url}">"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 via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=guest-tracking">"Guest Tracking"</a> section on our shop.</td>
<td align="left">If you have a guest account, you can follow your order via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/en/order_changed.txt
+1 -1
View File
@@ -4,7 +4,7 @@ Your order with the reference {order_name} from {shop_name} has been changed by
You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking
If you have guest account, you can follow your order using this link: {guest_tracking_url}
{shop_name} - {shop_url}
mails/en/order_conf.html
+2 -2
View File
@@ -103,10 +103,10 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=history">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=my-account">"My account"</a> on our shop.<br /><br /></td>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{history_url}">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{my_account_url}">"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 via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=guest-tracking">"Guest Tracking"</a> section on our shop.</td>
<td align="left">If you have a guest account, you can follow your order via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/en/order_conf.txt
+1 -1
View File
@@ -23,6 +23,6 @@ Thank you for your order on {shop_name}!
You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking
If you have guest account, you can follow your order using this link: {guest_tracking_url}
{shop_url} powered by PrestaShop™
mails/en/order_return_state.html
+1 -1
View File
@@ -32,7 +32,7 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=history">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=my-account">"My account"</a> on our shop.<br /><br /></td>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{history_url}">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{my_account_url}">"My account"</a> on our shop.<br /><br /></td>
</tr>
<tr>
<td>&nbsp;</td>
mails/en/outofstock.html
+2 -2
View File
@@ -32,10 +32,10 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=history">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=my-account">"My account"</a> on our shop.<br /><br /></td>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{history_url}">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{my_account_url}">"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 via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=guest-tracking">"Guest Tracking"</a> section on our shop.</td>
<td align="left">If you have a guest account, you can follow your order via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/en/outofstock.txt
+1 -1
View File
@@ -8,7 +8,7 @@ Please accept our apologies and rest assured that we are working hard to rectify
You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking
If you have guest account, you can follow your order using this link: {guest_tracking_url}
{shop_name} - {shop_url}
mails/en/payment.html
+2 -2
View File
@@ -32,10 +32,10 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=history">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=my-account">"My account"</a> on our shop.<br /><br /></td>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{history_url}">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{my_account_url}">"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 via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=guest-tracking">"Guest Tracking"</a> section on our shop.</td>
<td align="left">If you have a guest account, you can follow your order via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/en/payment.txt
+1 -1
View File
@@ -6,7 +6,7 @@ Your payment for order with the reference {order_name} was successfully processe
You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking
If you have guest account, you can follow your order using this link: {guest_tracking_url}
{shop_name} - {shop_url}
mails/en/payment_error.html
+2 -2
View File
@@ -38,10 +38,10 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=history">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=my-account">"My account"</a> on our shop.<br /><br /></td>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{history_url}">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{my_account_url}">"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 via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=guest-tracking">"Guest Tracking"</a> section on our shop.</td>
<td align="left">If you have a guest account, you can follow your order via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/en/payment_error.txt
+1 -1
View File
@@ -6,7 +6,7 @@ We cannot ship your order until we receive your payment.
You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking
If you have guest account, you can follow your order using this link: {guest_tracking_url}
{shop_name} - {shop_url}
mails/en/preparation.html
+2 -2
View File
@@ -32,10 +32,10 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=history">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=my-account">"My account"</a> on our shop.<br /><br /></td>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{history_url}">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{my_account_url}">"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 via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=guest-tracking">"Guest Tracking"</a> section on our shop.</td>
<td align="left">If you have a guest account, you can follow your order via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/en/preparation.txt
+1 -1
View File
@@ -4,7 +4,7 @@ We are currently processing your {shop_name} order with the reference {order_nam
You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking
If you have guest account, you can follow your order using this link: {guest_tracking_url}
{shop_name} - {shop_url}
mails/en/refund.html
+2 -2
View File
@@ -32,10 +32,10 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=history">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=my-account">"My account"</a> on our shop.<br /><br /></td>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{history_url}">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{my_account_url}">"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 via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=guest-tracking">"Guest Tracking"</a> section on our shop.</td>
<td align="left">If you have a guest account, you can follow your order via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/en/refund.txt
+1 -1
View File
@@ -4,7 +4,7 @@ We have processed your {shop_name} refund for order with the reference {order_na
You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking
If you have guest account, you can follow your order using this link: {guest_tracking_url}
{shop_name} - {shop_url}
mails/en/shipped.html
+2 -2
View File
@@ -32,10 +32,10 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=history">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=my-account">"My account"</a> on our shop.<br /><br /></td>
<td align="left">You can review your order and download your invoice from the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{history_url}">"Order history"</a> section of your customer account by clicking <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{my_account_url}">"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 via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}?controller=guest-tracking">"Guest Tracking"</a> section on our shop.</td>
<td align="left">If you have a guest account, you can follow your order via the <a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{guest_tracking_url}">"Guest Tracking"</a> section on our shop.</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/en/shipped.txt
+1 -1
View File
@@ -8,7 +8,7 @@ You will soon receive a URL to track the delivery progress of your package.
You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
If you have guest account, you can follow your order using this link: {shop_url}?controller=guest-tracking
If you have guest account, you can follow your order using this link: {guest_tracking_url}
{shop_name} - {shop_url}