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

// When viewing an order, the stock_available is now properly displayed.

Browse Source
This commit is contained in:
bMancone
2012-04-23 08:15:23 +00:00
parent d3e064d753
commit c7be89d916
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+1 -1
View File
@@ -531,7 +531,7 @@
<th style="width: 4%; text-align: center">{l s='Qty'}</th>
{if ($order->hasBeenPaid())}<th style="width: 3%; text-align: center">{l s='Refunded'}</th>{/if}
{if ($order->hasBeenDelivered())}<th style="width: 3%; text-align: center">{l s='Returned'}</th>{/if}
<th style="width: 3%; text-align: center">{l s='Stock'}</th>
<th style="width: 10%; text-align: center">{l s='Available quantity'}</th>
<th style="width: 10%; text-align: center">{l s='Total'} <sup>*</sup></th>
<th colspan="2" style="display: none;" class="add_product_fields">&nbsp;</th>
<th colspan="2" style="display: none;" class="edit_product_fields">&nbsp;</th>
controllers/admin/AdminOrdersController.php
+7 -3
View File
@@ -674,7 +674,7 @@ class AdminOrdersControllerCore extends AdminController
$cartrule->date_from = date('Y-m-d H:i:s', $now);
$cartrule->date_to = date('Y-m-d H:i:s', $now + (3600 * 24 * 365.25)); /* 1 year */
$cartrule->active = 1;
// Calculate the amount of the discount
$products = $order->getProducts(false, $full_product_list, $full_quantity_list);
// Totals are stored in the order currency (or at least should be)
@@ -690,9 +690,9 @@ class AdminOrdersControllerCore extends AdminController
}
if (Tools::isSubmit('shippingBack'))
$total += $order->total_shipping;
$cartrule->reduction_amount = $total;
if (!$cartrule->add())
$this->errors[] = Tools::displayError('Cannot generate voucher');
else
@@ -1205,6 +1205,10 @@ class AdminOrdersControllerCore extends AdminController
$payment_methods[] = $module->displayName;
}
// products current stock (from stock_available)
foreach ($products as &$product)
$product['current_stock'] = StockAvailable::getQuantityAvailableByProduct($product['product_id'], $product['product_attribute_id'], $product['id_shop']);
// Smarty assign
$this->tpl_view_vars = array(
'order' => $order,
translations/fr/admin.php
+1 -1
View File
@@ -2021,7 +2021,6 @@ $_LANGADM['AdminOrders21e12a8fe83def19b503a5fe335cff50'] = 'Marque de la carte :
$_LANGADM['AdminOrders24dd7d199595f022b6c9dbfd17bafb55'] = 'Aucun paiement disponible';
$_LANGADM['AdminOrders257630448a4acd9cfc1ce6c7a5ce05f3'] = 'Ajouter un nouveau client';
$_LANGADM['AdminOrders2633d6725607d13e80f5e30514b91fbe'] = 'Total bons d\'achat :';
$_LANGADM['AdminOrders27ce7f8b5623b2e2df568d64cf051607'] = 'Stock';
$_LANGADM['AdminOrders284b47b0bb63ae2df3b29f0e691d6fcf'] = 'Adresses';
$_LANGADM['AdminOrders290612199861c31d1036b185b4e69b75'] = 'Récapitulatif';
$_LANGADM['AdminOrders29aa46cc3d2677c7e0f216910df600ff'] = 'Livraison offerte';
@@ -2201,6 +2200,7 @@ $_LANGADM['AdminOrdersf4ec5f57bd4d31b803312d873be40da9'] = 'Modifier';
$_LANGADM['AdminOrdersf53e8d0e97c47ce70ca9c5eaa08a00d0'] = 'Avoir';
$_LANGADM['AdminOrdersf8246f1c2cfd9a81a376223428bd09d7'] = 'Pas de facture';
$_LANGADM['AdminOrdersf8617a92ba0a0a4eabee724eab7c9f48'] = 'Transporteur :';
$_LANGADM['AdminOrdersf8a09f634b7b3ede2da34607da2aaebe'] = 'Quantités disponibles';
$_LANGADM['AdminOrdersf8b1369a8e9d90da0cae0b11049309af'] = 'Non défini';
$_LANGADM['AdminOrdersfb61758d0f0fda4ba867c3d5a46c16a7'] = 'Sources';
$_LANGADM['AdminOrdersfcf180ebb3cd68250a42bf69795217d8'] = 'Aucune marchandise n\'a été retournée';