kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 04:12:59 +00:00
Code Issues Projects Releases Wiki Activity

Implement "Free products" (closes #426)

Browse Source
This commit is contained in:
Bernd Bestel
2020-01-26 20:01:30 +01:00
parent f09ba08549
commit 71a57c9dcb
12 changed files with 154 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
public/viewjs/transfer.js
View File

@@ -1,4 +1,4 @@
$('#save-transfer-button').on('click', function(e)
$('#save-transfer-button').on('click', function (e)
{
e.preventDefault();
@@ -71,10 +71,18 @@
}
else
{
Grocy.FrontendHelpers.EndUiBusy("transfer-form");
toastr.success(successMessage);
if (parseInt($("#location_id_from option:selected").attr("data-is-freezer")) === 0 && parseInt($("#location_id_to option:selected").attr("data-is-freezer")) === 1) // Frozen
{
toastr.info('<span>' + __t("Frozen") + "</span> <i class='fas fa-snowflake'></i>");
}
if (parseInt($("#location_id_from option:selected").attr("data-is-freezer")) === 1 && parseInt($("#location_id_to option:selected").attr("data-is-freezer")) === 0) // Thawed
{
toastr.info('<span>' + __t("Thawed") + "</span> <i class='fas fa-fire-alt'></i>");
}
$("#specific_stock_entry").find("option").remove().end().append("<option></option>");
$("#specific_stock_entry").attr("disabled", "");
$("#specific_stock_entry").removeAttr("required");
@@ -151,7 +159,8 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
{
$("#location_id_from").append($("<option>", {
value: stockLocation.location_id,
text: stockLocation.location_name + " (" + __t("Default location") + ")"
text: stockLocation.location_name + " (" + __t("Default location") + ")",
"data-is-freezer": stockLocation.location_is_freezer
}));
$("#location_id_from").val(productDetails.location.id);
$("#location_id_from").trigger('change');
@@ -161,7 +170,8 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
{
$("#location_id_from").append($("<option>", {
value: stockLocation.location_id,
text: stockLocation.location_name
text: stockLocation.location_name,
"data-is-freezer": stockLocation.location_is_freezer
}));
}