From 2a371cc08107dcccab9cf239e8929d7c875235b2 Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Wed, 3 Oct 2018 13:27:36 +0200 Subject: [PATCH] Product edit page: Enforce a quantity unit conversion factor > 1 when quantity unit purchase != quantity unit stock --- public/viewjs/productform.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/public/viewjs/productform.js b/public/viewjs/productform.js index b31055cd..7c9c805d 100644 --- a/public/viewjs/productform.js +++ b/public/viewjs/productform.js @@ -136,7 +136,21 @@ if (prefillBarcode !== undefined) $('.input-group-qu').on('change', function(e) { + var quIdPurchase = $("#qu_id_purchase").val(); + var quIdStock = $("#qu_id_stock").val(); var factor = $('#qu_factor_purchase_to_stock').val(); + + if (quIdPurchase != quIdStock) + { + $('#qu_factor_purchase_to_stock').attr("min", 2); + $("#qu_factor_purchase_to_stock").parent().find(".invalid-feedback").text(L('The amount cannot be lower than #1', '2')); + } + else + { + $('#qu_factor_purchase_to_stock').attr("min", 1); + $("#qu_factor_purchase_to_stock").parent().find(".invalid-feedback").text(L('The amount cannot be lower than #1', '1')); + } + if (factor > 1) { $('#qu-conversion-info').text(L('This means 1 #1 purchased will be converted into #2 #3 in stock', $("#qu_id_purchase option:selected").text(), (1 * factor).toString(), $("#qu_id_stock option:selected").text())); @@ -146,6 +160,8 @@ $('.input-group-qu').on('change', function(e) { $('#qu-conversion-info').addClass('d-none'); } + + Grocy.FrontendHelpers.ValidateForm('product-form'); }); $('#product-form input').keyup(function(event)