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

[-] BO : #PSCFV-3112 - Fix bug with payment by cheque and multishipping

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16294 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-07-09 16:30:12 +00:00
parent 649cb9af43
commit e8b686d928
5 changed files with 94 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/OrderHistory.php
+3 -2
View File
@@ -72,8 +72,9 @@ class OrderHistoryCore extends ObjectModel
*
* @param int $new_order_state
* @param int $id_order
* @param bool $use_existing_payment
*/
public function changeIdOrderState($new_order_state, $id_order)
public function changeIdOrderState($new_order_state, $id_order, $use_existing_payment = false)
{
if (!$new_order_state || !$id_order)
return;
@@ -216,7 +217,7 @@ class OrderHistoryCore extends ObjectModel
$order->update();
if ($new_os->invoice && !$order->invoice_number)
$order->setInvoice();
$order->setInvoice($use_existing_payment);
// set orders as paid
if ($new_os->paid == 1)