From 10680a43cf828488c68e1a02f6dcf8a8c345e750 Mon Sep 17 00:00:00 2001 From: bMancone Date: Mon, 23 Apr 2012 08:26:10 +0000 Subject: [PATCH] // When viewing an order, a warning is now displayed if one/some product(s) are out of stock - #PSTEST-821 --- controllers/admin/AdminOrdersController.php | 11 +++++++++++ translations/fr/admin.php | 1 + 2 files changed, 12 insertions(+) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 05bc061ae..1c7b6c380 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -1205,9 +1205,20 @@ class AdminOrdersControllerCore extends AdminController $payment_methods[] = $module->displayName; } + // display warning if there are products out of stock + $display_out_of_stock_warning = false; + $current_order_state = $order->getCurrentOrderState(); + if ($current_order_state->delivery != 1 && $current_order_state->shipped != 1) + $display_out_of_stock_warning = true; + // 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']); + // if the current stock requires a warning + if ($product['current_stock'] == 0 && $display_out_of_stock_warning) + $this->displayWarning($this->l('This product is out of stock: ').' '.$product['product_name']); + } // Smarty assign $this->tpl_view_vars = array( diff --git a/translations/fr/admin.php b/translations/fr/admin.php index 42910bbd3..1109d2443 100644 --- a/translations/fr/admin.php +++ b/translations/fr/admin.php @@ -2135,6 +2135,7 @@ $_LANGADM['AdminOrdersabbbd19bce9246d4a53a252efe4a8ef8'] = 'Facture :'; $_LANGADM['AdminOrdersabbf10987248e3f9f4722d7354fac687'] = 'Total taxes : '; $_LANGADM['AdminOrdersadaaee4b22041c27198d410c68d952c9'] = 'Pourcentage'; $_LANGADM['AdminOrdersae3ccb7e10314703d4d390c3010c71db'] = 'Message pour la commande :'; +$_LANGADM['AdminOrdersaeddc664f1e95691c69ea44a5c1c18f5'] = 'Ce produit est en rupture de stock :'; $_LANGADM['AdminOrdersaf5730c209cb9ef0ddb9f7dc91a50e4e'] = 'Cette fonctionnalité va générer un mot de passe aléatoire et envoyer un e-mail au client'; $_LANGADM['AdminOrdersafdbd71037839ec5a581febacab7bad7'] = 'Aucun client trouvé'; $_LANGADM['AdminOrdersb157524c4be8c2fc80e5ef2f0b1bf1e6'] = 'Commandes validées :';