kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-17 19:16:37 +00:00
Code Issues Projects Releases Wiki Activity

Show to amount of "Label per unit" stock entry labels (closes #2241)

Browse Source
This commit is contained in:
Bernd Bestel
2023-05-22 21:23:19 +02:00
parent 55adc140b2
commit 02fe3f2119
8 changed files with 54 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/viewjs/components/productamountpicker.js
View File

@@ -13,6 +13,11 @@ Grocy.Components.ProductAmountPicker.Reload = function(productId, destinationQuI
conversionsForProduct.forEach(conversion =>
{
if (conversion.to_qu_id == destinationQuId)
{
conversion.factor = 1;
}
// Only conversions related to the destination QU are needed
// + only add one conversion per to_qu_id (multiple ones can be a result of contradictory definitions = user input bullshit)
if ((conversion.from_qu_id == destinationQuId || conversion.to_qu_id == destinationQuId) && !$('#qu_id option[value="' + conversion.to_qu_id + '"]').length)
@@ -108,7 +113,7 @@ $(".input-group-productamountpicker").on("change", function()
n = 1;
}
$("#amount").val(destinationAmount.toFixed(n).replace(/0*$/g, ''));
$("#amount").val(destinationAmount.toFixed(n).replace(/0*$/g, '')).trigger("change");
});
$("#display_amount").on("keyup", function()