Skip to content

T
third-party
Commit e26a460e by Arnaud B
Options

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

parent 7359d92d
Pipeline #973 failed with stage
in 18 seconds
Showing with 85 additions and 48 deletions
reception/static/js/reception_index.js
...@@ -163,10 +163,11 @@ function extract_grouped_orders() { ...@@ -163,10 +163,11 @@ function extract_grouped_orders() {
} }
} }
if (g[0].reception_status == 'False') { if (g[0].reception_status == 'False') {
group_row += "<button class='btn--primary' onClick='group_goto(" group_row += "<button class='btn--primary' onClick='group_goto("
+ saved_groups.length + saved_groups.length
+ ")'>Compter les produits</button>"; + ")'>Compter les produits3</button>";
} else { } else {
group_row += "<button class='btn--success' onClick='group_goto(" group_row += "<button class='btn--success' onClick='group_goto("
+ saved_groups.length + saved_groups.length
...@@ -375,12 +376,14 @@ $(document).ready(function() { ...@@ -375,12 +376,14 @@ $(document).ready(function() {
className:"dt-body-center", className:"dt-body-center",
render: function (data) { render: function (data) {
switch (data) { switch (data) {
case 'qty_valid': case 'qty_valid':
return "<span class='btn--success'>Mettre à jour les prix</span>"; return "<span class='btn--success'>Mettre à jour les prix</span>";
case 'br_valid': case 'valid_pending':
return "<span class='btn'><i class='far fa-check-circle'></i> Réception OK</span>"; return "<span class='btn--info'>Validation</span>";
default: case 'br_valid':
return "<span class='btn--primary'>Compter les produits</span>"; return "<span class='btn'><i class='far fa-check-circle'></i> Réception OK</span>";
default:
return "<span class='btn--primary'>Compter les produits</span>";
} }
}, },
width: "20%" width: "20%"
......
reception/static/js/reception_produits.js
...@@ -1504,49 +1504,79 @@ $(document).ready(function() { ...@@ -1504,49 +1504,79 @@ $(document).ready(function() {
$('#partner_name').html(orders[Object.keys(orders)[0]].partner); $('#partner_name').html(orders[Object.keys(orders)[0]].partner);
} }
console.log(reception_status);
/* Set DOM according to reception status */ /* Set DOM according to reception status */
if (reception_status == "qty_valid") { // Step 2 switch(reception_status)
// Header {
document.getElementById('header_step_two').classList.add('step_two_active'); case "False": // Step 1, initial status
var check_icon = document.createElement('i'); 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');
check_icon.className = 'far fa-check-circle';
document.getElementById('header_step_one_content').appendChild(check_icon);
// 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 = "Prix à mettre à jour";
document.getElementById('header_container_right').innerHTML = "Prix mis à jour";
// Edition
document.getElementById('edition_header').innerHTML = "Editer les prix";
document.getElementById('edition_input_label').innerHTML = "Prix unit.";
// 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('valid_pending')\" disabled>Valider la mise à jour des prix</button>";
// Modal content after validation
$("#modal_pricesValidated").load("/reception/reception_pricesValidated");
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');
check_icon.className = 'far fa-check-circle';
document.getElementById('header_step_one_content').appendChild(check_icon);
// 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";
// Edition
document.getElementById('edition_header').innerHTML = "Editer le prix et la quantité";
document.getElementById('edition_input_label').innerHTML = "Prix unit.";
// 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";
check_icon.className = 'far fa-check-circle';
document.getElementById('header_step_one_content').appendChild(check_icon);
// 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 = "Prix à mettre à jour";
document.getElementById('header_container_right').innerHTML = "Prix mis à jour";
// Edition
document.getElementById('edition_header').innerHTML = "Editer les prix";
document.getElementById('edition_input_label').innerHTML = "Prix unit.";
// 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>";
// 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');
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");
} else {
// Extra security, shouldn't get in here
document.location.href = "/reception";
} }
} catch (e) { } catch (e) {
err = {msg: e.name + ' : ' + e.message, ctx: 'page init'}; err = {msg: e.name + ' : ' + e.message, ctx: 'page init'};
......
templates/reception/reception_modal_control.html 0 → 100644
<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 />
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment