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

// Normalize

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12652 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-01-24 16:24:01 +00:00
parent 1103425e04
commit d920df5f2a
14 changed files with 675 additions and 660 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Message.php
+55 -51
View File
@@ -1,6 +1,6 @@
<?php
/*
* 2007-2011 PrestaShop
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -27,28 +27,28 @@
class MessageCore extends ObjectModel
{
public $id;
public $id;
/** @var string message content */
public $message;
public $message;
/** @var integer Cart ID (if applicable) */
public $id_cart;
public $id_cart;
/** @var integer Order ID (if applicable) */
public $id_order;
public $id_order;
/** @var integer Customer ID (if applicable) */
public $id_customer;
public $id_customer;
/** @var integer Employee ID (if applicable) */
public $id_employee;
public $id_employee;
/** @var boolean Message is not displayed to the customer */
public $private;
public $private;
/** @var string Object creation date */
public $date_add;
public $date_add;
/**
* @see ObjectModel::$definition
@@ -75,15 +75,13 @@ class MessageCore extends ObjectModel
*/
public static function getMessageByCartId($id_cart)
{
$db = Db::getInstance();
$result = $db->getRow('
SELECT *
FROM `'._DB_PREFIX_.'message`
WHERE `id_cart` = '.(int)($id_cart));
return $result;
return Db::getInstance()->getRow('
SELECT *
FROM `'._DB_PREFIX_.'message`
WHERE `id_cart` = '.(int)$id_cart
);
}
/**
* Return messages from Order ID
*
@@ -91,26 +89,30 @@ class MessageCore extends ObjectModel
* @param boolean $private return WITH private messages
* @return array Messages
*/
static public function getMessagesByOrderId($id_order, $private = false, Context $context = null)
public static function getMessagesByOrderId($id_order, $private = false, Context $context = null)
{
if (!Validate::isBool($private))
die(Tools::displayError());
if (!$context)
$context = Context::getContext();
return Db::getInstance()->executeS('
SELECT m.*, c.`firstname` AS cfirstname, c.`lastname` AS clastname, e.`firstname` AS efirstname, e.`lastname` AS elastname, (COUNT(mr.id_message) = 0 AND m.id_customer != 0) AS is_new_for_me
FROM `'._DB_PREFIX_.'message` m
LEFT JOIN `'._DB_PREFIX_.'customer` c ON m.`id_customer` = c.`id_customer`
LEFT JOIN `'._DB_PREFIX_.'message_readed` mr ON (mr.`id_message` = m.`id_message` AND mr.`id_employee` = '.(isset($context->employee) ? (int)$context->employee->id : '\'\'').')
LEFT OUTER JOIN `'._DB_PREFIX_.'employee` e ON e.`id_employee` = m.`id_employee`
WHERE id_order = '.(int)$id_order.'
'.(!$private ? ' AND m.`private` = 0' : '').'
GROUP BY m.id_message
ORDER BY m.date_add DESC');
SELECT m.*, c.`firstname` AS cfirstname, c.`lastname` AS clastname, e.`firstname` AS efirstname, e.`lastname` AS elastname,
(COUNT(mr.id_message) = 0 AND m.id_customer != 0) AS is_new_for_me
FROM `'._DB_PREFIX_.'message` m
LEFT JOIN `'._DB_PREFIX_.'customer` c ON m.`id_customer` = c.`id_customer`
LEFT JOIN `'._DB_PREFIX_.'message_readed` mr
ON mr.`id_message` = m.`id_message`
AND mr.`id_employee` = '.(isset($context->employee) ? (int)$context->employee->id : '\'\'').'
LEFT OUTER JOIN `'._DB_PREFIX_.'employee` e ON e.`id_employee` = m.`id_employee`
WHERE id_order = '.(int)$id_order.'
'.(!$private ? ' AND m.`private` = 0' : '').'
GROUP BY m.id_message
ORDER BY m.date_add DESC
');
}
/**
* Return messages from Cart ID
*
@@ -118,26 +120,28 @@ class MessageCore extends ObjectModel
* @param boolean $private return WITH private messages
* @return array Messages
*/
static public function getMessagesByCartId($id_cart, $private = false, Context $context = null)
public static function getMessagesByCartId($id_cart, $private = false, Context $context = null)
{
if (!Validate::isBool($private))
die(Tools::displayError());
if (!$context)
$context = Context::getContext();
return Db::getInstance()->executeS('
SELECT m.*, c.`firstname` AS cfirstname, c.`lastname` AS clastname, e.`firstname` AS efirstname, e.`lastname` AS elastname, (COUNT(mr.id_message) = 0 AND m.id_customer != 0) AS is_new_for_me
FROM `'._DB_PREFIX_.'message` m
LEFT JOIN `'._DB_PREFIX_.'customer` c ON m.`id_customer` = c.`id_customer`
LEFT JOIN `'._DB_PREFIX_.'message_readed` mr ON (mr.id_message = m.id_message AND mr.id_employee = '.(int)$context->employee->id.')
LEFT OUTER JOIN `'._DB_PREFIX_.'employee` e ON e.`id_employee` = m.`id_employee`
WHERE id_cart = '.(int)$id_cart.'
'.(!$private ? ' AND m.`private` = 0' : '').'
GROUP BY m.id_message
ORDER BY m.date_add DESC');
SELECT m.*, c.`firstname` AS cfirstname, c.`lastname` AS clastname, e.`firstname` AS efirstname, e.`lastname` AS elastname,
(COUNT(mr.id_message) = 0 AND m.id_customer != 0) AS is_new_for_me
FROM `'._DB_PREFIX_.'message` m
LEFT JOIN `'._DB_PREFIX_.'customer` c ON m.`id_customer` = c.`id_customer`
LEFT JOIN `'._DB_PREFIX_.'message_readed` mr ON (mr.id_message = m.id_message AND mr.id_employee = '.(int)$context->employee->id.')
LEFT OUTER JOIN `'._DB_PREFIX_.'employee` e ON e.`id_employee` = m.`id_employee`
WHERE id_cart = '.(int)$id_cart.'
'.(!$private ? ' AND m.`private` = 0' : '').'
GROUP BY m.id_message
ORDER BY m.date_add DESC
');
}
/**
* Registered a message 'readed'
*
@@ -146,12 +150,12 @@ class MessageCore extends ObjectModel
*/
public static function markAsReaded($id_message, $id_employee)
{
if (!Validate::isUnsignedId($id_message) OR !Validate::isUnsignedId($id_employee))
if (!Validate::isUnsignedId($id_message) || !Validate::isUnsignedId($id_employee))
die(Tools::displayError());
$result = Db::getInstance()->execute('
INSERT INTO '._DB_PREFIX_.'message_readed (id_message , id_employee , date_add) VALUES
('.(int)($id_message).', '.(int)($id_employee).', NOW());
INSERT INTO '._DB_PREFIX_.'message_readed (id_message , id_employee , date_add) VALUES
('.(int)$id_message.', '.(int)$id_employee.', NOW());
');
return $result;
}