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

[-] Core: fix set of current_state on orders

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17835 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-10-11 10:00:52 +00:00
parent a800886fa4
commit fcb726184f
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/OrderHistory.php
+8 -7
View File
@@ -306,7 +306,7 @@ class OrderHistoryCore extends ObjectModel
$last_order_state = $order->getCurrentOrderState(); $last_order_state = $order->getCurrentOrderState();
$new_order_state = new OrderState($this->id_order_state, Configuration::get('PS_LANG_DEFAULT')); $new_order_state = new OrderState($this->id_order_state, Configuration::get('PS_LANG_DEFAULT'));
if (!parent::add($autodate)) if (!$this->add($autodate))
return false; return false;
$result = Db::getInstance()->getRow(' $result = Db::getInstance()->getRow('
@@ -380,12 +380,6 @@ class OrderHistoryCore extends ObjectModel
null, null, null, null, _PS_MAIL_DIR_, false, (int)$order->id_shop); null, null, null, null, _PS_MAIL_DIR_, false, (int)$order->id_shop);
} }
// Update id_order_state attribute in Order
$order->current_state = $new_order_state->id;
$order->update();
Hook::exec('actionOrderHistoryAddAfter', array('order_history' => $this));
return true; return true;
} }
@@ -393,7 +387,14 @@ class OrderHistoryCore extends ObjectModel
{ {
if (!parent::add($autodate)) if (!parent::add($autodate))
return false; return false;
$order = new Order((int)$this->id_order);
// Update id_order_state attribute in Order
$order->current_state = $this->id_order_state;
$order->update();
Hook::exec('actionOrderHistoryAddAfter', array('order_history' => $this)); Hook::exec('actionOrderHistoryAddAfter', array('order_history' => $this));
return true; return true;
} }