Commit 4f71500f by François C.

Merge branch 'dev_cooperatic' of…

Merge branch 'dev_cooperatic' of gl.cooperatic.fr:cooperatic-foodcoops/third-party into dev_cooperatic
parents 1c7836cc 4159459d
Pipeline #2273 passed with stage
in 1 minute 23 seconds
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
padding: 20px; padding: 20px;
} }
span.shelf {font-weight: bold;} span.shelf {font-weight: bold;}
button.add-products {display: none;} .add-products {display: none;}
td.p_nb , td.p_nb ,
td.products .fa-plus-circle, td.products .fa-plus-circle,
......
...@@ -16,7 +16,6 @@ var main_content = $('#main-content'), ...@@ -16,7 +16,6 @@ var main_content = $('#main-content'),
adding_pdts_tpl = $('#adding-products').clone() adding_pdts_tpl = $('#adding-products').clone()
.removeAttr('id'), .removeAttr('id'),
active_phase = 'main', active_phase = 'main',
add_pdts_btn_text = 'AJOUTER AU RAYON',
add_to_shelf_product_ids = [], add_to_shelf_product_ids = [],
barcodes = null; barcodes = null;
...@@ -396,14 +395,13 @@ var addProductToList = async function(barcode) { ...@@ -396,14 +395,13 @@ var addProductToList = async function(barcode) {
//It could also be a wrong reading one //It could also be a wrong reading one
odoo_product = barcodes.get_corresponding_odoo_product(barcode); odoo_product = barcodes.get_corresponding_odoo_product(barcode);
if (odoo_product) { if (odoo_product === null) {
alert(barcode + " : ce code-barre est inconnu, merci d'apporter le produit à un salarié.");
} else {
if (is_product_in_shelf_adding_queue_list(odoo_product.data[barcodes.keys.id])) { if (is_product_in_shelf_adding_queue_list(odoo_product.data[barcodes.keys.id])) {
alert("Produit déjà présent dans la liste."); alert("Produit déjà présent dans la liste.");
} else { } else {
add_to_shelf_product_ids.push(odoo_product.data[4]); add_to_shelf_product_ids.push(odoo_product.data[4]);
if (odoo_product === null) {
alert(barcode + ' : Code-barre inconnu');
} else {
var pdt_line = $('<tr>').attr('data-id', odoo_product.data[barcodes.keys.id]) var pdt_line = $('<tr>').attr('data-id', odoo_product.data[barcodes.keys.id])
.attr('data-bc', odoo_product.barcode) .attr('data-bc', odoo_product.barcode)
.addClass('obc'); .addClass('obc');
...@@ -419,9 +417,7 @@ var addProductToList = async function(barcode) { ...@@ -419,9 +417,7 @@ var addProductToList = async function(barcode) {
$('<td>').html(delete_icon + " " + print_icon) $('<td>').html(delete_icon + " " + print_icon)
.appendTo(pdt_line); .appendTo(pdt_line);
adding_pdts_tpl.find('#added_products tbody').append(pdt_line); adding_pdts_tpl.find('#added_products tbody').append(pdt_line);
main_content.find('button.add-products').css('display', 'block') main_content.find('.add-products').css('display', 'block')
.html(add_pdts_btn_text);
}
} }
} }
}; };
...@@ -438,7 +434,7 @@ var addProducts = async function() { ...@@ -438,7 +434,7 @@ var addProducts = async function() {
main_content.html(adding_pdts_tpl); main_content.html(adding_pdts_tpl);
active_phase = "adding_products"; active_phase = "adding_products";
main_content.find('button.add-products').css('display', 'none'); main_content.find('.add-products').css('display', 'none');
if (admin_ids.find(id => id == getCookie("uid"))) $('.add-search').show(); if (admin_ids.find(id => id == getCookie("uid"))) $('.add-search').show();
}; };
...@@ -455,7 +451,8 @@ var recordProductsAddedShelf = function() { ...@@ -455,7 +451,8 @@ var recordProductsAddedShelf = function() {
}); });
if (is_time_to('add_pdts_to_shelf', 5000)) { // prevent double click or browser hic up bug if (is_time_to('add_pdts_to_shelf', 5000)) { // prevent double click or browser hic up bug
main_content.find('button.add-products').html(loading_img); openModal(); // loading on
post_form( post_form(
'/shelfs/admin/add_products', '/shelfs/admin/add_products',
{bc: JSON.stringify(barcodes), shelf_id: id}, {bc: JSON.stringify(barcodes), shelf_id: id},
...@@ -471,6 +468,8 @@ var recordProductsAddedShelf = function() { ...@@ -471,6 +468,8 @@ var recordProductsAddedShelf = function() {
msg += "\n" + bc; msg += "\n" + bc;
}); });
} }
closeModal();
alert(msg); alert(msg);
backToMain(); backToMain();
} else { } else {
...@@ -479,7 +478,8 @@ var recordProductsAddedShelf = function() { ...@@ -479,7 +478,8 @@ var recordProductsAddedShelf = function() {
else if (typeof rData.res.msg != "undefined") else if (typeof rData.res.msg != "undefined")
msg = rData.res.msg; msg = rData.res.msg;
alert(msg); alert(msg);
main_content.find('button.add-products').html(add_pdts_btn_text); main_content.find('.add-products').show();
closeModal();
} }
} }
...@@ -573,7 +573,7 @@ $(document).ready(function() { ...@@ -573,7 +573,7 @@ $(document).ready(function() {
$(document).on('click', '.obc .fa-trash', deleteBarcodeFromList); $(document).on('click', '.obc .fa-trash', deleteBarcodeFromList);
$(document).on('click', '.obc .fa-print', printProduct); $(document).on('click', '.obc .fa-print', printProduct);
$(document).on('click', 'td.products .fa-plus-circle', addProducts); $(document).on('click', 'td.products .fa-plus-circle', addProducts);
$(document).on('click', '#main-content button.add-products', recordProductsAddedShelf); $(document).on('click', '#main-content .add-products', recordProductsAddedShelf);
$(document).on('click', 'td.p_nb', showProductsList); $(document).on('click', 'td.p_nb', showProductsList);
try { try {
if (admin_ids.find(id => id == getCookie("uid"))) { if (admin_ids.find(id => id == getCookie("uid"))) {
......
...@@ -70,7 +70,12 @@ ...@@ -70,7 +70,12 @@
</tbody> </tbody>
</table> </table>
<button type="button" class="btn--primary add-products"></button> <div class ="add-products">
<p>
VOUS POUVEZ AJOUTER PLUSIEURS PRODUITS A LA FOIS AVANT DE VALIDER
</p>
<button type="button" class="btn--primary">Ajouter les produits au rayon</button>
</div>
</div> </div>
<div id="main-table-wrap"> <div id="main-table-wrap">
<table class="display shelfs" width="99%" cellspacing="0" ></table> <table class="display shelfs" width="99%" cellspacing="0" ></table>
......
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