Meik/Pickup-Config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aktueller stand

Browse Source
This commit is contained in:
Meik
2026-02-01 17:35:51 +01:00
parent 18891f8525
commit 1b5d5e2ed3
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/pickupScheduler.js
View File

@@ -496,17 +496,8 @@ async function getRegularPickupSchedule(session, storeId) {
}
}
function resolveEffectiveNow(entry, now) {
const startValue = toDateValue(entry?.desiredDateRange?.start || entry?.desiredDate);
if (startValue && startValue > now.getTime()) {
return new Date(startValue);
}
return now;
}
async function getNextPickupCheckTime(session, entry, settings) {
const now = new Date();
const effectiveNow = resolveEffectiveNow(entry, now);
const offsets = (settings.pickupWindowOffsetsMinutes || [])
.map((value) => Number(value))
.filter((value) => Number.isFinite(value))
@@ -522,11 +513,11 @@ async function getNextPickupCheckTime(session, entry, settings) {
return null;
}
const nowParts = getTimeZoneParts(effectiveNow, TIME_ZONE);
const nowParts = getTimeZoneParts(now, TIME_ZONE);
if (nowParts.weekday === null) {
return null;
}
const todayStart = getStartOfDayInTimeZone(effectiveNow, TIME_ZONE);
const todayStart = getStartOfDayInTimeZone(now, TIME_ZONE);
if (!todayStart) {
return null;
}
@@ -554,13 +545,13 @@ async function getNextPickupCheckTime(session, entry, settings) {
let candidate = offsets
.map((offset) => new Date(slotDate.getTime() + offset))
.find((date) => date.getTime() > effectiveNow.getTime());
.find((date) => date.getTime() > now.getTime());
if (!candidate) {
slotDate = addDays(slotDate, 7);
candidate = offsets
.map((offset) => new Date(slotDate.getTime() + offset))
.find((date) => date.getTime() > effectiveNow.getTime());
.find((date) => date.getTime() > now.getTime());
}
if (candidate && (!best || candidate.getTime() < best.getTime())) {