Merge branch 'aide_a_la_commande' into dev_cooperatic

orders/static/css/oders_helper_style.css

@@ -66,10 +66,20 @@
     position: absolute;
 }
 
-#actions_buttons_area {
+#main_content .actions_buttons_area {
     position: absolute;
+    width: 100%;
     top: 0;
-    right: 0;
+    display: flex;
+    justify-content: space-between;
+}
+
+#orders_created .actions_buttons_area {
+    position: absolute;
+    width: 100%;
+    top: 0;
+    display: flex;
+    justify-content: flex-start;
 }
 
 /* -- Order data */
@@ -193,7 +203,6 @@
 /* - Orders created screen */
 
 .order_created_header {
-    margin-top: 15px;
     margin-bottom: 40px;
 }
 

orders/static/js/orders_helper.js

@@ -27,6 +27,8 @@ var dbc = null,
     },
     fingerprint = null;
 
+var clicked_order_pill = null;
+
 
 /* - UTILS */
 
@@ -53,6 +55,7 @@ function reset_data() {
         package_qty: null,
         price: null
     };
+    clicked_order_pill = null;
 }
 
 /**
@@ -109,17 +112,32 @@ function add_product() {
         return -1;
     }
 
+    /* 
+    onst product_ids = products.map(p => p.id);
+
+        if (product_ids.length > 0) {
+            clicked_order_pill.find('.pill_order_name').empty().append(`<i class="fas fa-spinner fa-spin"></i>`);
+
+            $.ajax({
+                type: 'POST',
+                url: '/products/get_product_for_order_helper',
+                data: JSON.stringify(product_ids),
+                dataType:"json",
+    */
+
     $.ajax({
-        type: 'GET',
-        url: '/products/get_product_for_order_helper/' + product.tpl_id,
+        type: 'POST',
+        url: '/products/get_product_for_order_helper',
+        data: JSON.stringify([product.tpl_id]),
         dataType:"json",
         traditional: true,
         contentType: "application/json; charset=utf-8",
         success: function(data) {
-            if (typeof data.id != "undefined") {
-                data.suppliersinfo = [];
-                data.default_code = ' ';
-                products.unshift(data);
+            let res = data.products[0];
+            if (typeof res.id != "undefined") {
+                res.suppliersinfo = [];
+                res.default_code = ' ';
+                products.unshift(res);
                 update_main_screen({'sort_order_dir':'desc'});
                 update_cdb_order();
             } else {
@@ -174,6 +192,51 @@ function compute_products_coverage_qties() {
     }
 }
 
+/**
+ * Update order products data in case they have changed.
+ */
+function check_products_data() {
+    return new Promise((resolve, reject) => {
+        const product_ids = products.map(p => p.id);
+
+        if (product_ids.length > 0) {
+            clicked_order_pill.find('.pill_order_name').empty().append(`<i class="fas fa-spinner fa-spin"></i>`);
+
+            $.ajax({
+                type: 'POST',
+                url: '/products/get_product_for_order_helper',
+                data: JSON.stringify(product_ids),
+                dataType:"json",
+                traditional: true,
+                contentType: "application/json; charset=utf-8",
+                success: function(data) {
+                    for (let product of data.products) {
+                        const p_index = products.findIndex(p => p.id == product.id);
+
+                        // Override products data with new data
+                        products[p_index] = { ...products[p_index], ...product };
+                    }
+
+                    resolve();
+                },
+                error: function(data) {
+                    err = {msg: "erreur serveur lors de la vérification des données des articles", ctx: 'check_products_data'};
+                    if (typeof data.responseJSON != 'undefined' && typeof data.responseJSON.error != 'undefined') {
+                        err.msg += ' : ' + data.responseJSON.error;
+                    }
+                    report_JS_error(err, 'orders');
+                    alert(`Erreur lors de la vérification des données des articles. Certaines données peuvent être erronées`);
+
+                    // Don't block process if this call fails
+                    resolve();
+                }
+            });
+        } else {
+            resolve();
+        }
+    });
+}
+
 
 /* - SUPPLIERS */
 
@@ -533,7 +596,8 @@ function generate_inventory() {
  * Event fct: on click on an order button
  */
 function order_pill_on_click() {
-    let order_name_container = $(this).find('.pill_order_name');
+    clicked_order_pill = $(this);
+    let order_name_container = clicked_order_pill.find('.pill_order_name');
     let doc_id = $(order_name_container).text();
 
     dbc.get(doc_id).then((doc) => {
@@ -784,11 +848,12 @@ function goto_main_screen(doc) {
     products = order_doc.products;
     selected_suppliers = order_doc.selected_suppliers;
 
-    // TODO update products moving data (stock, qté entrante, conso moy/jour)
-
-    update_cdb_order();
-    update_main_screen();
-    switch_screen();
+    check_products_data()
+        .then(() => {
+            update_cdb_order();
+            update_main_screen();
+            switch_screen();
+        })
 }
 
 function back() {
@@ -1344,8 +1409,8 @@ function update_order_selection_screen() {
     $(".order_pill").off();
 
     let existing_orders_container = $("#existing_orders");
-
     existing_orders_container.empty();
+    $('#new_order_name').val('');
 
     dbc.allDocs({
         include_docs: true

products/models.py

@@ -482,7 +482,7 @@ class CagetteProducts(models.Model):
                         and (p["date_end"] is False or p["date_end"] is not False and p["date_end"] >= today)):
                         ptids.append(p["product_tmpl_id"][0])
             else:
-                ptids = pids
+                ptids = [ int(x) for x in pids ]
 
             # Get products templates
             f = [

products/urls.py

@@ -5,7 +5,7 @@ from . import views
 urlpatterns = [
     url(r'^$', views.home),
     url(r'^simple_list$', views.get_simple_list),
-    url(r'^get_product_for_order_helper/([0-9]+)$', views.get_product_for_order_helper),
+    url(r'^get_product_for_order_helper$', views.get_product_for_order_helper),
     url(r'^get_product_data$', views.get_product_data),
     url(r'^get_products_stdprices$', views.get_products_stdprices),
     url(r'^update_product_stock$', views.update_product_stock),

products/views.py

@@ -39,12 +39,11 @@ def get_simple_list(request):
         return JsonResponse(res, safe=False)
 
 
-def get_product_for_order_helper(request, tpl_id):
+def get_product_for_order_helper(request):
     res = {}
     try:
-        result = CagetteProducts.get_products_for_order_helper(None, [int(tpl_id)])
-        if len(result["products"]) == 1:
-            res = result["products"][0]
+        pids = json.loads(request.body.decode())
+        res = CagetteProducts.get_products_for_order_helper(None, pids)
     except Exception as e:
         coop_logger.error("get_product_for_help_order_line : %s", str(e))
         res['error'] = str(e)

templates/orders/helper.html

@@ -30,10 +30,10 @@
     </div>
 
     <div id="main_content" class="page_content" style="display:none;">
-        <div id="back_to_order_selection_from_main">
-            <button type="button" class="btn--danger"><i class="fas fa-arrow-left"></i>&nbsp; Retour</button>
-        </div>
-        <div id="actions_buttons_area">
+        <div class="actions_buttons_area">
+            <button type="button" class="btn--danger" id="back_to_order_selection_from_main">
+                <i class="fas fa-arrow-left"></i>&nbsp; Retour
+            </button>
             <button type="button" class='btn--primary' id="do_inventory" style="display:none;">
                 Faire un inventaire
             </button>
@@ -80,8 +80,10 @@
     </div>
 
     <div id="orders_created" class="page_content" style="display:none;">
-        <div id="back_to_order_selection_from_orders_created">
-            <button type="button" class="btn--danger"><i class="fas fa-arrow-left"></i>&nbsp; Retour</button>
+        <div class="actions_buttons_area">
+            <button type="button" class="btn--danger" id="back_to_order_selection_from_orders_created">
+                <i class="fas fa-arrow-left"></i>&nbsp; Retour
+            </button>
         </div>
         <div class="order_created_header txtcenter">
             <h2>Commandes créées !</h2>