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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
gRoussac
2013-10-18 18:36:51 +02:00
parent 8ef1e043af 72ccc90cc9
commit 5daa79c1e1
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/mailalerts/mailalerts.php
+16 -1
View File
@@ -257,6 +257,21 @@ class MailAlerts extends Module
</form>'; </form>';
} }
public function getAllMessages($id)
{
$messages = Db::getInstance()->executeS('
SELECT `message`
FROM `'._DB_PREFIX_.'message`
WHERE `id_order` = '.(int)$id.'
ORDER BY `id_message` ASC
');
$result = array();
foreach ($messages as $message) {
$result[] = $message['message'];
}
return implode('<br/>', $result);
}
public function hookActionValidateOrder($params) public function hookActionValidateOrder($params)
{ {
if (!$this->_merchant_order || empty($this->_merchant_mails)) if (!$this->_merchant_order || empty($this->_merchant_mails))
@@ -274,7 +289,7 @@ class MailAlerts extends Module
$invoice = new Address((int)$order->id_address_invoice); $invoice = new Address((int)$order->id_address_invoice);
$order_date_text = Tools::displayDate($order->date_add, (int)$id_lang); $order_date_text = Tools::displayDate($order->date_add, (int)$id_lang);
$carrier = new Carrier((int)$order->id_carrier); $carrier = new Carrier((int)$order->id_carrier);
$message = $order->getFirstMessage(); $message = $this->getAllMessages($order->id);
if (!$message || empty($message)) if (!$message || empty($message))
$message = $this->l('No message'); $message = $this->l('No message');