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

// Fixed stock_available when ordering products

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14656 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2012-04-16 13:39:15 +00:00
parent 5c6e33b72a
commit 285becae29
4 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminOrdersController.php
+15 -4
View File
@@ -315,7 +315,6 @@ class AdminOrdersControllerCore extends AdminController
$history->id_order = $order->id;
$history->id_employee = (int)$this->context->employee->id;
$history->changeIdOrderState($order_state->id, $order->id);
$carrier = new Carrier($order->id_carrier, $order->id_lang);
$templateVars = array();
if ($history->id_order_state == Configuration::get('PS_OS_SHIPPING') && $order->shipping_number)
@@ -333,7 +332,19 @@ class AdminOrdersControllerCore extends AdminController
);
// Save all changes
if ($history->addWithemail(true, $templateVars))
{
// synchronizes quantities if needed..
if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
{
foreach ($order->getProducts() as $product)
{
if (StockAvailable::dependsOnStock($product['product_id']))
StockAvailable::synchronize($product['product_id']);
}
}
Tools::redirectAdmin(self::$currentIndex.'&id_order='.(int)$order->id.'&vieworder&token='.$this->token);
}
$this->errors[] = Tools::displayError('An error occurred while changing the status or was unable to send e-mail to the customer.');
}
else
@@ -1579,7 +1590,7 @@ class AdminOrdersControllerCore extends AdminController
// Check fields validity
$this->doEditProductValidation($order_detail, $order, isset($order_invoice) ? $order_invoice : null);
// If multiple product_quantity, the order details concern a product customized
$product_quantity = 0;
if (is_array(Tools::getValue('product_quantity')))
@@ -1695,8 +1706,8 @@ class AdminOrdersControllerCore extends AdminController
'result' => $res,
'error' => Tools::displayError('Error occurred while editing this product line')
)));
if (is_array(Tools::getValue('product_quantity')))
$view = $this->createTemplate('_customized_data.tpl')->fetch();
else