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

// Small fix

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17206 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-09-06 09:19:31 +00:00
parent c8ec4882c6
commit 765a144478
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminOrdersController.php
+7 -2
View File
@@ -338,7 +338,12 @@ class AdminOrdersControllerCore extends AdminController
$history = new OrderHistory();
$history->id_order = $order->id;
$history->id_employee = (int)$this->context->employee->id;
$history->changeIdOrderState($order_state->id, $order->id);
$use_existings_payment = false;
if (!$order->hasInvoice())
$use_existings_payment = true;
$history->changeIdOrderState($order_state->id, $order->id, true);
$carrier = new Carrier($order->id_carrier, $order->id_lang);
$templateVars = array();
if ($history->id_order_state == Configuration::get('PS_OS_SHIPPING') && $order->shipping_number)
@@ -996,7 +1001,7 @@ class AdminOrdersControllerCore extends AdminController
$this->errors[] = Tools::displayError('This order already has an invoice');
else
{
$order->setInvoice();
$order->setInvoice(true);
Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order->id.'&vieworder&conf=4&token='.$this->token);
}
}