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

Squashed commit

Browse Source 
Fixed recipe ingredient costs/calories calculation when having different QUs and when only_check_single_unit_in_stock is set (fixes #2529)
Added a new column "Product picture" on /products (closes #2640)
Fixed partly opening stock entries stock_id handling (fixes #2391)
This commit is contained in:
Bernd Bestel
2025-01-13 17:41:08 +01:00
parent e7cea3d949
commit f4d5f21832
13 changed files with 188 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
public/viewjs/consume.js
View File

@@ -226,7 +226,6 @@ var sumValue = 0;
$("#location_id").on('change', function(e)
{
var locationId = $(e.target).val();
$("#specific_stock_entry").find("option").remove().end().append("<option></option>");
if ($("#use_specific_stock_entry").is(":checked"))
{
@@ -293,21 +292,19 @@ function OnLocationChange(locationId, stockId)
if (stockEntry.location_id == locationId)
{
if ($("#specific_stock_entry option[value='" + stockEntry.stock_id + "']").length == 0)
var noteTxt = "";
if (stockEntry.note)
{
var noteTxt = "";
if (stockEntry.note)
{
noteTxt = " " + stockEntry.note;
}
$("#specific_stock_entry").append($("<option>", {
value: stockEntry.stock_id,
amount: stockEntry.amount,
text: __t("Amount: %1$s; Due on %2$s; Bought on %3$s", stockEntry.amount, moment(stockEntry.best_before_date).format("YYYY-MM-DD"), moment(stockEntry.purchased_date).format("YYYY-MM-DD")) + "; " + openTxt + noteTxt
}));
noteTxt = " " + stockEntry.note;
}
$("#specific_stock_entry").append($("<option>", {
"value": stockEntry.stock_id,
"text": __t("Amount: %1$s; Due on %2$s; Bought on %3$s", stockEntry.amount, moment(stockEntry.best_before_date).format("YYYY-MM-DD"), moment(stockEntry.purchased_date).format("YYYY-MM-DD")) + "; " + openTxt + noteTxt,
"data-amount": stockEntry.amount,
"data-id": stockEntry.id
}));
sumValue = sumValue + (stockEntry.amount || 0);
if (stockEntry.stock_id == stockId)
@@ -585,7 +582,7 @@ $("#specific_stock_entry").on("change", function(e)
}
else
{
$("#display_amount").attr("max", Number.parseFloat($('option:selected', this).attr('amount')).toFixed(Grocy.UserSettings.stock_decimal_places_amounts));
$("#display_amount").attr("max", Number.parseFloat($('option:selected', this).attr('data-amount')).toFixed(Grocy.UserSettings.stock_decimal_places_amounts));
}
});
@@ -603,7 +600,6 @@ $("#use_specific_stock_entry").on("change", function()
$("#specific_stock_entry").attr("disabled", "");
$("#specific_stock_entry").removeAttr("required");
$("#specific_stock_entry").val("");
$("#location_id").trigger('change');
}
Grocy.FrontendHelpers.ValidateForm("consume-form");

1
public/viewjs/products.js
View File

@@ -5,6 +5,7 @@
{ 'searchable': false, "targets": 0 },
{ 'visible': false, 'targets': 7 },
{ 'visible': false, 'targets': 8 },
{ 'visible': false, 'targets': 9 },
{ "type": "html-num-fmt", "targets": 3 }
].concat($.fn.dataTable.defaults.columnDefs)
});

5
public/viewjs/purchase.js
View File

@@ -748,4 +748,7 @@ if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_LABEL_PRINTER)
});
}
Grocy.Components.UserfieldsForm.Load();
if (Grocy.Components.UserfieldsForm)
{
Grocy.Components.UserfieldsForm.Load();
}