From 5bed30899a26183f6aaa838c541d489dd99226a8 Mon Sep 17 00:00:00 2001
From: Ayush Gupta <agupta17@godaddy.com>
Date: Wed, 24 Jun 2026 19:20:58 +0530
Subject: [PATCH] fix(react): pickup date range respects lead time (prep_time)

The date picker now accounts for leadTime when computing selectable dates:
- Start date = first available date after current_time + leadTime
- End date = start date + pickupWindowInDays (advance window from first bookable date)
- Fixed double-zoning bug in findFirstAvailablePickupDate that caused
  incorrect day-of-week on non-UTC machines (returns raw date instead
  of pre-zoned date so generatePickupTimeSlots can zone it once)
- Use formatTz for pickupDate form values to ensure store timezone is used

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../checkout/pickup/local-pickup.tsx          | 52 ++++++++++++++-----
 .../utils/generate-pickup-time-slots.ts       |  4 +-
 2 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/packages/react/src/components/checkout/pickup/local-pickup.tsx b/packages/react/src/components/checkout/pickup/local-pickup.tsx
index a46f2e75..6e553126 100644
--- a/packages/react/src/components/checkout/pickup/local-pickup.tsx
+++ b/packages/react/src/components/checkout/pickup/local-pickup.tsx
@@ -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;
       }
@@ -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 })
+          );
         }
       }
     },
@@ -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) => {
@@ -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
         }
       }
@@ -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;
diff --git a/packages/react/src/components/checkout/pickup/utils/generate-pickup-time-slots.ts b/packages/react/src/components/checkout/pickup/utils/generate-pickup-time-slots.ts
index 8ddb199f..8e71dec1 100644
--- a/packages/react/src/components/checkout/pickup/utils/generate-pickup-time-slots.ts
+++ b/packages/react/src/components/checkout/pickup/utils/generate-pickup-time-slots.ts
@@ -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;
@@ -124,7 +124,7 @@ export function findFirstAvailablePickupDate(
       });
 
       if (dayCloseTime > earliestPickup) {
-        return zonedDate;
+        return dateToCheck;
       }
     }