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

[-] MO : Could not translate in transit mail, revert from https://github.com/viger-creator/PrestaShop/commit/3213b5dffb266ddb0639b94f72babd892328ffa2

Browse Source
This commit is contained in:
gRoussac
2013-10-31 14:20:21 +01:00
parent 9611ea1f70
commit f9dc0b0252
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminOrdersController.php
+3 -3
View File
@@ -306,7 +306,7 @@ class AdminOrdersControllerCore extends AdminController
'{shipping_number}' => $order->shipping_number, '{shipping_number}' => $order->shipping_number,
'{order_name}' => $order->getUniqReference() '{order_name}' => $order->getUniqReference()
); );
if (@Mail::Send((int)$order->id_lang, 'in_transit', Mail::l('Package in transit'), $templateVars, 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, $customer->email, $customer->firstname.' '.$customer->lastname, null, null, null, null,
_PS_MAIL_DIR_, true, (int)$order->id_shop)) _PS_MAIL_DIR_, true, (int)$order->id_shop))
{ {
@@ -704,7 +704,7 @@ class AdminOrdersControllerCore extends AdminController
@Mail::Send( @Mail::Send(
(int)$order->id_lang, (int)$order->id_lang,
'credit_slip', 'credit_slip',
Mail::l('New credit slip regarding your order', $order->id_lang), Mail::l('New credit slip regarding your order', (int)$order->id_lang),
$params, $params,
$customer->email, $customer->email,
$customer->firstname.' '.$customer->lastname, $customer->firstname.' '.$customer->lastname,
@@ -1809,7 +1809,7 @@ class AdminOrdersControllerCore extends AdminController
Mail::Send( Mail::Send(
(int)$order->id_lang, (int)$order->id_lang,
'order_changed', 'order_changed',
Mail::l('Your order has been changed', $order->id_lang), Mail::l('Your order has been changed', (int)$order->id_lang),
$data, $data,
$order->getCustomer()->email, $order->getCustomer()->email,
$order->getCustomer()->firstname.' '.$order->getCustomer()->lastname, $order->getCustomer()->firstname.' '.$order->getCustomer()->lastname,