From f9a74c0db5e7486e66150c3f11120d0259c63f37 Mon Sep 17 00:00:00 2001 From: sleeplessnight2 <8561601+sleeplessnight2@users.noreply.github.com> Date: Thu, 3 Dec 2020 14:58:19 +0100 Subject: [PATCH] changeable forced input consume amount you can now choose, if you are get forced to input a Amount on consume or you prefill the given Standard Amount per Product. --- config-dist.php | 1 + localization/de/strings.po | 13 +++++++++++-- public/viewjs/consume.js | 20 +++++++++++++++++--- public/viewjs/stocksettings.js | 6 ++++++ views/stocksettings.blade.php | 18 ++++++++++++++++++ 5 files changed, 53 insertions(+), 5 deletions(-) diff --git a/config-dist.php b/config-dist.php index 1d6fab2a..87ec5d71 100644 --- a/config-dist.php +++ b/config-dist.php @@ -116,6 +116,7 @@ DefaultUserSetting('stock_decimal_places_prices', 2); // Default decimal places DefaultUserSetting('stock_due_soon_days', 5); DefaultUserSetting('stock_default_purchase_amount', 0); DefaultUserSetting('stock_default_consume_amount', 1); +DefaultUserSetting('use_product_specify_amount', 1); DefaultUserSetting('scan_mode_consume_enabled', false); DefaultUserSetting('scan_mode_purchase_enabled', false); DefaultUserSetting('show_icon_on_stock_overview_page_when_product_is_on_shopping_list', true); diff --git a/localization/de/strings.po b/localization/de/strings.po index 40027e0c..68b4518e 100644 --- a/localization/de/strings.po +++ b/localization/de/strings.po @@ -1,10 +1,10 @@ -# +# # Translators: # Hagen Tasche , 2020 # Luca RHK , 2020 # Tobias Wolter , 2020 # Bernd Bestel , 2020 -# +# msgid "" msgstr "" "Project-Id-Version: \n" @@ -51,6 +51,15 @@ msgid_plural "%s Products" msgstr[0] "%s Produkt" msgstr[1] "%s Produkte" +msgid "Standard Consume-Amount for this Product" +msgstr "Standard Verbrauchsmenge für dieses Produkt" + +msgid "This amount is used as the Standard Amount for Consuming" +msgstr "Dieser Betrag wird als Standardmenge für den Verbrauch genommen (inkl. dem Schnellverbrauch)." + +msgid "Otherwise you will be forced to make an entry before you can save" +msgstr "Sonst wird man zu einer Eingabe gezwungen bevor man speichern kann" + msgid "Amount" msgstr "Menge" diff --git a/public/viewjs/consume.js b/public/viewjs/consume.js index 2453c284..42fcc51c 100644 --- a/public/viewjs/consume.js +++ b/public/viewjs/consume.js @@ -94,7 +94,11 @@ Grocy.Components.ProductAmountPicker.Reset(); $("#display_amount").attr("min", "0." + "0".repeat(parseInt(Grocy.UserSettings.stock_decimal_places_amounts) - 1) + "1"); $("#display_amount").removeAttr("max"); - $('#display_amount').val(parseFloat(productDetails.product.quick_consume_amount)); + if (Grocy.UserSettings.use_product_specify_amount == 1) { + $('#display_amount').val(parseFloat(productDetails.product.quick_consume_amount)); + } + else { + $('#display_amount').val(parseFloat(0)); RefreshLocaleNumberInput(); $(".input-group-productamountpicker").trigger("change"); $("#tare-weight-handling-info").addClass("d-none"); @@ -160,7 +164,12 @@ $('#save-mark-as-open-button').on('click', function(e) Grocy.FrontendHelpers.EndUiBusy("consume-form"); toastr.success(__t('Marked %1$s of %2$s as opened', jsonForm.amount + " " + __n(jsonForm.amount, productDetails.quantity_unit_stock.name, productDetails.quantity_unit_stock.name_plural), productDetails.product.name) + '
' + __t("Undo") + ''); - $('#display_amount').val(parseFloat(productDetails.product.quick_consume_amount)); + if (Grocy.UserSettings.use_product_specify_amount == 1) { + $('#display_amount').val(parseFloat(productDetails.product.quick_consume_amount)); + } + else { + $('#display_amount').val(parseFloat(0)); + } RefreshLocaleNumberInput(); $(".input-group-productamountpicker").trigger("change"); Grocy.Components.ProductPicker.Clear(); @@ -276,7 +285,12 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e) Grocy.Components.ProductAmountPicker.Reload(productDetails.product.id, productDetails.quantity_unit_stock.id); Grocy.Components.ProductAmountPicker.SetQuantityUnit(productDetails.quantity_unit_stock.id); - $('#display_amount').val(parseFloat(productDetails.product.quick_consume_amount)); + if (Grocy.UserSettings.use_product_specify_amount == 1) { + $('#display_amount').val(parseFloat(productDetails.product.quick_consume_amount)); + } + else { + $('#display_amount').val(parseFloat(0)); + } RefreshLocaleNumberInput(); $(".input-group-productamountpicker").trigger("change"); diff --git a/public/viewjs/stocksettings.js b/public/viewjs/stocksettings.js index 2d599a73..33dd009b 100644 --- a/public/viewjs/stocksettings.js +++ b/public/viewjs/stocksettings.js @@ -6,6 +6,7 @@ $("#stock_default_purchase_amount").val(Grocy.UserSettings.stock_default_purchas $("#stock_default_consume_amount").val(Grocy.UserSettings.stock_default_consume_amount); $("#stock_decimal_places_amounts").val(Grocy.UserSettings.stock_decimal_places_amounts); $("#stock_decimal_places_prices").val(Grocy.UserSettings.stock_decimal_places_prices); +$("#use_product_specify_amount").val(Grocy.UserSettings.use_product_specify_amount); if (BoolVal(Grocy.UserSettings.show_icon_on_stock_overview_page_when_product_is_on_shopping_list)) { @@ -21,4 +22,9 @@ if (BoolVal(Grocy.UserSettings.show_warning_on_purchase_when_due_date_is_earlier $("#show_warning_on_purchase_when_due_date_is_earlier_than_next").prop("checked", true); } +if (BoolVal(Grocy.UserSettings.use_product_specify_amount)) +{ + $("#use_product_specify_amount").prop("checked", true); +} + RefreshLocaleNumberInput(); diff --git a/views/stocksettings.blade.php b/views/stocksettings.blade.php index 5ce8b3f9..e46e9268 100644 --- a/views/stocksettings.blade.php +++ b/views/stocksettings.blade.php @@ -114,6 +114,24 @@ + +

{{ $__t('Consume') }}

+
+
+ + + +
+
{{ $__t('Consume') }} @include('components.numberpicker', array(