kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 09:39:57 +00:00
Code Issues Projects Releases Wiki Activity

Fixed stock entry label info handling when the corresponding feature flag is disabled

Browse Source
This commit is contained in:
Bernd Bestel 2023-05-22 22:33:36 +02:00
parent aec71bd408
commit 2633d3d1a5
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
public/viewjs/inventory.js
View File

@ -523,22 +523,25 @@ function UndoStockTransaction(transactionId)
$("#display_amount").attr("min", "0"); $("#display_amount").attr("min", "0");
$("#stock_label_type, #amount").on("change", function(e) if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_LABEL_PRINTER)
{ {
if ($("#stock_label_type").val() == 2) $("#stock_label_type, #amount").on("change", function(e)
{ {
var estimatedBookingAmount = Number.parseFloat($("#amount").attr("data-estimated-booking-amount")); if ($("#stock_label_type").val() == 2)
if (estimatedBookingAmount > 0)
{ {
$("#stock-entry-label-info").text(__n(estimatedBookingAmount, "This means 1 label will be printed", "This means %1$s labels will be printed")); var estimatedBookingAmount = Number.parseFloat($("#amount").attr("data-estimated-booking-amount"));
if (estimatedBookingAmount > 0)
{
$("#stock-entry-label-info").text(__n(estimatedBookingAmount, "This means 1 label will be printed", "This means %1$s labels will be printed"));
}
else
{
$("#stock-entry-label-info").text("");
}
} }
else else
{ {
$("#stock-entry-label-info").text(""); $("#stock-entry-label-info").text("");
} }
} });
else }
{
$("#stock-entry-label-info").text("");
}
});

21
public/viewjs/purchase.js
View File

@ -721,14 +721,17 @@ function ScanModeSubmit(singleUnit = true)
} }
} }
$("#stock_label_type, #amount").on("change", function(e) if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_LABEL_PRINTER)
{ {
if ($("#stock_label_type").val() == 2) $("#stock_label_type, #amount").on("change", function(e)
{ {
$("#stock-entry-label-info").text(__n(Number.parseFloat($("#amount").val()), "This means 1 label will be printed", "This means %1$s labels will be printed")); if ($("#stock_label_type").val() == 2)
} {
else $("#stock-entry-label-info").text(__n(Number.parseFloat($("#amount").val()), "This means 1 label will be printed", "This means %1$s labels will be printed"));
{ }
$("#stock-entry-label-info").text(""); else
} {
}); $("#stock-entry-label-info").text("");
}
});
}