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@17168 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard committed 2012-09-04 17:44:56 +00:00
1 parent 650c0105b7
commit 3d7a80671a
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminOrdersController.php
+2 -2
View File
@@ -352,7 +352,7 @@ class AdminOrdersControllerCore extends AdminController
foreach ($order->getProducts() as $product) foreach ($order->getProducts() as $product)
{ {
if (StockAvailable::dependsOnStock($product['product_id'])) if (StockAvailable::dependsOnStock($product['product_id']))
StockAvailable::synchronize($product['product_id']); StockAvailable::synchronize($product['product_id'], (int)$product['id_shop']);
} }
} }
@@ -1441,7 +1441,7 @@ class AdminOrdersControllerCore extends AdminController
else else
$product['warehouse_list'][0] = array(); $product['warehouse_list'][0] = array();
$product['stock'][0] = Product::getRealQuantity($product['id_product'], 0, 0); $product['stock'][0] = StockAvailable::getQuantityAvailableByProduct((int)$product['id_product'], 0, (int)$this->context->shop->id);
foreach ($combinations as &$combination) foreach ($combinations as &$combination)
$combination['attributes'] = rtrim($combination['attributes'], ' - '); $combination['attributes'] = rtrim($combination['attributes'], ' - ');