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

// fixed bug on automatic payment addition when put the order to a paid status

Browse Source 
// fix "Free shipping" when create a new invoice

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11321 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
aFolletete
2011-12-16 17:17:13 +00:00
parent ccc51353ce
commit 8415b8136d
2 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/OrderHistory.php
+13 -12
View File
@@ -143,6 +143,19 @@ class OrderHistoryCore extends ObjectModel
}
}
$this->id_order_state = (int)($new_order_state);
/* Change invoice number of order ? */
if (!Validate::isLoadedObject($newOS) OR !Validate::isLoadedObject($order))
die(Tools::displayError('Invalid new order state'));
/* The order is valid only if the invoice is available and the order is not cancelled */
$order->valid = $newOS->logable;
$order->update();
if ($newOS->invoice AND !$order->invoice_number)
$order->setInvoice();
// Set order as paid
if ($newOS->paid == 1)
{
@@ -165,18 +178,6 @@ class OrderHistoryCore extends ObjectModel
}
}
$this->id_order_state = (int)($new_order_state);
/* Change invoice number of order ? */
if (!Validate::isLoadedObject($newOS) OR !Validate::isLoadedObject($order))
die(Tools::displayError('Invalid new order state'));
/* The order is valid only if the invoice is available and the order is not cancelled */
$order->valid = $newOS->logable;
$order->update();
if ($newOS->invoice AND !$order->invoice_number)
$order->setInvoice();
// Update delivery date even if it was already set by another state change
if ($newOS->delivery)
$order->setDelivery();