github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-08 13:46:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(consume): convert bounds to selected quantity unit

Browse Source
This commit is contained in:
Luca 2024-07-06 17:17:28 +02:00
parent 8ac8000f30
commit 2782b29731
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/76_UNRELEASED_xxxx-xx-xx.md
View File

@ -15,6 +15,7 @@
- If the lookup was successful, the product edit page of the created product is displayed, where the product setup can be completed (if required) - If the lookup was successful, the product edit page of the created product is displayed, where the product setup can be completed (if required)
- After that, the transaction is continued with that product - After that, the transaction is continued with that product
- Fixed that when copying a product, the field "Treat opened as out of stock" wasn't copied along (thanks @TheDodger) - Fixed that when copying a product, the field "Treat opened as out of stock" wasn't copied along (thanks @TheDodger)
- Fixed conversion of minimum/maximum product amount to selected quantity unit in consume view
### Shopping list ### Shopping list

22
public/viewjs/consume.js
View File

@ -102,7 +102,7 @@
Grocy.Components.ProductPicker.FinishFlow(); Grocy.Components.ProductPicker.FinishFlow();
Grocy.Components.ProductAmountPicker.Reset(); Grocy.Components.ProductAmountPicker.Reset();
$("#display_amount").attr("min", Grocy.DefaultMinAmount); $("#display_amount").attr("min", Grocy.DefaultMinAmount * $("#qu_id option:selected").attr("data-qu-factor"));
$("#display_amount").removeAttr("max"); $("#display_amount").removeAttr("max");
if (BoolVal(Grocy.UserSettings.stock_default_consume_amount_use_quick_consume_amount)) if (BoolVal(Grocy.UserSettings.stock_default_consume_amount_use_quick_consume_amount))
{ {
@ -249,7 +249,7 @@ $("#location_id").on('change', function(e)
function(stockEntries) function(stockEntries)
{ {
OnLocationChange(stockEntries[0].location_id, gc[3]); OnLocationChange(stockEntries[0].location_id, gc[3]);
$('#display_amount').val(stockEntries[0].amount); $("#display_amount").val(stockEntries[0].amount * $("#qu_id option:selected").attr("data-qu-factor"));
}, },
function(xhr) function(xhr)
{ {
@ -476,13 +476,13 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
if (productDetails.product.enable_tare_weight_handling == 1) if (productDetails.product.enable_tare_weight_handling == 1)
{ {
$("#display_amount").attr("min", productDetails.product.tare_weight); $("#display_amount").attr("min", productDetails.product.tare_weight * $("#qu_id option:selected").attr("data-qu-factor"));
$('#display_amount').attr('max', productDetails.stock_amount + productDetails.product.tare_weight); $("#display_amount").attr("max", (productDetails.stock_amount + productDetails.product.tare_weight) * $("#qu_id option:selected").attr("data-qu-factor"));
$("#tare-weight-handling-info").removeClass("d-none"); $("#tare-weight-handling-info").removeClass("d-none");
} }
else else
{ {
$("#display_amount").attr("min", Grocy.DefaultMinAmount); $("#display_amount").attr("min", Grocy.DefaultMinAmount * $("#qu_id option:selected").attr("data-qu-factor"));
$("#tare-weight-handling-info").addClass("d-none"); $("#tare-weight-handling-info").addClass("d-none");
} }
@ -564,7 +564,7 @@ $("#specific_stock_entry").on("change", function(e)
sumValue = sumValue + stockEntry.amount_aggregated; sumValue = sumValue + stockEntry.amount_aggregated;
} }
}); });
$("#display_amount").attr("max", sumValue); $("#display_amount").attr("max", sumValue * $("#qu_id option:selected").attr("data-qu-factor"));
if (sumValue == 0) if (sumValue == 0)
{ {
$("#display_amount").parent().find(".invalid-feedback").text(__t('There are no units available at this location')); $("#display_amount").parent().find(".invalid-feedback").text(__t('There are no units available at this location'));
@ -578,7 +578,7 @@ $("#specific_stock_entry").on("change", function(e)
} }
else else
{ {
$("#display_amount").attr("max", $('option:selected', this).attr('amount')); $("#display_amount").attr("max", $("option:selected", this).attr("amount") * $("#qu_id option:selected").attr("data-qu-factor"));
} }
}); });
@ -700,16 +700,16 @@ function RefreshForm()
if (productDetails.product.enable_tare_weight_handling == 1 && !$('#consume-exact-amount').is(':checked')) if (productDetails.product.enable_tare_weight_handling == 1 && !$('#consume-exact-amount').is(':checked'))
{ {
$("#display_amount").attr("min", productDetails.product.tare_weight); $("#display_amount").attr("min", productDetails.product.tare_weight * $("#qu_id option:selected").attr("data-qu-factor"));
$('#display_amount').attr('max', sumValue + productDetails.product.tare_weight); $("#display_amount").attr("max", (sumValue + productDetails.product.tare_weight) * $("#qu_id option:selected").attr("data-qu-factor"));
$("#tare-weight-handling-info").removeClass("d-none"); $("#tare-weight-handling-info").removeClass("d-none");
} }
else else
{ {
$("#tare-weight-handling-info").addClass("d-none"); $("#tare-weight-handling-info").addClass("d-none");
$("#display_amount").attr("min", Grocy.DefaultMinAmount); $("#display_amount").attr("min", Grocy.DefaultMinAmount * $("#qu_id option:selected").attr("data-qu-factor"));
$('#display_amount').attr('max', sumValue * $("#qu_id option:selected").attr("data-qu-factor")); $("#display_amount").attr("max", sumValue * $("#qu_id option:selected").attr("data-qu-factor"));
if (sumValue == 0) if (sumValue == 0)
{ {