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

[-] Classes : fix #PSCFV-2185 - bad handling of order states for merchandise returns

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15036 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2012-05-03 11:48:40 +00:00
parent dcfc730177
commit 503bb511d9
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/Order.php
+23 -7
View File
@@ -771,6 +771,20 @@ class OrderCore extends ObjectModel
return count($this->getHistory((int)($this->id_lang), Configuration::get('PS_OS_PREPARATION')));
}
/**
* Checks if the current order state is paid and shipped
*
* @return bool
*/
public function isPaidAndShipped()
{
$order_state = $this->getCurrentOrderState();
if ($order_state && $order_state->paid && $order_state->shipped)
return true;
else
return false;
}
/**
* Get customer orders
*
@@ -1029,15 +1043,17 @@ class OrderCore extends ObjectModel
return false;
}
/**
* Can this order be returned by the client?
*
* @return bool
*/
public function isReturnable()
{
$payment = $this->getHistory((int)($this->id_lang), Configuration::get('PS_OS_PAYMENT'));
$delivred = $this->getHistory((int)($this->id_lang), Configuration::get('PS_OS_DELIVERED'));
if ($payment && $delivred && strtotime($delivred[0]['date_add']) < strtotime($payment[0]['date_add']))
return ((int)(Configuration::get('PS_ORDER_RETURN')) == 1 && $this->getNumberOfDays());
else
return ((int)Configuration::get('PS_ORDER_RETURN') == 1 && (int)$this->getCurrentState() == Configuration::get('PS_OS_DELIVERED') && $this->getNumberOfDays());
if (Configuration::get('PS_ORDER_RETURN') && $this->isPaidAndShipped())
return $this->getNumberOfDays();
return false;
}
public static function getLastInvoiceNumber()