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

[-] BO : fix #PSCFV-3278 : add a parameter id_shop in a method Mail::send() && normalize

Browse Source
This commit is contained in:
lLefevre
2012-07-24 14:13:11 +00:00
parent b31bd36b7b
commit d931296828
6 changed files with 108 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/OrderHistory.php
+4 -2
View File
@@ -363,11 +363,13 @@ class OrderHistoryCore extends ObjectModel
$data = array_merge ($data, $tmp_array);
// If there's at least one downloadable file
if (!empty($assign))
Mail::Send((int)$order->id_lang, 'download_product', Mail::l('Virtual product to download', $order->id_lang), $data, $result['email'], $result['firstname'].' '.$result['lastname']);
Mail::Send((int)$order->id_lang, 'download_product', Mail::l('Virtual product to download', $order->id_lang), $data, $result['email'], $result['firstname'].' '.$result['lastname'],
null, null, null, null, _PS_THEME_DIR_, false, (int)$order->id_shop);
}
if (Validate::isLoadedObject($order))
Mail::Send((int)$order->id_lang, $result['template'], $topic, $data, $result['email'], $result['firstname'].' '.$result['lastname']);
Mail::Send((int)$order->id_lang, $result['template'], $topic, $data, $result['email'], $result['firstname'].' '.$result['lastname'],
null, null, null, null, _PS_THEME_DIR_, false, (int)$order->id_shop);
}
// Update id_order_state attribute in Order