diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl index 60c7b0897..d1bb3365e 100755 --- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -531,7 +531,7 @@ {l s='Qty'} {if ($order->hasBeenPaid())}{l s='Refunded'}{/if} {if ($order->hasBeenDelivered())}{l s='Returned'}{/if} - {l s='Stock'} + {l s='Available quantity'} {l s='Total'} *     diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 8ef255a9b..05bc061ae 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -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, diff --git a/translations/fr/admin.php b/translations/fr/admin.php index b79934ec5..42910bbd3 100644 --- a/translations/fr/admin.php +++ b/translations/fr/admin.php @@ -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';