@ticketboothapp/booking 1.2.105 → 1.2.107

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ticketboothapp/booking",
-  "version": "1.2.105",
+  "version": "1.2.107",
   "private": false,
   "sideEffects": [
     "**/*.css",

package/src/components/booking/Calendar.tsx

@@ -26,6 +26,7 @@ export interface DateAvailability {
   totalVacancies?: number; // Total available tickets across all availabilities for this date
   startTimes?: string[]; // Array of start times for this date (e.g., ["09:00", "10:00", "14:00"])
   soldOutTimes?: Set<string>; // Set of sold out time strings (e.g., ["09:00", "14:00"])
+  timeVacancies?: Record<string, number>; // Available tickets by start time
   totalDiscountPercent?: number; // Total discount percentage from all negative adjustments (deals + dynamic pricing)
   /** Per-time capacity (admin): vacancies by default; booked/total only when the slot is sold out */
   timeCapacityMap?: Record<string, { booked: number; total: number; vacancies: number }>;
@@ -301,7 +302,11 @@ const DateCell = memo(function DateCell({
                     )}>
                       {availability.startTimes.slice(0, 3).map((time) => {
                         const isTimeSoldOut = availability.soldOutTimes?.has(time) || false;
-                        const isLowAvailability = !isTimeSoldOut && availability.totalVacancies !== undefined && availability.totalVacancies < 5;
+                        const timeVacancies =
+                          availability.timeVacancies?.[time] ??
+                          availability.timeCapacityMap?.[time]?.vacancies;
+                        const isLowAvailability =
+                          !isTimeSoldOut && timeVacancies !== undefined && timeVacancies < 5;
                         const isDailyAvailability = time === '00:00';
                         return (
                           <div
@@ -328,7 +333,11 @@ const DateCell = memo(function DateCell({
                     <div className="flex flex-wrap gap-0.5 justify-center">
                       {availability.startTimes.slice(0, 3).map((time) => {
                         const isTimeSoldOut = availability.soldOutTimes?.has(time) || false;
-                        const isLowAvailability = !isTimeSoldOut && availability.totalVacancies !== undefined && availability.totalVacancies < 5;
+                        const timeVacancies =
+                          availability.timeVacancies?.[time] ??
+                          availability.timeCapacityMap?.[time]?.vacancies;
+                        const isLowAvailability =
+                          !isTimeSoldOut && timeVacancies !== undefined && timeVacancies < 5;
                         const isDailyAvailability = time === '00:00';
                         return (
                           <div
@@ -360,7 +369,7 @@ const DateCell = memo(function DateCell({
                                 <svg className="w-2.5 h-2.5" fill="currentColor" viewBox="0 0 20 20">
                                   <path fillRule="evenodd" d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z" clipRule="evenodd" />
                                 </svg>
-                                <span>{t('calendar.left', { count: availability.totalVacancies ?? 0 })}</span>
+                                <span>{t('calendar.left', { count: timeVacancies ?? 0 })}</span>
                               </div>
                             )}
                           </div>
@@ -868,6 +877,9 @@ export function Calendar({
             )
             .map(([time]) => time)
         );
+        const timeVacancies = Object.fromEntries(
+          Array.from(timeAvailabilityMap.entries()).map(([time, info]) => [time, info.vacancies])
+        );
         
         // Calculate total discount percentage from all negative adjustments
         const dynamicDiscountPercent = calculateTotalDiscountPercent(availabilities, currency) ?? 0;
@@ -882,6 +894,7 @@ export function Calendar({
           totalVacancies,
           startTimes: startTimes.length > 0 ? startTimes : undefined,
           soldOutTimes: soldOutTimes.size > 0 ? soldOutTimes : undefined,
+          timeVacancies: Object.keys(timeVacancies).length > 0 ? timeVacancies : undefined,
           totalDiscountPercent: totalDiscountPercent > 0 ? totalDiscountPercent : undefined,
           timeCapacityMap:
             Object.keys(timeCapacityMapWithVacancies).length > 0 ? timeCapacityMapWithVacancies : undefined,

package/src/components/booking/ChangeBookingFlow.tsx

@@ -93,6 +93,13 @@ import { useBookingHost } from '../../runtime';
 import type { BookingFlowUiOptions } from './booking-flow-ui';
 import type { ChangeBookingFlowProps, ChangeFlowSelectionPreview } from './booking-flow-types';
 import { BOOKING_FLOW_ABANDON_EVENT } from '../../providers/booking-dialog-provider';
+import {
+  filterAvailabilitiesAfterPublicBookingCutoff,
+  isAvailabilityAfterPublicBookingCutoff,
+  isAvailabilityWithinPublicPickupUnknownCutoff,
+  isDateAfterPublicBookingCutoff,
+  parseBookingCutoffDateTime,
+} from '../../lib/booking/booking-cutoffs';
 
 export type { ChangeBookingFlowProps } from './booking-flow-types';
 
@@ -730,6 +737,7 @@ export function ChangeBookingFlow({
   } = useBookingApp();
   const availabilitiesCache = useAvailabilitiesCache();
   const [availabilities, setAvailabilities] = useState<Availability[]>([]);
+  const [bookingCutoffNowMs, setBookingCutoffNowMs] = useState(() => Date.now());
   const [selectedAvailability, setSelectedAvailability] = useState<Availability | null>(null);
   const [selectedReturnOption, setSelectedReturnOption] = useState<ReturnOption | null>(null);
   const [quantities, setQuantities] = useState<Record<string, number>>({});
@@ -859,6 +867,26 @@ export function ChangeBookingFlow({
   const isCustomerSelfServeChange = true;
   const isAdmin = false;
 
+  useEffect(() => {
+    const interval = window.setInterval(() => setBookingCutoffNowMs(Date.now()), 60 * 1000);
+    return () => window.clearInterval(interval);
+  }, []);
+
+  const bookingCutoffNow = useMemo(() => new Date(bookingCutoffNowMs), [bookingCutoffNowMs]);
+  const bookingCutoffMinutes = product.bookingCutoffMinutes ?? null;
+
+  const hidePickupSkipOption = useMemo(
+    () =>
+      selectedAvailability != null &&
+      isAvailabilityWithinPublicPickupUnknownCutoff(selectedAvailability, bookingCutoffNow),
+    [bookingCutoffNow, selectedAvailability],
+  );
+
+  useEffect(() => {
+    if (!hidePickupSkipOption || !pickupLocationSkipped) return;
+    setPickupLocationSkipped(false);
+  }, [hidePickupSkipOption, pickupLocationSkipped]);
+
   useEffect(() => {
     setPartnerAttributionConfirmed(false);
   }, [flowUi?.partnerAttributionSummary, flowUi?.partnerAttributionConfirmLabel]);
@@ -1487,10 +1515,15 @@ export function ChangeBookingFlow({
     }
   }, []);
 
+  const publicVisibleAvailabilities = useMemo(
+    () => filterAvailabilitiesAfterPublicBookingCutoff(availabilities, bookingCutoffNow, bookingCutoffMinutes),
+    [availabilities, bookingCutoffMinutes, bookingCutoffNow],
+  );
+
   // Group availabilities by date (in company timezone) and sort by time
   // Memoized to prevent recalculation on every render
   const availabilitiesByDate = useMemo(() => {
-    const grouped = availabilities.reduce((acc, avail) => {
+    const grouped = publicVisibleAvailabilities.reduce((acc, avail) => {
       // Parse the dateTime and extract the date in company timezone
       const dateTime = parseAvailabilityDateTime(avail.dateTime);
       const dateInCompanyTz = formatInTimeZone(dateTime, companyTimezone, 'yyyy-MM-dd');
@@ -1510,7 +1543,7 @@ export function ChangeBookingFlow({
     });
     
     return sorted;
-  }, [availabilities, companyTimezone]);
+  }, [publicVisibleAvailabilities, companyTimezone]);
 
   const dates = useMemo(() => Object.keys(availabilitiesByDate).sort(), [availabilitiesByDate]);
 
@@ -2010,9 +2043,17 @@ export function ChangeBookingFlow({
       ? 0 
       : (selectedPickupLocation?.pickupTimeOffsetMinutes ?? 0);
     
-    return timesForSelectedDate.map(avail => {
+    return timesForSelectedDate
+      .filter((avail) => {
+        const availabilityTime = parseBookingCutoffDateTime(avail.dateTime);
+        const pickupTime = (offsetMinutes > 0 && selectedPickupLocation)
+          ? new Date(availabilityTime.getTime() + offsetMinutes * 60 * 1000)
+          : availabilityTime;
+        return isDateAfterPublicBookingCutoff(pickupTime, bookingCutoffNow, bookingCutoffMinutes);
+      })
+      .map(avail => {
       // Parse the dateTime (which should already be in company timezone from backend)
-      const availabilityTime = parseISO(avail.dateTime);
+      const availabilityTime = parseBookingCutoffDateTime(avail.dateTime);
       const vacancyCredit = changeFlowSeatCreditForOutboundAvailability(avail);
       const adjustedVacancies = Math.max(0, avail.vacancies ?? 0) + vacancyCredit;
       
@@ -2043,6 +2084,8 @@ export function ChangeBookingFlow({
       };
     });
   }, [
+    bookingCutoffNow,
+    bookingCutoffMinutes,
     selectedDate,
     selectedPickupLocation,
     timesForSelectedDate,
@@ -2052,6 +2095,74 @@ export function ChangeBookingFlow({
     changeFlowSeatCreditForOutboundAvailability,
   ]);
 
+  const isAvailabilityPickupAfterPublicBookingCutoff = useCallback(
+    (availability: Availability, now: Date = bookingCutoffNow): boolean => {
+      const offsetMinutes = pickupLocationSkipped
+        ? 0
+        : (selectedPickupLocation?.pickupTimeOffsetMinutes ?? 0);
+      const availabilityTime = parseBookingCutoffDateTime(availability.dateTime);
+      const pickupTime = (offsetMinutes > 0 && selectedPickupLocation)
+        ? new Date(availabilityTime.getTime() + offsetMinutes * 60 * 1000)
+        : availabilityTime;
+      return isDateAfterPublicBookingCutoff(pickupTime, now, bookingCutoffMinutes);
+    },
+    [
+      bookingCutoffNow,
+      bookingCutoffMinutes,
+      pickupLocationSkipped,
+      selectedPickupLocation,
+    ],
+  );
+
+  const getPickupCutoffEligibleTimesForDate = useCallback(
+    (date: string): Availability[] => {
+      const times = availabilitiesByDate[date] ?? [];
+      return times.filter((avail) =>
+        isAvailabilityPickupAfterPublicBookingCutoff(avail),
+      );
+    },
+    [
+      availabilitiesByDate,
+      isAvailabilityPickupAfterPublicBookingCutoff,
+    ],
+  );
+
+  const isPublicSelectableAvailability = useCallback(
+    (availability: Availability, now: Date = bookingCutoffNow): boolean => {
+      if (!isAvailabilityAfterPublicBookingCutoff(availability, now, bookingCutoffMinutes)) return false;
+      if (!isAvailabilityPickupAfterPublicBookingCutoff(availability, now)) return false;
+      const availabilityDate = formatInTimeZone(
+        parseBookingCutoffDateTime(availability.dateTime),
+        companyTimezone,
+        'yyyy-MM-dd',
+      );
+      const optionId = getAvailabilityOptionId(availability);
+      return getPickupCutoffEligibleTimesForDate(availabilityDate).some(
+        (candidate) =>
+          candidate.dateTime === availability.dateTime &&
+          getAvailabilityOptionId(candidate) === optionId,
+      );
+    },
+    [
+      bookingCutoffMinutes,
+      bookingCutoffNow,
+      companyTimezone,
+      getPickupCutoffEligibleTimesForDate,
+      isAvailabilityPickupAfterPublicBookingCutoff,
+    ],
+  );
+
+  useEffect(() => {
+    if (!selectedAvailability) return;
+    if (!isPublicSelectableAvailability(selectedAvailability)) {
+      setSelectedAvailability(null);
+      setSelectedReturnOption(null);
+    }
+  }, [
+    isPublicSelectableAvailability,
+    selectedAvailability,
+  ]);
+
   // Check if any pickup time has "most popular" tag (memoized for performance)
   const hasAnyMostPopular = useMemo(() => {
     if (pickupTimes.length <= 1) return false;
@@ -3651,6 +3762,12 @@ export function ChangeBookingFlow({
       setChangeQuoteFetchError(null);
       return;
     }
+    if (!isPublicSelectableAvailability(selectedAvailability, new Date())) {
+      setLatestChangeQuote(null);
+      setChangeQuoteLoading(false);
+      setChangeQuoteFetchError(null);
+      return;
+    }
 
     setChangeQuoteLoading(true);
     setChangeQuoteFetchError(null);
@@ -3733,6 +3850,7 @@ export function ChangeBookingFlow({
     totalPrice,
     currency,
     activeOptions,
+    isPublicSelectableAvailability,
     initialValues?.availabilityId,
     initialValues?.returnAvailabilityId,
   ]);
@@ -3741,6 +3859,8 @@ export function ChangeBookingFlow({
   // Change flow after a calendar change: prefer same product option, then closest departure time-of-day.
   useEffect(() => {
     if (selectedDate && timesForSelectedDate.length > 0 && !selectedAvailability) {
+      const selectableTimesForDate = getPickupCutoffEligibleTimesForDate(selectedDate);
+      if (selectableTimesForDate.length === 0) return;
       // Change flow on the booking's calendar day: pickup must come from resolveInitialAvailabilityFromBooking
       // (availabilityId / productOptionId / wall time). If we run "most popular" here too, both effects fire in
       // the same commit, this still sees selectedAvailability === null, and overwrites the correct slot.
@@ -3762,7 +3882,7 @@ export function ChangeBookingFlow({
       const anchor = changeFlowOutboundAnchorRef.current;
       if (anchor) {
         const matched = pickOutboundMatchingPreviousSelection(
-          timesForSelectedDate,
+          selectableTimesForDate,
           anchor,
           companyTimezone,
           optionsMap
@@ -3777,9 +3897,9 @@ export function ChangeBookingFlow({
 
       const mostPopularOption = activeOptions.find(opt => opt.mostPopular);
       const candidate = mostPopularOption
-        ? timesForSelectedDate.find(avail => getAvailabilityOptionId(avail) === mostPopularOption.optionId && avail.vacancies > 0)
+        ? selectableTimesForDate.find(avail => getAvailabilityOptionId(avail) === mostPopularOption.optionId && avail.vacancies > 0)
         : null;
-      const fallback = timesForSelectedDate.find(avail => avail.vacancies > 0);
+      const fallback = selectableTimesForDate.find(avail => avail.vacancies > 0);
       const toSelect = candidate ?? fallback;
       if (toSelect) {
         setSelectedAvailability(toSelect);
@@ -3793,6 +3913,7 @@ export function ChangeBookingFlow({
     selectedAvailability,
     initialValues?.dateTime,
     companyTimezone,
+    getPickupCutoffEligibleTimesForDate,
   ]);
 
   // Currency change does NOT trigger a refetch. Backend returns per-currency data (priceByCurrency,
@@ -3963,7 +4084,7 @@ export function ChangeBookingFlow({
     // Match Calendar: first day where at least one departure can fit the party (self-serve change),
     // else first day with any inventory; admin fallback unchanged.
     const firstWithInventory = dates.find((d) => {
-      const rows = availabilitiesByDate[d] ?? [];
+      const rows = getPickupCutoffEligibleTimesForDate(d);
       if (rows.length === 0) return false;
       if (isAdmin) return rows.some((a) => (a.vacancies ?? 0) > 0);
       if (
@@ -3998,7 +4119,7 @@ export function ChangeBookingFlow({
     initialValues?.dateTime,
     selectedDate,
     dates,
-    availabilitiesByDate,
+    getPickupCutoffEligibleTimesForDate,
     isAdmin,
     isCustomerSelfServeChange,
     changeFlowInitialTicketCount,
@@ -4032,6 +4153,7 @@ export function ChangeBookingFlow({
   ]);
 
   const handleTimeSelect = (availability: Availability) => {
+    if (!isPublicSelectableAvailability(availability, new Date())) return;
     setSelectedAvailability(availability);
     setSelectedReturnOption(null); // Clear return selection when changing start time
     setError('');
@@ -4174,6 +4296,12 @@ export function ChangeBookingFlow({
       setError(t('booking.selectTimeAndTickets'));
       return;
     }
+    if (!isPublicSelectableAvailability(selectedAvailability, new Date())) {
+      setSelectedAvailability(null);
+      setSelectedReturnOption(null);
+      setError('This departure is no longer available online because it starts too soon. Please choose a later time.');
+      return;
+    }
     if (missingRequiredReturnSelection) {
       setError('Removing return option in self-serve is not available. Please contact support.');
       return;
@@ -4203,7 +4331,12 @@ export function ChangeBookingFlow({
       }
 
     // Allow checkout if pickup location is selected OR if user chose "I don't know"
-    if (product.pickupLocations && product.pickupLocations.length > 0 && !pickupLocationId && !pickupLocationSkipped) {
+    if (
+      product.pickupLocations &&
+      product.pickupLocations.length > 0 &&
+      !pickupLocationId &&
+      (!pickupLocationSkipped || hidePickupSkipOption)
+    ) {
       setError(t('booking.selectPickupLocation'));
       return;
     }
@@ -4613,12 +4746,12 @@ export function ChangeBookingFlow({
       )}
       {isPartialLaunch ? null : (
       <div className="booking-calendar-section">
-      {loadingAvailabilities && availabilities.length === 0 ? (
+      {loadingAvailabilities && publicVisibleAvailabilities.length === 0 ? (
         <div className="flex flex-col items-center justify-center py-12 gap-4">
           <div className="booking-loading-spinner" aria-hidden />
           <div className="text-stone-600">{t('booking.loadingTimes')}</div>
         </div>
-      ) : availabilities.length === 0 ? (
+      ) : publicVisibleAvailabilities.length === 0 ? (
         <div className="text-center py-8 text-stone-500">
           {t('booking.noAvailability')}
         </div>
@@ -4841,6 +4974,7 @@ export function ChangeBookingFlow({
                 pickupLocationSkipped={pickupLocationSkipped}
                 selectedPickupLocation={selectedPickupLocation}
                 highlightedPickupLocationIds={highlightedPickupLocationIds}
+                hidePickupSkipOption={hidePickupSkipOption}
                 onLocationSelect={(locationId) => {
                   setPickupLocationId(locationId);
                   setError('');
@@ -4851,6 +4985,7 @@ export function ChangeBookingFlow({
                   }
                 }}
                 onSkip={() => {
+                  if (hidePickupSkipOption) return;
                   setPickupLocationSkipped(true);
                   setPickupLocationId(null);
                   setError('');

package/src/components/booking/CheckoutForm.tsx

@@ -55,6 +55,7 @@ interface CheckoutFormProps {
   pickupLocationSkipped: boolean;
   selectedPickupLocation: PickupLocation | null | undefined;
   highlightedPickupLocationIds?: string[];
+  hidePickupSkipOption?: boolean;
   onLocationSelect: (locationId: string | null, customLocation?: unknown) => void;
   onSkip: () => void;
   onChangePickup: () => void;
@@ -119,6 +120,7 @@ export function CheckoutForm({
   pickupLocationSkipped,
   selectedPickupLocation,
   highlightedPickupLocationIds,
+  hidePickupSkipOption = false,
   onLocationSelect,
   onSkip,
   onChangePickup,
@@ -335,6 +337,7 @@ export function CheckoutForm({
                   isSkipped={pickupLocationSkipped}
                   destinations={destinations}
                   highlightedPickupLocationIds={highlightedPickupLocationIds}
+                  hideSkipOption={hidePickupSkipOption}
                   onLocationSelect={onLocationSelect}
                   onSkip={onSkip}
                 />

package/src/components/booking/NewBookingFlow.tsx

@@ -73,6 +73,13 @@ import type { BookingFlowUiOptions } from './booking-flow-ui';
 import type { NewBookingFlowProps } from './booking-flow-types';
 import { BOOKING_FLOW_ABANDON_EVENT } from '../../providers/booking-dialog-provider';
 import { optionalCheckoutContactFields } from '../../lib/booking/checkout-contact';
+import {
+  filterAvailabilitiesAfterPublicBookingCutoff,
+  isAvailabilityAfterPublicBookingCutoff,
+  isAvailabilityWithinPublicPickupUnknownCutoff,
+  isDateAfterPublicBookingCutoff,
+  parseBookingCutoffDateTime,
+} from '../../lib/booking/booking-cutoffs';
 
 function formatTicketLineItemsForSummary(lines: Array<{ category: string; qty: number }>): string {
   const labels: Record<string, string> = {
@@ -458,6 +465,7 @@ export function NewBookingFlow({
   const availabilitiesCache = useAvailabilitiesCache();
   const isAdmin = permissions.viewerRole === 'admin';
   const [availabilities, setAvailabilities] = useState<Availability[]>([]);
+  const [bookingCutoffNowMs, setBookingCutoffNowMs] = useState(() => Date.now());
   const [selectedAvailability, setSelectedAvailability] = useState<Availability | null>(null);
   const [selectedReturnOption, setSelectedReturnOption] = useState<ReturnOption | null>(null);
   const [quantities, setQuantities] = useState<Record<string, number>>({});
@@ -620,6 +628,28 @@ export function NewBookingFlow({
     return map;
   }, [activeOptions]);
 
+  useEffect(() => {
+    if (isAdmin) return;
+    const interval = window.setInterval(() => setBookingCutoffNowMs(Date.now()), 60 * 1000);
+    return () => window.clearInterval(interval);
+  }, [isAdmin]);
+
+  const bookingCutoffNow = useMemo(() => new Date(bookingCutoffNowMs), [bookingCutoffNowMs]);
+  const bookingCutoffMinutes = product.bookingCutoffMinutes ?? null;
+
+  const hidePickupSkipOption = useMemo(
+    () =>
+      !isAdmin &&
+      selectedAvailability != null &&
+      isAvailabilityWithinPublicPickupUnknownCutoff(selectedAvailability, bookingCutoffNow),
+    [bookingCutoffNow, isAdmin, selectedAvailability],
+  );
+
+  useEffect(() => {
+    if (!hidePickupSkipOption || !pickupLocationSkipped) return;
+    setPickupLocationSkipped(false);
+  }, [hidePickupSkipOption, pickupLocationSkipped]);
+
   // Fire view_item when product is first displayed
   const hasFiredViewItem = useRef(false);
   useEffect(() => {
@@ -1212,10 +1242,18 @@ export function NewBookingFlow({
     }
   }, []);
 
+  const publicVisibleAvailabilities = useMemo(
+    () =>
+      isAdmin
+        ? availabilities
+        : filterAvailabilitiesAfterPublicBookingCutoff(availabilities, bookingCutoffNow, bookingCutoffMinutes),
+    [availabilities, bookingCutoffMinutes, bookingCutoffNow, isAdmin],
+  );
+
   // Group availabilities by date (in company timezone) and sort by time
   // Memoized to prevent recalculation on every render
   const availabilitiesByDate = useMemo(() => {
-    const grouped = availabilities.reduce((acc, avail) => {
+    const grouped = publicVisibleAvailabilities.reduce((acc, avail) => {
       // Parse the dateTime and extract the date in company timezone
       const dateTime = parseAvailabilityDateTime(avail.dateTime);
       const dateInCompanyTz = formatInTimeZone(dateTime, companyTimezone, 'yyyy-MM-dd');
@@ -1235,7 +1273,7 @@ export function NewBookingFlow({
     });
     
     return sorted;
-  }, [availabilities, companyTimezone]);
+  }, [publicVisibleAvailabilities, companyTimezone]);
 
   const dates = useMemo(() => Object.keys(availabilitiesByDate).sort(), [availabilitiesByDate]);
 
@@ -1638,9 +1676,18 @@ export function NewBookingFlow({
       ? 0 
       : (selectedPickupLocation?.pickupTimeOffsetMinutes ?? 0);
     
-    return timesForSelectedDate.map(avail => {
+    return timesForSelectedDate
+      .filter((avail) => {
+        if (isAdmin) return true;
+        const availabilityTime = parseBookingCutoffDateTime(avail.dateTime);
+        const pickupTime = (offsetMinutes > 0 && selectedPickupLocation)
+          ? new Date(availabilityTime.getTime() + offsetMinutes * 60 * 1000)
+          : availabilityTime;
+        return isDateAfterPublicBookingCutoff(pickupTime, bookingCutoffNow, bookingCutoffMinutes);
+      })
+      .map(avail => {
       // Parse the dateTime (which should already be in company timezone from backend)
-      const availabilityTime = parseISO(avail.dateTime);
+      const availabilityTime = parseBookingCutoffDateTime(avail.dateTime);
       const adjustedVacancies = Math.max(0, avail.vacancies ?? 0);
       
       // Only apply offset if it's set and > 0 and location is selected
@@ -1670,6 +1717,9 @@ export function NewBookingFlow({
       };
     });
   }, [
+    bookingCutoffNow,
+    bookingCutoffMinutes,
+    isAdmin,
     selectedDate,
     selectedPickupLocation,
     timesForSelectedDate,
@@ -1678,6 +1728,86 @@ export function NewBookingFlow({
     companyTimezone,
   ]);
 
+  const isAvailabilityPickupAfterPublicBookingCutoff = useCallback(
+    (availability: Availability, now: Date = bookingCutoffNow): boolean => {
+      if (isAdmin) return true;
+      const offsetMinutes = pickupLocationSkipped
+        ? 0
+        : (selectedPickupLocation?.pickupTimeOffsetMinutes ?? 0);
+      const availabilityTime = parseBookingCutoffDateTime(availability.dateTime);
+      const pickupTime = (offsetMinutes > 0 && selectedPickupLocation)
+        ? new Date(availabilityTime.getTime() + offsetMinutes * 60 * 1000)
+        : availabilityTime;
+      return isDateAfterPublicBookingCutoff(pickupTime, now, bookingCutoffMinutes);
+    },
+    [
+      bookingCutoffNow,
+      bookingCutoffMinutes,
+      isAdmin,
+      pickupLocationSkipped,
+      selectedPickupLocation,
+    ],
+  );
+
+  const getPickupCutoffEligibleTimesForDate = useCallback(
+    (date: string): Availability[] => {
+      const times = availabilitiesByDate[date] ?? [];
+      return times.filter((avail) =>
+        isAvailabilityPickupAfterPublicBookingCutoff(avail),
+      );
+    },
+    [
+      availabilitiesByDate,
+      isAvailabilityPickupAfterPublicBookingCutoff,
+    ],
+  );
+
+  const isPublicSelectableAvailability = useCallback(
+    (availability: Availability, now: Date = bookingCutoffNow): boolean => {
+      if (isAdmin) return true;
+      if (!isAvailabilityAfterPublicBookingCutoff(availability, now, bookingCutoffMinutes)) return false;
+      if (!isAvailabilityPickupAfterPublicBookingCutoff(availability, now)) return false;
+      const availabilityDate = formatInTimeZone(
+        parseBookingCutoffDateTime(availability.dateTime),
+        companyTimezone,
+        'yyyy-MM-dd',
+      );
+      const optionId = getAvailabilityOptionId(availability);
+      return getPickupCutoffEligibleTimesForDate(availabilityDate).some(
+        (candidate) =>
+          candidate.dateTime === availability.dateTime &&
+          getAvailabilityOptionId(candidate) === optionId,
+      );
+    },
+    [
+      bookingCutoffMinutes,
+      bookingCutoffNow,
+      companyTimezone,
+      getPickupCutoffEligibleTimesForDate,
+      isAvailabilityPickupAfterPublicBookingCutoff,
+      isAdmin,
+    ],
+  );
+
+  useEffect(() => {
+    if (isAdmin || !selectedAvailability) return;
+    const optionId = getAvailabilityOptionId(selectedAvailability);
+    const stillSelectable = getPickupCutoffEligibleTimesForDate(selectedDate).some(
+      (avail) =>
+        avail.dateTime === selectedAvailability.dateTime &&
+        getAvailabilityOptionId(avail) === optionId,
+    );
+    if (!stillSelectable) {
+      setSelectedAvailability(null);
+      setSelectedReturnOption(null);
+    }
+  }, [
+    getPickupCutoffEligibleTimesForDate,
+    isAdmin,
+    selectedAvailability,
+    selectedDate,
+  ]);
+
   // Check if any pickup time has "most popular" tag (memoized for performance)
   const hasAnyMostPopular = useMemo(() => {
     if (pickupTimes.length <= 1) return false;
@@ -2374,7 +2504,10 @@ export function NewBookingFlow({
     ) {
       return;
     }
-    const toSelect = pickDefaultAvailabilityForTimes(timesForSelectedDate, activeOptions);
+    const toSelect = pickDefaultAvailabilityForTimes(
+      getPickupCutoffEligibleTimesForDate(selectedDate),
+      activeOptions,
+    );
     if (toSelect) {
       setSelectedAvailability(toSelect);
       setError('');
@@ -2385,6 +2518,7 @@ export function NewBookingFlow({
     activeOptions,
     selectedAvailability,
     companyTimezone,
+    getPickupCutoffEligibleTimesForDate,
   ]);
 
   // Currency change does NOT trigger a refetch. Backend returns per-currency data (priceByCurrency,
@@ -2496,7 +2630,7 @@ export function NewBookingFlow({
     // Match Calendar: a day is "sold out" only when every slot has 0 vacancies.
     // Always auto-pick the first day with any inventory; only if the whole range is empty and user is admin, fall back to the first day.
     const firstWithInventory = dates.find((d) =>
-      (availabilitiesByDate[d] ?? []).some((a) => (a.vacancies ?? 0) > 0),
+      getPickupCutoffEligibleTimesForDate(d).some((a) => (a.vacancies ?? 0) > 0),
     );
     const first = firstWithInventory ?? (isAdmin && dates[0] ? dates[0] : undefined);
     if (!first) return;
@@ -2505,7 +2639,7 @@ export function NewBookingFlow({
     setSelectedDate(first);
     setSelectedReturnOption(null);
     setSelectedAvailability(
-      pickDefaultAvailabilityForTimes(availabilitiesByDate[first] ?? [], activeOptions),
+      pickDefaultAvailabilityForTimes(getPickupCutoffEligibleTimesForDate(first), activeOptions),
     );
     if (!suppressCalendarDateScroll) {
       setTimeout(() => {
@@ -2523,7 +2657,7 @@ export function NewBookingFlow({
     initialValues?.dateTime,
     selectedDate,
     dates,
-    availabilitiesByDate,
+    getPickupCutoffEligibleTimesForDate,
     isAdmin,
     useWindowScroll,
     contentRef,
@@ -2554,6 +2688,7 @@ export function NewBookingFlow({
   ]);
 
   const handleTimeSelect = (availability: Availability) => {
+    if (!isPublicSelectableAvailability(availability, new Date())) return;
     setSelectedAvailability(availability);
     setSelectedReturnOption(null); // Clear return selection when changing start time
     setError('');
@@ -2731,6 +2866,12 @@ export function NewBookingFlow({
       setError(t('booking.selectTimeAndTickets'));
       return;
     }
+    if (!isPublicSelectableAvailability(selectedAvailability, new Date())) {
+      setSelectedAvailability(null);
+      setSelectedReturnOption(null);
+      setError('This departure is no longer available online because it starts too soon. Please choose a later time.');
+      return;
+    }
     if (!email) {
       setError(t('booking.enterEmail') || 'Please enter your email address');
       return;
@@ -2752,7 +2893,12 @@ export function NewBookingFlow({
     }
 
     // Allow checkout if pickup location is selected OR if user chose "I don't know"
-    if (product.pickupLocations && product.pickupLocations.length > 0 && !pickupLocationId && !pickupLocationSkipped) {
+    if (
+      product.pickupLocations &&
+      product.pickupLocations.length > 0 &&
+      !pickupLocationId &&
+      (!pickupLocationSkipped || hidePickupSkipOption)
+    ) {
       setError(t('booking.selectPickupLocation'));
       return;
     }
@@ -2804,8 +2950,9 @@ export function NewBookingFlow({
         const outboundVacancies = outbound?.vacancies ?? null;
         const returnVacancies = findMergedReturnVacancies(outbound, selectedReturnOption);
         if (
-          (outboundVacancies != null && outboundVacancies < totalQuantity) ||
-          (selectedReturnOption && returnVacancies != null && returnVacancies < totalQuantity)
+          !isAdmin &&
+          ((outboundVacancies != null && outboundVacancies < totalQuantity) ||
+            (selectedReturnOption && returnVacancies != null && returnVacancies < totalQuantity))
         ) {
           setError(
             describeStandardTourCapacityConflictMessage({
@@ -3408,12 +3555,12 @@ export function NewBookingFlow({
 
       {isPartialLaunch ? null : (
       <div className="booking-calendar-section">
-      {loadingAvailabilities && availabilities.length === 0 ? (
+      {loadingAvailabilities && publicVisibleAvailabilities.length === 0 ? (
         <div className="flex flex-col items-center justify-center py-12 gap-4">
           <div className="booking-loading-spinner" aria-hidden />
           <div className="text-stone-600">{t('booking.loadingTimes')}</div>
         </div>
-      ) : availabilities.length === 0 ? (
+      ) : publicVisibleAvailabilities.length === 0 ? (
         <div className="text-center py-8 text-stone-500">
           {t('booking.noAvailability')}
         </div>
@@ -3444,7 +3591,7 @@ export function NewBookingFlow({
                       setSelectedReturnOption(null);
                       setSelectedAvailability(
                         pickDefaultAvailabilityForTimes(
-                          availabilitiesByDate[date] ?? [],
+                          getPickupCutoffEligibleTimesForDate(date),
                           activeOptions,
                         ),
                       );
@@ -3714,6 +3861,7 @@ export function NewBookingFlow({
                 pickupLocationSkipped={pickupLocationSkipped}
                 selectedPickupLocation={selectedPickupLocation}
                 highlightedPickupLocationIds={highlightedPickupLocationIds}
+                hidePickupSkipOption={hidePickupSkipOption}
                 onLocationSelect={(locationId) => {
                   setPickupLocationId(locationId);
                   setError('');
@@ -3724,6 +3872,7 @@ export function NewBookingFlow({
                   }
                 }}
                 onSkip={() => {
+                  if (hidePickupSkipOption) return;
                   setPickupLocationSkipped(true);
                   setPickupLocationId(null);
                   setError('');

package/src/components/booking/PrivateShuttleBookingFlow.tsx

@@ -930,6 +930,10 @@ export function PrivateShuttleBookingFlow({
       const avail = dateAvailabilities.find(
         (a) => getPrivateShuttleAvailabilityOptionId(a) === optionId
       );
+      const profileOptionPrice = resourcePriceByOption?.[optionId]?.[currency];
+      if (profileOptionPrice != null) {
+        return applyResourceAdjustments(profileOptionPrice, avail, currency);
+      }
       if (currency === 'CAD' && opt?.pricing?.['RESOURCE'] != null) {
         return applyResourceAdjustments(opt.pricing['RESOURCE'], avail, currency);
       }
@@ -939,8 +943,6 @@ export function PrivateShuttleBookingFlow({
           return resourceRate.priceByCurrency[currency];
         if (currency === 'CAD' && resourceRate?.price != null) return resourceRate.price;
       }
-      if (resourcePriceByOption?.[optionId]?.[currency] != null)
-        return resourcePriceByOption[optionId][currency];
       if (currency === 'CAD' && resourcePriceByCurrency?.[currency] != null) return resourcePriceByCurrency[currency];
       return opt?.pricing?.['RESOURCE'] ?? 0;
     },
@@ -955,6 +957,12 @@ export function PrivateShuttleBookingFlow({
   );
 
   const resourcePrice = useMemo(() => {
+    const selectedProfileOptionPrice = selectedOption
+      ? resourcePriceByOption?.[selectedOption]?.[currency]
+      : undefined;
+    if (selectedProfileOptionPrice != null) {
+      return applyResourceAdjustments(selectedProfileOptionPrice, selectedAvailability, currency);
+    }
     if (currency === 'CAD' && selectedOptionConfig?.pricing?.['RESOURCE'] != null)
       return applyResourceAdjustments(
         selectedOptionConfig.pricing['RESOURCE'],
@@ -970,8 +978,6 @@ export function PrivateShuttleBookingFlow({
         if (fromRate != null) return fromRate;
       }
     }
-    if (selectedOption && resourcePriceByOption?.[selectedOption]?.[currency] != null)
-      return resourcePriceByOption[selectedOption][currency];
     if (currency === 'CAD' && resourcePriceByCurrency?.[currency] != null) return resourcePriceByCurrency[currency];
     if (precomputedPrices?.['RESOURCE']?.[currency] != null)
       return precomputedPrices['RESOURCE'][currency];
@@ -1544,7 +1550,7 @@ export function PrivateShuttleBookingFlow({
         const passengersToReserve = isSpecialRequest
           ? Math.min(passengerCount, maxVacancies)
           : passengerCount;
-        if (slot?.vacancies != null && (slot.vacancies === 0 || slot.vacancies < passengersToReserve)) {
+        if (!isAdmin && slot?.vacancies != null && (slot.vacancies === 0 || slot.vacancies < passengersToReserve)) {
           setError(
             describePrivateShuttleCapacityConflictMessage({
               passengersRequested: passengerCount,

package/src/lib/booking/booking-cutoffs.ts

@@ -0,0 +1,67 @@
+import { parseISO } from 'date-fns';
+
+export const PUBLIC_BOOKING_CUTOFF_MINUTES = 60;
+export const PUBLIC_PICKUP_UNKNOWN_CUTOFF_HOURS = 48;
+
+const PUBLIC_PICKUP_UNKNOWN_CUTOFF_MS = PUBLIC_PICKUP_UNKNOWN_CUTOFF_HOURS * 60 * 60 * 1000;
+
+export function parseBookingCutoffDateTime(value: string): Date {
+  // Match availability parsing elsewhere: API values without an offset are treated as UTC.
+  const hasExplicitOffset = /(?:Z|[+-]\d{2}:?\d{2})$/i.test(value);
+  return parseISO(hasExplicitOffset ? value : `${value}Z`);
+}
+
+export function resolvePublicBookingCutoffMinutes(cutoffMinutes?: number | null): number {
+  if (cutoffMinutes == null) return PUBLIC_BOOKING_CUTOFF_MINUTES;
+  const parsed = Number(cutoffMinutes);
+  if (!Number.isFinite(parsed) || parsed < 0) return PUBLIC_BOOKING_CUTOFF_MINUTES;
+  return parsed;
+}
+
+export function publicBookingCutoffDate(
+  now: Date = new Date(),
+  cutoffMinutes?: number | null,
+): Date {
+  return new Date(now.getTime() + resolvePublicBookingCutoffMinutes(cutoffMinutes) * 60 * 1000);
+}
+
+export function isDateAfterPublicBookingCutoff(
+  date: Date,
+  now: Date = new Date(),
+  cutoffMinutes?: number | null,
+): boolean {
+  return date.getTime() >= publicBookingCutoffDate(now, cutoffMinutes).getTime();
+}
+
+export function isAvailabilityAfterPublicBookingCutoff(
+  availability: { dateTime: string },
+  now: Date = new Date(),
+  cutoffMinutes?: number | null,
+): boolean {
+  return isDateAfterPublicBookingCutoff(
+    parseBookingCutoffDateTime(availability.dateTime),
+    now,
+    cutoffMinutes,
+  );
+}
+
+export function filterAvailabilitiesAfterPublicBookingCutoff<T extends { dateTime: string }>(
+  availabilities: T[],
+  now: Date = new Date(),
+  cutoffMinutes?: number | null,
+): T[] {
+  return availabilities.filter((availability) =>
+    isAvailabilityAfterPublicBookingCutoff(availability, now, cutoffMinutes),
+  );
+}
+
+export function isDateWithinPublicPickupUnknownCutoff(date: Date, now: Date = new Date()): boolean {
+  return date.getTime() <= now.getTime() + PUBLIC_PICKUP_UNKNOWN_CUTOFF_MS;
+}
+
+export function isAvailabilityWithinPublicPickupUnknownCutoff(
+  availability: { dateTime: string },
+  now: Date = new Date(),
+): boolean {
+  return isDateWithinPublicPickupUnknownCutoff(parseBookingCutoffDateTime(availability.dateTime), now);
+}

package/src/lib/booking-api.ts

@@ -772,6 +772,8 @@ export interface Product {
   description: string | null;
   status: string;
   mostPopular?: boolean;
+  /** Optional public booking cutoff override in minutes. Defaults to 60 when omitted. */
+  bookingCutoffMinutes?: number | null;
   productType?: 'STANDARD' | 'PRIVATE_SHUTTLE';
   options: ProductOption[];
   minPriceByCurrency?: Record<string, number>;

package/src/lib/booking-types.ts

@@ -18,6 +18,8 @@ export interface ProductDisplayConfig {
 export interface ProductConfig {
   productId: string;
   optionIds: string[];
+  /** Optional public booking cutoff override in minutes. Defaults to 60 when omitted. */
+  bookingCutoffMinutes?: number | null;
   /** STANDARD or PRIVATE_SHUTTLE - affects availability date format. Default STANDARD. */
   productType?: 'STANDARD' | 'PRIVATE_SHUTTLE';
   /**

package/src/lib/products-config.ts

@@ -60,6 +60,7 @@ export function buildMinimalProductFromConfig(
     name: config.display.shortName,
     description: null,
     status: 'ACTIVE',
+    bookingCutoffMinutes: config.bookingCutoffMinutes ?? null,
     productType: config.productType ?? 'STANDARD',
     options,
   };