[-] FO : #PSCFV-2920 - Hidding order number, use order reference instead

mails/en/bankwire.html

@@ -20,13 +20,13 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order {order_name} - Awaiting wire payment</td>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order with the reference {order_name} - Awaiting wire payment</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Thank you for shopping at {shop_name}!<br /><br /> Your order {order_name} has been placed successfully and will be <strong>shipped as soon as we receive your payment</strong>.</td>
+<td align="left">Thank you for shopping at {shop_name}!<br /><br /> Your order with the reference {order_name} has been placed successfully and will be <strong>shipped as soon as we receive your payment</strong>.</td>
 </tr>
 <tr>
 <td>&nbsp;</td>

mails/en/bankwire.txt

@@ -2,7 +2,7 @@ Hi {firstname} {lastname},
 
 Thank you for shopping at {shop_name}!
 
-Your order {order_name} has been placed successfully and will be shipped as soon as we receive your payment.
+Your order with the reference {order_name} has been placed successfully and will be shipped as soon as we receive your payment.
 
 You have selected to pay by wire transfer.
 

mails/en/cheque.html

@@ -20,13 +20,13 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order {order_name} - Awaiting check payment</td>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order with the reference {order_name} - Awaiting check payment</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Thank you for shopping at {shop_name}!<br /><br /> Your order {order_name} has been placed successfully and will be <strong>shipped as soon as we receive your payment</strong>.</td>
+<td align="left">Thank you for shopping at {shop_name}!<br /><br /> Your order with the reference {order_name} has been placed successfully and will be <strong>shipped as soon as we receive your payment</strong>.</td>
 </tr>
 <tr>
 <td>&nbsp;</td>

mails/en/cheque.txt

@@ -2,7 +2,7 @@ Hi {firstname} {lastname},
 
 Thank you for shopping at {shop_name}!
 
-Your order {order_name} has been placed successfully and will be shipped as soon as we receive your payment.
+Your order with the reference {order_name} has been placed successfully and will be shipped as soon as we receive your payment.
 
 You have selected to pay by check. Please include on your cheque:
 

mails/en/contact_form.html

@@ -20,7 +20,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Your message has been sent successfully.<br /><br /> Message: {message}<br /><br /> Order ID : {id_order}<br /><br /> Attached file : {attached_file}</td>
+<td align="left">Your message has been sent successfully.<br /><br /> Message: {message}<br /><br /> Order ID : {order_name}<br /><br /> Attached file : {attached_file}</td>
 </tr>
 <tr>
 <td>&nbsp;</td>

mails/en/contact_form.txt

@@ -6,7 +6,7 @@ Your message:
 
 {message}
 
-Order ID : {id_order}
+Order reference : {order_name}
 
 Attached file : {attached_file}
 

mails/en/credit_slip.html

@@ -20,13 +20,13 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order #{id_order} - Credit slip created</td>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order with the reference {order_name} - Credit slip created</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left"><strong>We have generated a credit slip in your name for order #{id_order}</strong>.</td>
+<td align="left"><strong>We have generated a credit slip in your name for order with the reference {order_name}</strong>.</td>
 </tr>
 <tr>
 <td>&nbsp;</td>

mails/en/credit_slip.txt

@@ -2,7 +2,7 @@ Hi {firstname} {lastname},
 
 Thank you for shopping at {shop_name}!
 
-We have generated a credit slip in your name for order #{id_order}.
+We have generated a credit slip in your name for order with the reference {order_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.
 

mails/en/in_transit.html

@@ -20,13 +20,13 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order #{id_order} - In transit</td>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order with the reference {order_name} - In transit</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left"><strong>Your order #{id_order} is currently in transit.</strong>.<br /><br />You can track your package using the following link: <a href="{followup}">{followup}</a></td>
+<td align="left"><strong>Your order with the reference {order_name} is currently in transit.</strong>.<br /><br />You can track your package using the following link: <a href="{followup}">{followup}</a></td>
 </tr>
 <tr>
 <td>&nbsp;</td>

mails/en/in_transit.txt

@@ -2,7 +2,7 @@ Hi {firstname} {lastname},
 
 Thank you for shopping with {shop_name}!
 
-Your order #{id_order} is currently in transit.
+Your order with the reference {order_name} is currently in transit.
 
 You can track your package using the following link: {followup}
 

mails/en/order_canceled.html

@@ -20,13 +20,13 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order #{id_order} - Order cancelled</td>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order with the reference {order_name} - Order cancelled</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left"><strong>Your order #{id_order} from {shop_name} has been cancelled.</strong></td>
+<td align="left"><strong>Your order with the reference {order_name} from {shop_name} has been cancelled.</strong></td>
 </tr>
 <tr>
 <td>&nbsp;</td>

mails/en/order_canceled.txt

@@ -1,6 +1,6 @@
 Hi {firstname} {lastname},
 
-Your order #{id_order} from {shop_name} has been cancelled.
+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.
 

mails/en/order_customer_comment.html

@@ -26,7 +26,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left"><strong>You have received a new message regarding order #{id_order}.</strong><br /><br /> <strong>Customer:</strong> {firstname} {lastname} ({email}) <br /><br /> {message}</td>
+<td align="left"><strong>You have received a new message regarding order with the reference {order_name}.</strong><br /><br /> <strong>Customer:</strong> {firstname} {lastname} ({email}) <br /><br /> {message}</td>
 </tr>
 <tr>
 <td>&nbsp;</td>

mails/en/order_customer_comment.txt

@@ -1,6 +1,6 @@
 Hello,
 
-You have received a new message from a customer regarding order #{id_order}.
+You have received a new message from a customer regarding order with the reference {order_name}.
 
 Customer: {firstname} {lastname} ({email})
 

mails/en/order_merchant_comment.html

@@ -26,7 +26,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left"><strong>You have received a new message from {shop_name} regarding order #{id_order}.</strong> <br /><br /> Message:<br /> {message}</td>
+<td align="left"><strong>You have received a new message from {shop_name} regarding order with the reference {order_name}.</strong> <br /><br /> Message:<br /> {message}</td>
 </tr>
 <tr>
 <td>&nbsp;</td>

mails/en/order_merchant_comment.txt

@@ -1,6 +1,6 @@
 Hi {firstname} {lastname},
 
-You have received a new message from {shop_name} regarding your order #{id_order}.
+You have received a new message from {shop_name} regarding your order with the reference {order_name}.
 
 Message:
 {message}

mails/en/outofstock.html

@@ -20,13 +20,13 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order #{id_order} - Item(s) out of stock</td>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order with the reference {order_name} - Item(s) out of stock</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left">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>
+<td align="left">Thanks for your order with the reference {order_name} 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>

mails/en/outofstock.txt

@@ -1,6 +1,6 @@
 Hi {firstname} {lastname},
 
-Thanks for your order #{id_order} from {shop_name}.
+Thanks for your order with the reference {order_name} from {shop_name}.
 
 Unfortunately, one or more items are currently out of stock.
 This may cause a slight delay in your delivery.

mails/en/payment.html

@@ -20,13 +20,13 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order #{id_order} - Payment processed</td>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order with the reference {order_name} - Payment processed</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Thank you for shopping with {shop_name}!<br /><br /> <strong>Your payment for order #{id_order} was successfully processed.</strong></td>
+<td align="left">Thank you for shopping with {shop_name}!<br /><br /> <strong>Your payment for order with the reference {order_name} was successfully processed.</strong></td>
 </tr>
 <tr>
 <td>&nbsp;</td>

mails/en/payment.txt

@@ -2,7 +2,7 @@ Hi {firstname} {lastname},
 
 Thank you for shopping with {shop_name}!
 
-Your payment for order #{id_order} was successfully processed.
+Your payment for order with the reference {order_name} was successfully processed.
 
 You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
 

mails/en/payment_error.html

@@ -20,13 +20,13 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order #{id_order} - Payment processing error</td>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order with the reference {order_name} - Payment processing error</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left"><strong>There is a problem with your payment for {shop_name} order #{id_order}. Please contact us at your earliest convenience.</strong></td>
+<td align="left"><strong>There is a problem with your payment for {shop_name} order with the reference {order_name}. Please contact us at your earliest convenience.</strong></td>
 </tr>
 <tr>
 <td>&nbsp;</td>

mails/en/payment_error.txt

@@ -1,6 +1,6 @@
 Hi {firstname} {lastname},
 
-There is a problem with your payment for {shop_name} order #{id_order}. Please contact us at your earliest convenience.
+There is a problem with your payment for {shop_name} order with the reference {order_name}. Please contact us at your earliest convenience.
 
 We cannot ship your order until we receive your payment.
 

mails/en/preparation.html

@@ -20,13 +20,13 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order #{id_order} - Processing</td>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order {order_name} - Processing</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left"><strong>We are currently processing your {shop_name} order #{id_order}.</strong></td>
+<td align="left"><strong>We are currently processing your {shop_name} order with the reference {order_name}.</strong></td>
 </tr>
 <tr>
 <td>&nbsp;</td>

mails/en/preparation.txt

@@ -1,6 +1,6 @@
 Hi {firstname} {lastname},
 
-We are currently processing your {shop_name} order #{id_order}.
+We are currently processing your {shop_name} order with the reference {order_name}.
 
 You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
 

mails/en/refund.html

@@ -20,13 +20,13 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Refund processed for order #{id_order}</td>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Refund processed for order with the reference {order_name}</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left"><strong>We have processed your {shop_name} refund for order #{id_order}.</strong></td>
+<td align="left"><strong>We have processed your {shop_name} refund for order with the reference {order_name}.</strong></td>
 </tr>
 <tr>
 <td>&nbsp;</td>

mails/en/refund.txt

@@ -1,6 +1,6 @@
 Hi {firstname} {lastname},
 
-We have processed your {shop_name} refund for order #{id_order}.
+We have processed your {shop_name} refund for order with the reference {order_name}.
 
 You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
 

mails/en/shipped.html

@@ -20,13 +20,13 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order #{id_order} - Shipped</td>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order with the reference {order_name} - Shipped</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Thank you for shopping with {shop_name}!<br /><br /><strong>Your order #{id_order} has been shipped.</strong><br />You will soon receive a URL to track the delivery progress of your package.</td>
+<td align="left">Thank you for shopping with {shop_name}!<br /><br /><strong>Your order with the reference {order_name} has been shipped.</strong><br />You will soon receive a URL to track the delivery progress of your package.</td>
 </tr>
 <tr>
 <td>&nbsp;</td>

mails/en/shipped.txt

@@ -2,7 +2,7 @@ Hi {firstname} {lastname},
 
 Thank you for shopping with {shop_name}!
 
-Your order #{id_order} has just been shipped.
+Your order with the reference {order_name} has just been shipped.
 
 You will soon receive a URL to track the delivery progress of your package.
 

mails/en/voucher.html

@@ -20,13 +20,13 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order #{id_order} - Voucher created</td>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your order with the reference {order_name} - Voucher created</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td align="left">A voucher has been created in your name as a result of your order #{id_order}.</td>
+<td align="left">A voucher has been created in your name as a result of your order with the reference {order_name}.</td>
 </tr>
 <tr>
 <td>&nbsp;</td>

mails/en/voucher.txt

@@ -1,6 +1,6 @@
 Hi {firstname} {lastname},
 
-A voucher has been created 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 with the reference {order_name}.
 
 Voucher code: {voucher_num}, in the amount of {voucher_amount}.