Ajout de l'étape de vérif avant enregistrement des prix et qté en BDD

reception/static/js/reception_index.js

@@ -163,10 +163,11 @@ function extract_grouped_orders() {
                 }
             }
 
+
             if (g[0].reception_status == 'False') {
                 group_row += "<button class='btn--primary' onClick='group_goto("
                     + saved_groups.length
-                    + ")'>Compter les produits</button>";
+                    + ")'>Compter les produits3</button>";
             } else {
                 group_row += "<button class='btn--success' onClick='group_goto("
                     + saved_groups.length
@@ -377,6 +378,8 @@ $(document).ready(function() {
                     switch (data) {
                         case 'qty_valid':
                             return "<span class='btn--success'>Mettre à jour les prix</span>";
+                        case 'valid_pending':
+                            return "<span class='btn--info'>Validation</span>";
                         case 'br_valid':
                             return "<span class='btn'><i class='far fa-check-circle'></i> Réception OK</span>";
                         default:

reception/static/js/reception_produits.js

@@ -1504,8 +1504,27 @@ $(document).ready(function() {
             $('#partner_name').html(orders[Object.keys(orders)[0]].partner);
         }
 
+        console.log(reception_status);
         /* Set DOM according to reception status */
-        if (reception_status == "qty_valid") { // Step 2
+        switch(reception_status)
+        {
+            case "False": // Step 1, initial status
+                document.getElementById('header_step_one').classList.add('step_one_active');
+
+                document.getElementById('container_left').style.border = "3px solid #212529"; // container products to process
+                document.getElementById('container_right').style.border = "3px solid #0275D8"; // container qty_checked
+                document.getElementById('header_container_left').innerHTML = "Produits à compter";
+                document.getElementById('header_container_right').innerHTML = "Produits déjà comptés";
+
+                document.getElementById('edition_header').innerHTML = "Editer les quantités";
+                document.getElementById('edition_input_label').innerHTML = "Qté";
+
+                document.getElementById("valid_all").innerHTML = "<button class='btn--danger full_width_button' id='valid_all_qties' onclick=\"openModal($('#templates #modal_no_qties').html(), setAllQties, 'Confirmer');\" disabled>Il n'y a plus de produits à compter</button>";
+                document.getElementById("validation_button").innerHTML = "<button class='btn--primary full_width_button' id='valid_qty' onclick=\"pre_send('qty_valid')\" disabled>Valider le comptage des produits</button>";
+
+                $("#modal_qtiesValidated").load("/reception/reception_qtiesValidated");
+                break;
+            case "qty_valid": // Step 2
                 // Header
                 document.getElementById('header_step_two').classList.add('step_two_active');
                 var check_icon = document.createElement('i');
@@ -1525,28 +1544,39 @@ $(document).ready(function() {
 
                 // Validation buttons
                 document.getElementById("valid_all").innerHTML = "<button class='btn--danger full_width_button' id='valid_all_uprices' onclick=\"openModal($('#templates #modal_no_prices').html(), confirmPricesAllValid, 'Confirmer', false);\" disabled>Pas de prix sur le bon de livraison</button>";
-            document.getElementById("validation_button").innerHTML = "<button class='btn--success full_width_button' id='valid_uprice' onclick=\"pre_send('br_valid')\" disabled>Valider la mise à jour des prix</button>";
+                document.getElementById("validation_button").innerHTML = "<button class='btn--success full_width_button' id='valid_uprice' onclick=\"pre_send('valid_pending')\" disabled>Valider la mise à jour des prix</button>";
 
                 // Modal content after validation
                 $("#modal_pricesValidated").load("/reception/reception_pricesValidated");
-        } else if (reception_status == "False") { // Step 1
-            document.getElementById('header_step_one').classList.add('step_one_active');
+                break;
+            case "valid_pending": // Step 3, state with user validation
+                 // Header
+                document.getElementById('header_step_two').classList.add('step_two_active');
+                var check_icon = document.createElement('i');
 
-            document.getElementById('container_left').style.border = "3px solid #212529"; // container products to process
-            document.getElementById('container_right').style.border = "3px solid #0275D8"; // container qty_checked
-            document.getElementById('header_container_left').innerHTML = "Produits à compter";
-            document.getElementById('header_container_right').innerHTML = "Produits déjà comptés";
+                check_icon.className = 'far fa-check-circle';
+                document.getElementById('header_step_one_content').appendChild(check_icon);
 
-            document.getElementById('edition_header').innerHTML = "Editer les quantités";
-            document.getElementById('edition_input_label').innerHTML = "Qté";
+                // Products lists containers
+                document.getElementById('container_left').style.border = "3px solid #0275D8"; // container qty_checked
+                document.getElementById('container_right').style.border = "3px solid #5CB85C"; // container processed items
+                document.getElementById('header_container_left').innerHTML = "Vérification prix et quantités";
+                document.getElementById('header_container_right').innerHTML = "Prix et quantités validés";
 
-            document.getElementById("valid_all").innerHTML = "<button class='btn--danger full_width_button' id='valid_all_qties' onclick=\"openModal($('#templates #modal_no_qties').html(), setAllQties, 'Confirmer');\" disabled>Il n'y a plus de produits à compter</button>";
-            document.getElementById("validation_button").innerHTML = "<button class='btn--primary full_width_button' id='valid_qty' onclick=\"pre_send('qty_valid')\" disabled>Valider le comptage des produits</button>";
+                // Edition
+                document.getElementById('edition_header').innerHTML = "Editer le prix et la quantité";
+                document.getElementById('edition_input_label').innerHTML = "Prix unit.";
 
-            $("#modal_qtiesValidated").load("/reception/reception_qtiesValidated");
-        } else {
+                // Validation buttons
+                document.getElementById("valid_all").innerHTML = "<button class='btn--danger full_width_button' id='valid_all_uprices' onclick=\"openModal($('#templates #modal_no_prices').html(), confirmPricesAllValid, 'Confirmer', false);\" disabled>Pas de prix sur le bon de livraison</button>";
+                document.getElementById("validation_button").innerHTML = "<button class='btn--success full_width_button' id='valid_uprice' onclick=\"pre_send('br_valid')\" disabled>Valider les prix et les quantités</button>";
+
+                break;
+
+            default:
                 // Extra security, shouldn't get in here
                 document.location.href = "/reception";
+
         }
     } catch (e) {
         err = {msg: e.name + ' : ' + e.message, ctx: 'page init'};

templates/reception/reception_modal_control.html

+<h2>Bravo, vous avez validé les prix de cette commande !</h2>
+<hr />
+<h5>La prochaine étape vous permettra de valider les prix et quantités.</h5>
+<hr />