From cf39e598e14e72e4a1c98485b46bc1b69ecb9afa Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Sat, 13 Nov 2021 17:35:32 +0100 Subject: [PATCH] Prefill due date also on location change --- public/viewjs/purchase.js | 76 ++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 28 deletions(-) diff --git a/public/viewjs/purchase.js b/public/viewjs/purchase.js index 78368475..948ef40a 100644 --- a/public/viewjs/purchase.js +++ b/public/viewjs/purchase.js @@ -286,34 +286,7 @@ if (Grocy.Components.ProductPicker !== undefined) $("#tare-weight-handling-info").addClass("d-none"); } - if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING) - { - var dueDays; - if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_PRODUCT_FREEZING && BoolVal(productDetails.location.is_freezer)) - { - dueDays = productDetails.product.default_best_before_days_after_freezing; - } - else - { - dueDays = productDetails.product.default_best_before_days; - } - - dueDays = parseFloat(dueDays); - if (dueDays != 0) - { - if (dueDays == -1) - { - if (!$("#datetimepicker-shortcut").is(":checked")) - { - $("#datetimepicker-shortcut").click(); - } - } - else - { - Grocy.Components.DateTimePicker.SetValue(moment().add(dueDays, 'days').format('YYYY-MM-DD')); - } - } - } + PrefillBestBeforeDate(productDetails.product, productDetails.location); if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_LABEL_PRINTER) { @@ -407,6 +380,53 @@ if (Grocy.Components.ProductPicker !== undefined) }); } +function PrefillBestBeforeDate(product, location) +{ + if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING) + { + var dueDays; + if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_PRODUCT_FREEZING && BoolVal(location.is_freezer)) + { + dueDays = product.default_best_before_days_after_freezing; + } + else + { + dueDays = product.default_best_before_days; + } + + dueDays = parseFloat(dueDays); + if (dueDays != 0) + { + if (dueDays == -1) + { + if (!$("#datetimepicker-shortcut").is(":checked")) + { + $("#datetimepicker-shortcut").click(); + } + } + else + { + Grocy.Components.DateTimePicker.SetValue(moment().add(dueDays, 'days').format('YYYY-MM-DD')); + } + } + } +} + +Grocy.Components.LocationPicker.GetPicker().on('change', function(e) +{ + if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_PRODUCT_FREEZING) + { + Grocy.Api.Get('objects/locations/' + Grocy.Components.LocationPicker.GetValue(), + function(location) + { + PrefillBestBeforeDate(CurrentProductDetails.product, location); + }, + function(xhr) + { } + ); + } +}); + $('#display_amount').val(parseFloat(Grocy.UserSettings.stock_default_purchase_amount)); RefreshLocaleNumberInput(); $(".input-group-productamountpicker").trigger("change");