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

[-] Bo : replace constant _PS_THEME_DIR_ by _PS_MAIL_DIR_ when send a email

Browse Source
This commit is contained in:
lLefevre
2012-07-25 08:34:17 +00:00
parent a55ca85990
commit 84f95dd80b
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Customer.php
+1 -1
View File
@@ -672,7 +672,7 @@ class CustomerCore extends ObjectModel
null, null,
null, null,
null, null,
_PS_THEME_DIR_, _PS_MAIL_DIR_,
false, false,
(int)$this->id_shop (int)$this->id_shop
); );
classes/PaymentModule.php
+2 -2
View File
@@ -461,7 +461,7 @@ abstract class PaymentModuleCore extends Module
$params, $params,
$this->context->customer->email, $this->context->customer->email,
$this->context->customer->firstname.' '.$this->context->customer->lastname, $this->context->customer->firstname.' '.$this->context->customer->lastname,
null, null, null, null, _PS_THEME_DIR_, false, (int)$order->id_shop null, null, null, null, _PS_MAIL_DIR_, false, (int)$order->id_shop
); );
} }
} }
@@ -628,7 +628,7 @@ abstract class PaymentModuleCore extends Module
null, null,
null, null,
$file_attachement, $file_attachement,
null, _PS_THEME_DIR_, false, (int)$order->id_shop null, _PS_MAIL_DIR_, false, (int)$order->id_shop
); );
} }
classes/order/OrderHistory.php
+2 -2
View File
@@ -364,12 +364,12 @@ class OrderHistoryCore extends ObjectModel
// If there's at least one downloadable file // If there's at least one downloadable file
if (!empty($assign)) 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); null, null, null, null, _PS_MAIL_DIR_, false, (int)$order->id_shop);
} }
if (Validate::isLoadedObject($order)) 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); null, null, null, null, _PS_MAIL_DIR_, false, (int)$order->id_shop);
} }
// Update id_order_state attribute in Order // Update id_order_state attribute in Order