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

[-] FO : #PSCFI-5322 - Order::hasBeenDelivered and Order::hasBeenPaid don't work for all order states

Browse Source
This commit is contained in:
mDeflotte
2012-04-13 13:40:29 +00:00
parent 874849038c
commit 2f4de677e4
2 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/Order.php
+28 -3
View File
@@ -429,6 +429,9 @@ class OrderCore extends ObjectModel
* Get order history
*
* @param integer $id_lang Language id
* @param integer $id_order_state Filter a specific order state
* @param integer $no_hidden Filter no hidden status
* @param integer $filters Flag to use specific field filter
*
* @return array History entries ordered by date DESC
*/
@@ -436,6 +439,24 @@ class OrderCore extends ObjectModel
{
if (!$id_order_state)
$id_order_state = 0;
$logable = false;
$delivery = false;
$paid = false;
$shipped = false;
if ($filters > 0)
{
if ($filters & OrderState::FLAG_NO_HIDDEN)
$no_hidden = true;
if ($filters & OrderState::FLAG_DELIVERY)
$delivery = true;
if ($filters & OrderState::FLAG_LOGABLE)
$logable = true;
if ($filters & OrderState::FLAG_PAID)
$paid = true;
if ($filters & OrderState::FLAG_SHIPPED)
$shipped = true;
}
if (!isset(self::$_historyCache[$this->id.'_'.$id_order_state]) || $no_hidden)
{
@@ -449,6 +470,10 @@ class OrderCore extends ObjectModel
LEFT JOIN `'._DB_PREFIX_.'employee` e ON e.`id_employee` = oh.`id_employee`
WHERE oh.id_order = '.(int)($this->id).'
'.($no_hidden ? ' AND os.hidden = 0' : '').'
'.($logable ? ' AND os.logable = 1' : '').'
'.($delivery ? ' AND os.delivery = 1' : '').'
'.($paid ? ' AND os.paid = 1' : '').'
'.($shipped ? ' AND os.shipped = 1' : '').'
'.((int)($id_order_state) ? ' AND oh.`id_order_state` = '.(int)($id_order_state) : '').'
ORDER BY oh.date_add DESC, oh.id_order_history DESC');
if ($no_hidden)
@@ -730,17 +755,17 @@ class OrderCore extends ObjectModel
public function hasBeenDelivered()
{
return count($this->getHistory((int)($this->id_lang), Configuration::get('PS_OS_DELIVERED')));
return count($this->getHistory((int)($this->id_lang), false, false, OrderState::FLAG_DELIVERY));
}
public function hasBeenPaid()
{
return count($this->getHistory((int)($this->id_lang), Configuration::get('PS_OS_PAYMENT')));
return count($this->getHistory((int)($this->id_lang), false, false, OrderState::FLAG_PAID));
}
public function hasBeenShipped()
{
return count($this->getHistory((int)($this->id_lang), Configuration::get('PS_OS_SHIPPING')));
return count($this->getHistory((int)($this->id_lang), false, false, OrderState::FLAG_SHIPPED));
}
public function isInPreparation()
classes/order/OrderState.php
+7
View File
@@ -94,6 +94,13 @@ class OrderStateCore extends ObjectModel
'hidden' => array(),
),
);
const FLAG_NO_HIDDEN = 1; /* 00001 */
const FLAG_LOGABLE = 2; /* 00010 */
const FLAG_DELIVERY = 4; /* 00100 */
const FLAG_SHIPPED = 8; /* 01000 */
const FLAG_PAID = 16; /* 10000 */
/**
* Get all available order states