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

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

Browse Source
This commit is contained in:
mDeflotte
2012-06-26 15:19:35 +00:00
parent 9804065771
commit 100b210d22
74 changed files with 149 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+7 -7
View File
@@ -260,7 +260,7 @@
<legend><img src="../img/admin/money.gif" /> {l s='Payment'}</legend>
{if (!$order->valid && sizeof($currencies) > 1)}
<form method="post" action="{$currentIndex}&viewOrder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
<form method="post" action="{$currentIndex}&viewOrder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
<p class="warn">{l s='Don\'t forget to update your conversion rate before make this change.'}</p>
<label>{l s='Don\'t forget to update your conversion rate before make this change.'}</label>
<select name="new_currency">
@@ -293,7 +293,7 @@
</p>
{/if}
<form id="formAddPayment" method="post" action="{$current_index}&vieworder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
<form id="formAddPayment" method="post" action="{$current_index}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
<table class="table" width="100%" cellspacing="0" cellpadding="0">
<colgroup>
<col width="15%"></col>
@@ -473,7 +473,7 @@
<td>
<span id="shipping_number_show">{if isset($line.url) && isset($line.tracking_number)}<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{else if isset($line.tracking_number)}{$line.tracking_number}{/if}</span>
{if $line.can_edit}
<form style="display: inline;" method="POST" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&id_order_invoice={if $line.id_order_invoice}{$line.id_order_invoice|escape:'htmlall':'UTF-8'}{else}0{/if}&id_carrier={if $line.id_carrier}{$line.id_carrier|escape:'htmlall':'UTF-8'}{else}0{/if}">
<form style="display: inline;" method="POST" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$order->id}&id_order_invoice={if $line.id_order_invoice}{$line.id_order_invoice|escape:'htmlall':'UTF-8'}{else}0{/if}&id_carrier={if $line.id_carrier}{$line.id_carrier|escape:'htmlall':'UTF-8'}{else}0{/if}">
<span class="shipping_number_edit" style="display:none;">
<input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" />
<input type="submit" class="button" name="submitShippingNumber" value="{l s='Update'}" />
@@ -510,7 +510,7 @@
<legend><img src="../img/admin/delivery.gif" alt="{l s='Shipping address'}" />{l s='Shipping address'}</legend>
{if $can_edit}
<form method="POST" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}">
<form method="POST" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$order->id}">
<div style="margin-bottom:5px;">
<p>
<select name="id_address">
@@ -540,7 +540,7 @@
<legend><img src="../img/admin/invoice.gif" alt="{l s='Invoice address'}" />{l s='Invoice address'}</legend>
{if $can_edit}
<form method="POST" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}">
<form method="POST" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$order->id}">
<div style="margin-bottom:5px;">
<p>
<select name="id_address">
@@ -565,7 +565,7 @@
<div class="clear" style="margin-bottom: 10px;"></div>
</div>
<form style="width: 98%" class="container-command-top-spacing" action="{$current_index}&vieworder&token={$smarty.get.token}" method="post" onsubmit="return orderDeleteProduct('{l s='Cannot return this product'}', '{l s='Quantity to cancel is greater than quantity available'}');">
<form style="width: 98%" class="container-command-top-spacing" action="{$current_index}&vieworder&token={$smarty.get.token}&id_order={$order->id}" method="post" onsubmit="return orderDeleteProduct('{l s='Cannot return this product'}', '{l s='Quantity to cancel is greater than quantity available'}');">
<input type="hidden" name="id_order" value="{$order->id}" />
<fieldset style="width: 100%; ">
<div style="display: none">
@@ -690,7 +690,7 @@
</td>
{if $can_edit}
<td class="center">
<a href="{$current_index}&submitDeleteVoucher&id_order_cart_rule={$discount['id_order_cart_rule']}&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}"><img src="../img/admin/delete.gif" alt="{l s='Delete voucher'}" /></a>
<a href="{$current_index}&submitDeleteVoucher&id_order_cart_rule={$discount['id_order_cart_rule']}&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}"><img src="../img/admin/delete.gif" alt="{l s='Delete voucher'}" /></a>
</td>
{/if}
</tr>
classes/PaymentModule.php
+3 -2
View File
@@ -445,7 +445,8 @@ abstract class PaymentModuleCore extends Module
'{voucher_num}' => $voucher->code,
'{firstname}' => $customer->firstname,
'{lastname}' => $customer->lastname,
'{id_order}' => $order->reference
'{id_order}' => $order->reference,
'{order_name}' => $order->getUniqReference()
);
Mail::Send(
(int)$order->id_lang,
@@ -562,7 +563,7 @@ abstract class PaymentModuleCore extends Module
'{invoice_state}' => $invoice->id_state ? $invoice_state->name : '',
'{invoice_phone}' => ($invoice->phone) ? $invoice->phone : $invoice->phone_mobile,
'{invoice_other}' => $invoice->other,
'{order_name}' => sprintf('#%06d', (int)$order->id),
'{order_name}' => $order->getUniqReference(),
'{date}' => Tools::displayDate(date('Y-m-d H:i:s'), (int)$order->id_lang, 1),
'{carrier}' => $virtual_product ? Tools::displayError('No carrier') : $carrier->name,
'{payment}' => Tools::substr($order->payment, 0, 32),
classes/Tools.php
+2 -2
View File
@@ -475,8 +475,8 @@ class ToolsCore
$price = Tools::ps_round($price, $c_decimals);
switch ($c_format)
{
/* X 0,000.00 */
case 1:
/* X 0,000.00 */
case 1:
$ret = $c_char.$blank.number_format($price, $c_decimals, '.', ',');
break;
/* 0 000,00 X*/
classes/order/Order.php
+38 -1
View File
@@ -873,7 +873,7 @@ class OrderCore extends ObjectModel
*/
public static function getOrdersIdInvoiceByDate($date_from, $date_to, $id_customer = null, $type = null)
{
Tools::displayAsDeprecated();
Tools::displayAsDeprecated();
$sql = 'SELECT `id_order`
FROM `'._DB_PREFIX_.'orders`
WHERE DATE_ADD(invoice_date, INTERVAL -1 DAY) <= \''.pSQL($date_to).'\' AND invoice_date >= \''.pSQL($date_from).'\'
@@ -1788,5 +1788,42 @@ class OrderCore extends ObjectModel
return OrderPayment::getByOrderReference($this->reference);
}
/**
* Return a unique reference like : GWJTHMZUN#2
*
* With multishipping, order reference are the same for all orders made with the same cart
* this method suffix the order referece by a # and the order number
*
* @since 1.5.0.14
*/
public function getUniqReference()
{
$query = new DbQuery();
$query->select('MIN(id_order) as min, MAX(id_order) as max');
$query->from('orders');
$query->where('id_cart = '.(int)$this->id_cart);
$query->orderBy('id_order');
$order = Db::getInstance()->getRow($query);
if ($order['min'] == $order['max'])
return $this->reference;
else
return $this->reference.'#'.($this->id + 1 - $order['min']);
}
/**
* Return a unique reference like : GWJTHMZUN#2
*
* With multishipping, order reference are the same for all orders made with the same cart
* this method suffix the order referece by a # and the order number
*
* @since 1.5.0.14
*/
public static function getUniqReferenceOf($id_order)
{
$order = new Order($id_order);
return $order->getUniqReference();
}
}
classes/order/OrderHistory.php
+7 -2
View File
@@ -312,11 +312,16 @@ class OrderHistoryCore extends ObjectModel
if (isset($result['template']) && Validate::isEmail($result['email']))
{
$topic = $result['osname'];
$data = array('{lastname}' => $result['lastname'], '{firstname}' => $result['firstname'], '{id_order}' => (int)$this->id_order);
$data = array(
'{lastname}' => $result['lastname'],
'{firstname}' => $result['firstname'],
'{id_order}' => (int)$this->id_order,
'{order_name}' => $order->getUniqReference()
);
if ($template_vars)
$data = array_merge($data, $template_vars);
$data['{total_paid}'] = Tools::displayPrice((float)$order->total_paid, new Currency((int)$order->id_currency), false);
$data['{order_name}'] = sprintf('#%06d', (int)$order->id);
$data['{order_name}'] = $order->getUniqReference();
// An additional email is sent the first time a virtual item is validated
$virtual_products = $order->getVirtualProducts();
controllers/admin/AdminImportController.php
+2 -2
View File
@@ -2153,7 +2153,7 @@ class AdminImportControllerCore extends AdminController
{
if ($product['id_product'] == $id_product_attribute)
$this->errors[] = sprintf($this->l('Product (%d/%D) cannot be added twice (at line %d).'), $id_product,
$id_product_attribute, $current_line + 1);
$id_product_attribute, $current_line + 1);
else
$product['id_product'] = $id_product_attribute;
}
@@ -2163,7 +2163,7 @@ class AdminImportControllerCore extends AdminController
// checks parameters
if (false === ($supplier_reference = ProductSupplier::getProductSupplierReference($id_product, $id_product_attribute, $supply_order->id_supplier)))
$this->errors[] = sprintf($this->l('Product (%d/%d) is not available for this order (at line %d).'), $id_product,
$id_product_attribute, $current_line + 1);
$id_product_attribute, $current_line + 1);
if ($unit_price_te < 0)
$this->errors[] = sprintf($this->l('Unit Price (tax excl.) (%d) is not valid (at line %d).'), $unit_price_te, $current_line + 1);
if ($quantity_expected < 0)
controllers/admin/AdminOrdersController.php
+4 -1
View File
@@ -285,7 +285,8 @@ class AdminOrdersControllerCore extends AdminController
'{followup}' => str_replace('@', $order->shipping_number, $carrier->url),
'{firstname}' => $customer->firstname,
'{lastname}' => $customer->lastname,
'{id_order}' => $order->id
'{id_order}' => $order->id,
'{order_name}' => $order->getUniqReference()
);
if (@Mail::Send((int)$order->id_lang, 'in_transit', Mail::l('Package in transit', (int)$order->id_lang), $templateVars,
$customer->email, $customer->firstname.' '.$customer->lastname, null, null, null, null,
@@ -430,6 +431,7 @@ class AdminOrdersControllerCore extends AdminController
'{lastname}' => $customer->lastname,
'{firstname}' => $customer->firstname,
'{id_order}' => $order->id,
'{order_name}' => $order->getUniqReference(),
'{message}' => $message
);
if (@Mail::Send((int)$order->id_lang, 'order_merchant_comment',
@@ -646,6 +648,7 @@ class AdminOrdersControllerCore extends AdminController
$params['{lastname}'] = $customer->lastname;
$params['{firstname}'] = $customer->firstname;
$params['{id_order}'] = $order->id;
$params['{order_name}'] = $order->getUniqReference();
}
// Generate credit slip
controllers/admin/AdminShippingController.php
+1 -1
View File
@@ -151,7 +151,7 @@ class AdminShippingControllerCore extends AdminController
$carrier = new Carrier($id_carrier);
if (Validate::isLoadedObject($carrier))
{
/* Get configuration values */
/* Get configuration values */
$shipping_method = $carrier->getShippingMethod();
$rangeTable = $carrier->getRangeTable();
controllers/front/ContactController.php
+1
View File
@@ -121,6 +121,7 @@ class ContactControllerCore extends FrontController
'{email}' => $from,
'{message}' => Tools::nl2br(stripslashes($message)),
'{id_order}' => (int)Tools::getValue('id_order'),
'{order_name}' => $order->getUniqReference(),
'{attached_file}' => $_FILES['fileUpload']['name'] ? $_FILES['fileUpload']['name'] : '');
if (Mail::Send($this->context->language->id, 'contact', Mail::l('Message from contact form'),
controllers/front/OrderDetailController.php
+1
View File
@@ -107,6 +107,7 @@ class OrderDetailControllerCore extends FrontController
'{firstname}' => $customer->firstname,
'{email}' => $customer->email,
'{id_order}' => (int)($order->id),
'{order_name}' => $order->getUniqReference(),
'{message}' => Tools::nl2br($msgText)
),
$to, $toName, $customer->email, $customer->firstname.' '.$customer->lastname);
install-dev/fixtures/apple/data/orders.xml
+1 -1
View File
@@ -41,7 +41,7 @@
<field name="valid"/>
</fields>
<entities>
<orders id="orders_1" reference="XKBKNABJ" id_shop_group="1" id_shop="1" id_carrier="My_carrier" id_customer="John" id_cart="cart_1" id_currency="1" id_address_delivery="Mon_adresse" id_address_invoice="Mon_adresse" current_state="1" secure_key="47ce86627c1f3c792a80773c5d2deaf8" conversion_rate="1.000000" recyclable="0" gift="0" shipping_number="" total_discounts="0.00" total_discounts_tax_incl="0.00" total_paid="626.37" total_paid_tax_incl="626.37" total_paid_tax_excl="523.72" total_paid_real="626.37" total_products="516.72" total_products_wt="618.00" total_shipping="7.98" total_shipping_tax_incl="8.37" total_shipping_tax_excl="7.00" carrier_tax_rate="19.600" total_wrapping="0.00" total_wrapping_tax_incl="0.00" total_wrapping_tax_excl="0.00" invoice_number="0" delivery_number="0" invoice_date="0000-00-00 00:00:00" delivery_date="0000-00-00 00:00:00" valid="0">
<orders id="orders_1" reference="XKBKNABJK" id_shop_group="1" id_shop="1" id_carrier="My_carrier" id_customer="John" id_cart="cart_1" id_currency="1" id_address_delivery="Mon_adresse" id_address_invoice="Mon_adresse" current_state="1" secure_key="47ce86627c1f3c792a80773c5d2deaf8" conversion_rate="1.000000" recyclable="0" gift="0" shipping_number="" total_discounts="0.00" total_discounts_tax_incl="0.00" total_paid="626.37" total_paid_tax_incl="626.37" total_paid_tax_excl="523.72" total_paid_real="626.37" total_products="516.72" total_products_wt="618.00" total_shipping="7.98" total_shipping_tax_incl="8.37" total_shipping_tax_excl="7.00" carrier_tax_rate="19.600" total_wrapping="0.00" total_wrapping_tax_incl="0.00" total_wrapping_tax_excl="0.00" invoice_number="0" delivery_number="0" invoice_date="0000-00-00 00:00:00" delivery_date="0000-00-00 00:00:00" valid="0">
<payment>Chèque</payment>
<module>cheque</module>
<gift_message/>
install-dev/upgrade/sql/1.5.0.14.sql
+2
View File
@@ -4,3 +4,5 @@ SET NAMES 'utf8';
/* PHP:p15014_add_missing_columns(); */;
UPDATE `PREFIX_orders` SET `reference` = LPAD(reference, 9 , '0');
mails/en/bankwire.html
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -6,7 +6,7 @@ Your message:
{message}
Order ID : {id_order}
Order reference : {order_name}
Attached file : {attached_file}
mails/en/credit_slip.html
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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 -1
View File
@@ -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
+1 -1
View File
@@ -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 -1
View File
@@ -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
+1 -1
View File
@@ -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 -1
View File
@@ -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
+2 -2
View File
@@ -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 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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 -1
View File
@@ -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
+2 -2
View File
@@ -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 -1
View File
@@ -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
+2 -2
View File
@@ -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 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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 -1
View File
@@ -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}.
mails/fr/bankwire.html
+2 -2
View File
@@ -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">Historique de votre commande n&deg;{id_order}.</td>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Historique de votre commande ayant pour référence {order_name}.</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">Nous avons bien enregistr&eacute; votre commande {id_order}. Celle-ci vous sera envoy&eacute;e d&egrave;s r&eacute;ception de votre paiement.</td>
<td align="left">Nous avons bien enregistr&eacute; votre commande ayant pour référence {order_name}. Celle-ci vous sera envoy&eacute;e d&egrave;s r&eacute;ception de votre paiement.</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/fr/bankwire.txt
+1 -1
View File
@@ -1,6 +1,6 @@
Bonjour {firstname} {lastname},
Nous avons bien enregistré votre commande {id_order}. Celle-ci vous sera envoyée dès réception de votre paiement.
Nous avons bien enregistré votre commande ayant pour référence {order_name}. Celle-ci vous sera envoyée dès réception de votre paiement.
Pour rappel, vous avez sélectionné le mode de paiement par virement bancaire et celui-ci est à envoyer à :
{bankwire_owner}
mails/fr/cheque.html
+2 -2
View File
@@ -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">Historique de votre commande n&deg;{id_order}.</td>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Historique de votre commande ayant pour référence {order_name}.</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">Nous avons bien enregistr&eacute; votre commande {order_name}. Celle-ci vous sera envoy&eacute;e d&egrave;s r&eacute;ception de votre paiement.</td>
<td align="left">Nous avons bien enregistr&eacute; votre commande ayant pour référence {order_name}. Celle-ci vous sera envoy&eacute;e d&egrave;s r&eacute;ception de votre paiement.</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/fr/cheque.txt
+1 -1
View File
@@ -1,6 +1,6 @@
Bonjour {firstname} {lastname},
Nous avons bien enregistré votre commande {order_name}.
Nous avons bien enregistré votre commande ayant pour référence {order_name}.
Celle-ci vous sera envoyée dès réception de votre paiement.
Pour rappel, vous avez choisi de régler votre commande par chèque, merci de nous transmettre votre règlement :
mails/fr/contact_form.html
+1 -1
View File
@@ -20,7 +20,7 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">Votre message a bien &eacute;t&eacute; envoy&eacute;.<br /><br /> Message : {message}<br /><br /> Num&eacute;ro de commande : {id_order}<br /><br /> Fichi&eacute; attach&eacute; : {attached_file}</td>
<td align="left">Votre message a bien &eacute;t&eacute; envoy&eacute;.<br /><br /> Message : {message}<br /><br /> Référence de commande : {order_name}<br /><br /> Fichi&eacute; attach&eacute; : {attached_file}</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/fr/contact_form.txt
+1 -1
View File
@@ -4,7 +4,7 @@ Votre message :
{message}
Numéro de commande : {id_order}
Référence commande : {order_name}
Fichié attaché : {attached_file}
mails/fr/credit_slip.html
+2 -2
View File
@@ -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">Historique de votre commande n&deg;{id_order}.</td>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Historique de votre commande ayant pour référence {order_name}.</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">Nous vous informons de la g&eacute;n&eacute;ration d&#039;un avoir &agrave; votre nom relatif &agrave; votre commande n&deg;{id_order}.</td>
<td align="left">Nous vous informons de la g&eacute;n&eacute;ration d&#039;un avoir &agrave; votre nom relatif &agrave; votre commande ayant pour référence {order_name}.</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/fr/credit_slip.txt
+1 -1
View File
@@ -1,6 +1,6 @@
Bonjour {firstname} {lastname},
Nous vous informons de la génération d'un avoir à votre nom relatif à votre commande n°{id_order}.
Nous vous informons de la génération d'un avoir à votre nom relatif à votre commande ayant pour référence {order_name}.
Vous pouvez accéder à cet avoir et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site {shop_url}
mails/fr/in_transit.html
+1 -1
View File
@@ -20,7 +20,7 @@
<td>&nbsp;</td>
</tr>
<tr>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Historique de votre commande n&deg;{id_order}</td>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Historique de votre commande ayant pour référence {order_name}</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/fr/order_canceled.html
+1 -1
View File
@@ -20,7 +20,7 @@
<td>&nbsp;</td>
</tr>
<tr>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Historique de votre commande n&deg;{id_order}</td>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Historique de votre commande ayant pour référence {order_name}</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/fr/order_canceled.txt
+1 -1
View File
@@ -1,6 +1,6 @@
Bonjour {firstname} {lastname},
Votre commande {id_order} a été annulée.
Votre commande ayant pour référence {order_name} a été annulée.
Vous pouvez accéder à tout moment au suivi de votre commande dans "Historique des commandes" de la rubrique "Mon compte" sur notre site {shop_name}.
Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {shop_url}?controller=guest-tracking
mails/fr/order_customer_comment.html
+1 -1
View File
@@ -26,7 +26,7 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left"><strong>Vous avez re&ccedil;u un nouveau message concernant la commande n&deg;{id_order} :</strong> <br /><br /> {message}</td>
<td align="left"><strong>Vous avez re&ccedil;u un nouveau message concernant la commande ayant pour référence {order_name} :</strong> <br /><br /> {message}</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/fr/order_customer_comment.txt
+1 -1
View File
@@ -1,6 +1,6 @@
Bonjour,
Vous avez reçu un nouveau message concernant la commande n°{id_order} :
Vous avez reçu un nouveau message concernant la commande ayant pour référence {order_name} :
{message}
mails/fr/order_merchant_comment.html
+1 -1
View File
@@ -26,7 +26,7 @@
<td>&nbsp;</td>
</tr>
<tr>
<td align="left"><strong>Vous avez re&ccedil;u un nouveau message concernant la commande n&deg;{id_order} :</strong> <br /><br /> {message}</td>
<td align="left"><strong>Vous avez re&ccedil;u un nouveau message concernant la commande ayant pour référence {order_name} :</strong> <br /><br /> {message}</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/fr/order_merchant_comment.txt
+1 -1
View File
@@ -1,6 +1,6 @@
Bonjour {firstname} {lastname},
Vous avez reçu un nouveau message concernant la commande n°{id_order} :
Vous avez reçu un nouveau message concernant la commande ayant pour référence {order_name} :
{message}
Vous pouvez à tout moment consulter vos anciens messages dans votre suivi de commande.
mails/fr/outofstock.html
+1 -1
View File
@@ -20,7 +20,7 @@
<td>&nbsp;</td>
</tr>
<tr>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Historique de votre commande n&deg;{id_order}</td>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Historique de votre commande ayant pour référence {order_name}</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/fr/outofstock.txt
+1 -1
View File
@@ -1,6 +1,6 @@
Bonjour {firstname} {lastname},
Votre commande {id_order} est bien enregistrée mais nécessite un réapprovisionnement.
Votre commande ayant pour référence {order_name} est bien enregistrée mais nécessite un réapprovisionnement.
Vous pouvez accéder à tout moment au suivi de votre commande dans la rubrique "Mon compte".
Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {shop_url}?controller=guest-tracking
mails/fr/payment.html
+1 -1
View File
@@ -20,7 +20,7 @@
<td>&nbsp;</td>
</tr>
<tr>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Historique de votre commande n&deg;{id_order}</td>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Historique de votre commande ayant pour référence {order_name}</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/fr/payment.txt
+1 -1
View File
@@ -1,6 +1,6 @@
Bonjour {firstname} {lastname},
Le paiement pour votre commande {id_order} a été accepté.
Le paiement pour votre commande ayant pour référence {order_name} a été accepté.
Vous pouvez accéder à tout moment au suivi de votre commande dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {shop_url}?controller=guest-tracking
mails/fr/payment_error.html
+1 -1
View File
@@ -20,7 +20,7 @@
<td>&nbsp;</td>
</tr>
<tr>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Historique de votre commande n&deg;{id_order}</td>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Historique de votre commande ayant pour référence {order_name}</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/fr/payment_error.txt
+1 -1
View File
@@ -1,6 +1,6 @@
Bonjour {firstname} {lastname},
Un problème a été constaté pour le paiement de votre commande {id_order}.
Un problème a été constaté pour le paiement de votre commande ayant pour référence {order_name}.
Vous pouvez à tout moment accéder au suivi de votre commande dans la rubrique "Mon compte" du site.
Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {shop_url}?controller=guest-tracking
mails/fr/preparation.html
+1 -1
View File
@@ -20,7 +20,7 @@
<td>&nbsp;</td>
</tr>
<tr>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Historique de votre commande n&deg;{id_order}</td>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Historique de votre commande ayant pour référence {order_name}</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/fr/preparation.txt
+1 -1
View File
@@ -1,6 +1,6 @@
Bonjour {firstname} {lastname},
Votre commande {id_order} est en cours de préparation.
Votre commande ayant pour référence {order_name} est en cours de préparation.
Vous pouvez accéder à tout moment au suivi de votre commande dans "Historique de mes commandes" de la rubrique "Mon compte" sur notre site.
Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {shop_url}?controller=guest-tracking
mails/fr/refund.html
+1 -1
View File
@@ -20,7 +20,7 @@
<td>&nbsp;</td>
</tr>
<tr>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Historique de votre commande n&deg;{id_order}</td>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Historique de votre commande ayant pour référence {order_name}</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/fr/refund.txt
+1 -1
View File
@@ -1,6 +1,6 @@
Bonjour {firstname} {lastname},
Votre commande {id_order} vous a bien été remboursée.
Votre commande ayant pour référence {order_name} vous a bien été remboursée.
Vous pouvez accéder à tout moment au suivi de votre commande dans la rubrique "Mon compte" du site.
Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse : {shop_url}?controller=guest-tracking
mails/fr/shipped.html
+1 -1
View File
@@ -20,7 +20,7 @@
<td>&nbsp;</td>
</tr>
<tr>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Historique de votre commande n&deg;{id_order}</td>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Historique de votre commande ayant pour référence {order_name}</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/fr/shipped.txt
+1 -1
View File
@@ -1,6 +1,6 @@
Bonjour {firstname} {lastname},
Votre commande {id_order} vient d'être expédiée.
Votre commande ayant pour référence {order_name} vient d'être expédiée.
Vous recevrez prochainement un lien vous permettant le suivi de votre colis.
mails/fr/voucher.html
+2 -2
View File
@@ -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">Historique de votre commande n&deg;{id_order}</td>
<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Historique de votre commande ayant pour référence {order_name}</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">Nous vous informons de la g&eacute;n&eacute;ration d&#039;un bon de r&eacute;duction &agrave; votre nom relatif &agrave; votre commande n&deg;{id_order}.</td>
<td align="left">Nous vous informons de la g&eacute;n&eacute;ration d&#039;un bon de r&eacute;duction &agrave; votre nom relatif &agrave; votre commande ayant pour référence {order_name}.</td>
</tr>
<tr>
<td>&nbsp;</td>
mails/fr/voucher.txt
+1 -1
View File
@@ -1,6 +1,6 @@
Bonjour {firstname} {lastname},
Nous vous informons de la génération d'un bon de réduction à votre nom relatif à votre commande n°{id_order}.
Nous vous informons de la génération d'un bon de réduction à votre nom relatif à votre commande ayant pour référence {order_name}.
Voici le numéro de votre bon de réduction : {voucher_num}, d'un montant total de {voucher_amount}.
Copiez-collez ce numéro dans le panier de votre prochain achat avant de régler la commande.
themes/default/history.tpl
+2 -2
View File
@@ -38,7 +38,7 @@
<table id="order-list" class="std">
<thead>
<tr>
<th class="first_item">{l s='Order'}</th>
<th class="first_item">{l s='Order Reference'}</th>
<th class="item">{l s='Date'}</th>
<th class="item">{l s='Total price'}</th>
<th class="item">{l s='Payment'}</th>
@@ -52,7 +52,7 @@
<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}">
<td class="history_link bold">
{if isset($order.invoice) && $order.invoice && isset($order.virtual) && $order.virtual}<img src="{$img_dir}icon/download_product.gif" class="icon" alt="{l s='Products to download'}" title="{l s='Products to download'}" />{/if}
<a class="color-myaccount" href="javascript:showOrder(1, {$order.id_order|intval}, '{$link->getPageLink('order-detail')}');">{l s='#'}{$order.id_order|string_format:"%06d"}</a>
<a class="color-myaccount" href="javascript:showOrder(1, {$order.id_order|intval}, '{$link->getPageLink('order-detail')}');">{Order::getUniqReferenceOf($order.id_order)}</a>
</td>
<td class="history_date bold">{dateFormat date=$order.date_add full=0}</td>
<td class="history_price"><span class="price">{displayPrice price=$order.total_paid currency=$order.id_currency no_utf8=false convert=false}</span></td>
themes/default/lang/fr.php
+2 -3
View File
@@ -178,11 +178,11 @@ $_LANG['guest-tracking_d51b1df43394fe14cd03d5bcb3a7216b'] = 'Par exemple : 01012
$_LANG['guest-tracking_dec9cc6702179299ae451c11633915c6'] = 'Passage de commande rapide et facile';
$_LANG['guest-tracking_df1555fe48479f594280a2e03f9a8186'] = 'E-mail :';
$_LANG['header_0fcd4065ff78fceb3083316ddb958bc1'] = 'Vous ne pouvez pas créer de nouvelle commande depuis votre pays :';
$_LANG['history_01abfc750a0c942167651c40d088531d'] = 'n°';
$_LANG['history_0b3db27bc15f682e92ff250ebb167d4b'] = 'Retour à votre compte';
$_LANG['history_0eede552438475bdfe820c13f24c9399'] = 'Prix total';
$_LANG['history_116cb47fe026f7a3679486e086426a64'] = 'Si vous venez de passer une commande, celle-ci peut mettre du temps pour être validée. Veuillez recharger cette page si votre commande ne s\'affiche pas.';
$_LANG['history_1b6324ace95b17a01323052fda855989'] = 'Produit(s) à télécharger';
$_LANG['history_1e860e56970a81a1ba3e1fcb7fccc846'] = 'Référence Commande';
$_LANG['history_26aa02964b3c2f82231e4c064150e29e'] = 'Vous trouverez ici vos commandes passées depuis la création de votre compte';
$_LANG['history_27792947ed5d5da7c0d1f43327ed9dab'] = 'détails';
$_LANG['history_332c80b1838dc515f5031e09da3b7f3f'] = 'Re-commander';
@@ -191,7 +191,6 @@ $_LANG['history_466eadd40b3c10580e3ab4e8061161ce'] = 'Facture';
$_LANG['history_5acc2ceeb883ba07cef2d02ea382f242'] = 'Vous n\'avez pas encore passé de commande';
$_LANG['history_782c8b38bce4f2f6975ca7f33ac8189b'] = 'Historique de vos commandes';
$_LANG['history_8cf04a9734132302f96da8e113e80ce5'] = 'Accueil';
$_LANG['history_a240fa27925a635b08dc28c9e4f9216d'] = 'Commande';
$_LANG['history_bcd1b68617759b1dfcff0403a6b5a8d1'] = 'PDF';
$_LANG['history_c453a4b8e8d98e82f35b67f433e3b4da'] = 'Paiement';
$_LANG['history_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'Mon compte';
@@ -371,6 +370,7 @@ $_LANG['order-detail_59405437ba605684d715b3e21ef54b12'] = 'Suivre votre commande
$_LANG['order-detail_5da618e8e4b89c66fe86e32cdafde142'] = 'Expéditeur';
$_LANG['order-detail_5fbddd8d4e0d8c7a868272f2f171df09'] = 'Il y a %d erreur';
$_LANG['order-detail_617096c86d35478132502be00e12e016'] = 'Si vous voulez nous laisser un message à propos de votre commande, veuillez l\'écrire ici.';
$_LANG['order-detail_6332e7985befad227455d60812bd1449'] = 'Référence de commande %s - Commandé le';
$_LANG['order-detail_63d5049791d9d79d86e9a108b0a999ca'] = 'Référence';
$_LANG['order-detail_66c4c5112f455a19afde47829df363fa'] = 'Total :';
$_LANG['order-detail_694e8d1f2ee056f98ee488bdc4982d73'] = 'Quantité';
@@ -388,7 +388,6 @@ $_LANG['order-detail_a12925b3d2beb085f9a024d8098b41dd'] = 'Total emballage cadea
$_LANG['order-detail_ac8f8f0de7595f3e4e813e3a1065a061'] = 'Si vous désirez nous retourner un ou plusieurs produits, veuillez cocher chacun d\'entre eux et spécifier un motif de retour, puis valider.';
$_LANG['order-detail_aec9b5b1c2f91ccdef8e25f5f1dac86a'] = 'Télécharger le produit';
$_LANG['order-detail_afd82044ef6cb3a99383a79fa5c68c9f'] = 'Vous ne pouvez pas faire de retour de marchandise avec un compte invité';
$_LANG['order-detail_b09eeb5676544c14685b96209dde1b1a'] = 'Commande n°%s - Commandé le';
$_LANG['order-detail_c1f6368d15f7c13c4e5e8f70c68c747f'] = 'Méthode de paiement :';
$_LANG['order-detail_ced55d097872ab13bf177e8d31db396f'] = 'Cliquez sur le lien suivant pour suivre la livraison de votre commande';
$_LANG['order-detail_d8ea8f57bff2e29a27f3821ae74968bd'] = 'télécharger ce produit';
themes/default/order-detail.tpl
+1 -1
View File
@@ -35,7 +35,7 @@
<input type="hidden" value="{$order->id}" name="id_order"/>
<h4>
<input type="submit" value="{l s='Reorder'}" name="submitReorder" class="button exclusive" />
{l s='Order #%s - placed on' sprintf=$order->id|string_format:"%06d"} {dateFormat date=$order->date_add full=0}
{l s='Order Reference %s - placed on' sprintf=$order->getUniqReference()} {dateFormat date=$order->date_add full=0}
</h4>
</div>
</form>