kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-10-15 01:37:13 +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

25
public/viewjs/inventory.js
View File

@@ -77,7 +77,7 @@ $('#save-inventory-button').on('click', function(e)
);
}
if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_LABEL_PRINTER && Number.parseFloat($("#display_amount").attr("data-estimated-booking-amount")) > 0)
if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_LABEL_PRINTER && Number.parseFloat($("#amount").attr("data-estimated-booking-amount")) > 0)
{
if (Grocy.Webhooks.labelprinter !== undefined)
{
@@ -265,6 +265,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_LABEL_PRINTER)
{
$("#stock_label_type").val(productDetails.product.default_stock_label_type);
$("#stock_label_type").trigger("change");
}
if (document.getElementById("product_id").getAttribute("barcode") != "null")
@@ -440,7 +441,7 @@ $('#display_amount').on('keyup', function(e)
}
var estimatedBookingAmount = (newAmount - productStockAmount - containerWeight).toFixed(Grocy.UserSettings.stock_decimal_places_amounts);
$("#display_amount").attr("data-estimated-booking-amount", estimatedBookingAmount);
$("#amount").attr("data-estimated-booking-amount", estimatedBookingAmount).trigger("change");
estimatedBookingAmount = Math.abs(estimatedBookingAmount);
$('#inventory-change-info').removeClass('d-none');
@@ -521,3 +522,23 @@ function UndoStockTransaction(transactionId)
};
$("#display_amount").attr("min", "0");
$("#stock_label_type, #amount").on("change", function(e)
{
if ($("#stock_label_type").val() == 2)
{
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
{
$("#stock-entry-label-info").text("");
}
});