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

// Update and fix some bugs on stock display on orders in backoffice

Browse Source
This commit is contained in:
dSevere
2011-12-05 17:17:01 +00:00
parent 533751ad3c
commit 01ef8f2a23
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/orders/_product_line.tpl
+1 -1
View File
@@ -59,7 +59,7 @@
</td> </td>
{if ($order->hasBeenPaid())}<td align="center" class="productQuantity">{$product['product_quantity_refunded']}</td>{/if} {if ($order->hasBeenPaid())}<td align="center" class="productQuantity">{$product['product_quantity_refunded']}</td>{/if}
{if ($order->hasBeenDelivered())}<td align="center" class="productQuantity">{$product['product_quantity_return']}</td>{/if} {if ($order->hasBeenDelivered())}<td align="center" class="productQuantity">{$product['product_quantity_return']}</td>{/if}
<td align="center" class="productQuantity product_stock">{StockManagerFactory::getManager()->getProductRealQuantities($product['product_id'], $product['product_attribute_id'], null, true)}</td> <td align="center" class="productQuantity product_stock">{$product['current_stock']}</td>
<td align="center" class="total_product"> <td align="center" class="total_product">
{displayPrice price=(Tools::ps_round($product_price, 2) * ($product['product_quantity'] - $product['customizationQuantityTotal'])) currency=$currency->id} {displayPrice price=(Tools::ps_round($product_price, 2) * ($product['product_quantity'] - $product['customizationQuantityTotal'])) currency=$currency->id}
</td> </td>
classes/order/Order.php
+8 -1
View File
@@ -632,11 +632,18 @@ class OrderCore extends ObjectModel
/** /**
* *
* This method allow to add stock information on a product detail * This method allow to add stock information on a product detail
*
* If advanced stock management is active, get physical stock of this product in the warehouse associated to the ptoduct for the current order
* Else get the available quantity of the product in fucntion of the shop associated to the order
*
* @param array &$product * @param array &$product
*/ */
protected function setProductCurrentStock(&$product) protected function setProductCurrentStock(&$product)
{ {
$product['current_stock'] = StockManagerFactory::getManager()->getProductPhysicalQuantities($product['product_id'], $product['product_attribute_id'], null, true); if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && (int)$product['id_warehouse'] > 0)
$product['current_stock'] = StockManagerFactory::getManager()->getProductPhysicalQuantities($product['product_id'], $product['product_attribute_id'], (int)$product['id_warehouse'], true);
else
$product['current_stock'] = '--';
} }
/** /**
controllers/admin/AdminProductsController.php
+1 -1
View File
@@ -2213,7 +2213,7 @@ class AdminProductsControllerCore extends AdminController
{ {
foreach ($warehouses as $warehouse) foreach ($warehouses as $warehouse)
{ {
$key = $warehouse['id_warehouse'].'_'.$attribute['id_product'].'_'.$attribute['id_product_attribute']; $key = $warehouse['id_warehouse'].'_'.$product->id.'_'.$attribute['id_product_attribute'];
// get elements to manage // get elements to manage
if (Tools::isSubmit('check_warehouse_'.$key)) if (Tools::isSubmit('check_warehouse_'.$key))