Skip to content

fix(react): pickup date range respects lead time (prep_time) #1393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
agupta17-godaddy wants to merge 1 commit into
base: main
Choose a base branch
from
+41 −15
Open

fix(react): pickup date range respects lead time (prep_time) #1393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 39 additions & 13 deletions packages/react/src/components/checkout/pickup/local-pickup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,11 @@ export function LocalPickupForm({

if (locationHours.pickupWindowInDays === 0) {
const today = new Date();
const zonedToday = toZonedTime(today, locationHours.timeZone);
setSelectedDate(zonedToday);
form.setValue('pickupDate', format(zonedToday, 'yyyy-MM-dd'));
setSelectedDate(today);
form.setValue(
'pickupDate',
formatTz(today, 'yyyy-MM-dd', { timeZone: locationHours.timeZone })
);
form.setValue('pickupTime', 'ASAP');
return;
}
Expand All @@ -144,7 +146,10 @@ export function LocalPickupForm({
if (date) {
setSelectedDate(date);
if (form.getValues('pickupDate') === '') {
form.setValue('pickupDate', format(date, 'yyyy-MM-dd'));
form.setValue(
'pickupDate',
formatTz(date, 'yyyy-MM-dd', { timeZone: locationHours.timeZone })
);
}
}
},
Expand Down Expand Up @@ -208,9 +213,19 @@ export function LocalPickupForm({
const storeHours = getStoreHours(selectedLocationId);
const locationTimeZone = storeHours?.timeZone;
const today = new Date();
const maxDate = storeHours?.pickupWindowInDays
? addDays(today, storeHours.pickupWindowInDays - 1)
// Earliest selectable date: respects lead time so days that close before
// (now + leadTime) cannot be picked even if they are "today".
const minBookableDate = storeHours
? findFirstAvailablePickupDate(storeHours)
: undefined;
// The pickup advance window is calculated from the first available date
// (i.e. current_time + prep_time), not from today.
const maxDate =
storeHours?.pickupWindowInDays && minBookableDate
? addDays(minBookableDate, storeHours.pickupWindowInDays - 1)
: storeHours?.pickupWindowInDays
? addDays(today, storeHours.pickupWindowInDays - 1)
: undefined;

const isDateBookable = useCallback(
(date: Date) => {
Expand Down Expand Up @@ -297,7 +312,12 @@ export function LocalPickupForm({
format(nextDate, 'yyyy-MM-dd') !== format(selectedDate, 'yyyy-MM-dd')
) {
setSelectedDate(nextDate);
form.setValue('pickupDate', format(nextDate, 'yyyy-MM-dd'));
form.setValue(
'pickupDate',
formatTz(nextDate, 'yyyy-MM-dd', {
timeZone: locationTimeZone,
})
);
return; // re-run effect with the new date
}
}
Expand Down Expand Up @@ -526,17 +546,23 @@ export function LocalPickupForm({
setIsCalendarOpen(false);
}}
disabled={date => {
const todayStart = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate()
);
const dateToCheck = new Date(
date.getFullYear(),
date.getMonth(),
date.getDate()
);
if (dateToCheck < todayStart) return true;
const minDate = minBookableDate
? new Date(
minBookableDate.getFullYear(),
minBookableDate.getMonth(),
minBookableDate.getDate()
)
: new Date(
today.getFullYear(),
today.getMonth(),
today.getDate()
);
if (dateToCheck < minDate) return true;
if (!isDateBookable(date)) return true;
if (maxDate) {
return date > maxDate;
Expand Down
4 changes: 2 additions & 2 deletions packages/react/src/components/checkout/pickup/utils/generate-pickup-time-slots.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export function findFirstAvailablePickupDate(
): Date | undefined {
if (storeHours.pickupWindowInDays === 0) {
// ASAP-only mode — always today
return toZonedTime(now ?? new Date(), storeHours.timeZone);
return now ?? new Date();
}

const leadTimeMinutes = storeHours.leadTime || FALLBACK_LEAD_TIME;
Expand All @@ -124,7 +124,7 @@ export function findFirstAvailablePickupDate(
});

if (dayCloseTime > earliestPickup) {
return zonedDate;
return dateToCheck;
}
}

Expand Down