kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-19 03:40:10 +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
2 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/viewjs/inventory.js
View File

@@ -523,8 +523,10 @@ 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)
{ {
$("#stock_label_type, #amount").on("change", function(e)
{
if ($("#stock_label_type").val() == 2) if ($("#stock_label_type").val() == 2)
{ {
var estimatedBookingAmount = Number.parseFloat($("#amount").attr("data-estimated-booking-amount")); var estimatedBookingAmount = Number.parseFloat($("#amount").attr("data-estimated-booking-amount"));
@@ -541,4 +543,5 @@ $("#stock_label_type, #amount").on("change", function(e)
{ {
$("#stock-entry-label-info").text(""); $("#stock-entry-label-info").text("");
} }
}); });
}

7
public/viewjs/purchase.js
View File

@@ -721,8 +721,10 @@ function ScanModeSubmit(singleUnit = true)
} }
} }
$("#stock_label_type, #amount").on("change", function(e) if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_LABEL_PRINTER)
{ {
$("#stock_label_type, #amount").on("change", function(e)
{
if ($("#stock_label_type").val() == 2) if ($("#stock_label_type").val() == 2)
{ {
$("#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(__n(Number.parseFloat($("#amount").val()), "This means 1 label will be printed", "This means %1$s labels will be printed"));
@@ -731,4 +733,5 @@ $("#stock_label_type, #amount").on("change", function(e)
{ {
$("#stock-entry-label-info").text(""); $("#stock-entry-label-info").text("");
} }
}); });
}