github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-08 21:46:16 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reworked purchase page default due date handling (fixes #2895)

Browse Source
This commit is contained in:
Bernd Bestel 2026-03-29 13:30:32 +02:00
parent 3137d4b4cf
commit 736cc8c2f6
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 96 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog/82_UNRELEASED_xxxx-xx-xx.md
View File

@ -10,7 +10,7 @@
### Stock ### Stock
- xxx - Fixed that changing the location on the purchase page re-initialized the due date based on product defaults (if any)
### Shopping list ### Shopping list

53
public/viewjs/purchase.js
View File

@ -441,36 +441,65 @@ if (Grocy.Components.ProductPicker !== undefined)
function PrefillBestBeforeDate(product, location) function PrefillBestBeforeDate(product, location)
{ {
if (!Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING)
{
return;
}
if (location == null) if (location == null)
{ {
location = {} location = {}
} }
if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING) var shortcutValue = $("#datetimepicker-shortcut").attr("data-datetimepicker-shortcut-value");
var dueDateCurrent = Grocy.Components.DateTimePicker.GetValue();
var dueDateDefault = null;
var dueDateFreezer = null;
if (product.default_best_before_days != 0)
{ {
var dueDays; dueDateDefault = moment().add(product.default_best_before_days, 'days').format('YYYY-MM-DD');
if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_PRODUCT_FREEZING && BoolVal(location.is_freezer))
if (product.default_best_before_days == -1)
{ {
dueDays = product.default_best_before_days_after_freezing; dueDateDefault = shortcutValue;
} }
else
{
dueDays = product.default_best_before_days;
} }
if (dueDays != 0) if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_PRODUCT_FREEZING && BoolVal(location.is_freezer) && product.default_best_before_days_after_freezing != 0)
{ {
if (dueDays == -1) dueDateFreezer = moment().add(product.default_best_before_days_after_freezing, 'days').format('YYYY-MM-DD');
if (product.default_best_before_days_after_freezing == -1)
{ {
if (!$("#datetimepicker-shortcut").is(":checked")) dueDateFreezer = shortcutValue;
}
}
// Set the default due date when currently no one is set
if (dueDateDefault && !dueDateCurrent)
{
if (!$("#datetimepicker-shortcut").is(":checked") && dueDateDefault == shortcutValue)
{ {
$("#datetimepicker-shortcut").click(); $("#datetimepicker-shortcut").click();
} }
else
{
Grocy.Components.DateTimePicker.SetValue(dueDateDefault);
}
}
// Set the default due date after freezing when currently no one is set or when it was previously set to the default due date
// (so essentially don't overwrite a by the user different entered due date)
if (dueDateFreezer && (!dueDateCurrent || dueDateCurrent == dueDateDefault))
{
if (!$("#datetimepicker-shortcut").is(":checked") && dueDateFreezer == shortcutValue)
{
$("#datetimepicker-shortcut").click();
} }
else else
{ {
Grocy.Components.DateTimePicker.SetValue(moment().add(dueDays, 'days').format('YYYY-MM-DD')); Grocy.Components.DateTimePicker.SetValue(dueDateFreezer);
}
} }
} }
} }