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

// Merge -> 10309

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-11-21 11:05:10 +00:00
parent 2537c72189
commit 9d10de0848
365 changed files with 11185 additions and 1571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/Order.php
+5 -1
View File
@@ -1115,7 +1115,11 @@ class OrderCore extends ObjectModel
return $result;
}
public function setCurrentState($id_order_state, $id_employee)
/** Set current order state
* @param int $id_order_state
* @param int $id_employee (/!\ not optional except for Webservice.
*/
public function setCurrentState($id_order_state, $id_employee = 0)
{
if (empty($id_order_state))
return false;
classes/order/OrderHistory.php
+2 -1
View File
@@ -122,7 +122,8 @@ class OrderHistoryCore extends ObjectModel
if ($newOS->invoice AND !$order->invoice_number)
$order->setInvoice();
if ($newOS->delivery AND !$order->delivery_number)
// Update delivery date even if it was already set by another state change
if ($newOS->delivery)
$order->setDelivery();
Hook::postUpdateOrderStatus((int)($new_order_state), (int)($id_order));
}