@ticketboothapp/booking 1.2.166 → 1.2.167

package/src/components/booking/useBookingAvailabilityAddOns.ts

@@ -29,6 +29,7 @@ export function useBookingAvailabilityAddOns({
     () => (selectedAvailability ? getAvailabilityOptionId(selectedAvailability) || null : null),
     [selectedAvailability],
   );
+  const availabilityDateTime = selectedAvailability?.dateTime?.trim() || null;
 
   useEffect(() => {
     if (!availabilityProductOptionId || !companyId) {
@@ -41,10 +42,14 @@ export function useBookingAvailabilityAddOns({
       onProductOptionChange?.();
       previousAvailabilityProductOptionIdRef.current = availabilityProductOptionId;
     }
-    getAddOns(companyId, { productOptionId: availabilityProductOptionId, preCheckout: true })
+    getAddOns(companyId, {
+      productOptionId: availabilityProductOptionId,
+      preCheckout: true,
+      dateTime: availabilityDateTime ?? undefined,
+    })
       .then(setAddOns)
       .catch(() => setAddOns([]));
-  }, [availabilityProductOptionId, companyId, onProductOptionChange]);
+  }, [availabilityProductOptionId, availabilityDateTime, companyId, onProductOptionChange]);
 
   return {
     addOns,

package/src/components/booking/useBookingPromoAndQuantityController.ts

@@ -27,6 +27,9 @@ export interface UseBookingPromoAndQuantityControllerParams {
 export interface UseBookingPromoAndQuantityControllerResult {
   handleQuantityChange: (category: string, delta: number) => void;
   handleApplyPromo: () => Promise<void>;
+  handleRemovePromo: () => void;
+  promoCodeError: string;
+  promoCodeValidating: boolean;
 }
 
 export function useBookingPromoAndQuantityController({
@@ -47,8 +50,8 @@ export function useBookingPromoAndQuantityController({
   t,
   setError,
 }: UseBookingPromoAndQuantityControllerParams): UseBookingPromoAndQuantityControllerResult {
-  const [, setPromoCodeError] = useState('');
-  const [, setPromoCodeValidating] = useState(false);
+  const [promoCodeError, setPromoCodeError] = useState('');
+  const [promoCodeValidating, setPromoCodeValidating] = useState(false);
   const promoAppliedSelectionKeyRef = useRef<string | null>(null);
   const promoValidateInFlightRef = useRef(false);
 
@@ -156,8 +159,19 @@ export function useBookingPromoAndQuantityController({
     return () => clearTimeout(timer);
   }, [promoCodeInput, appliedPromoCode, selectedAvailability, totalQuantity]);
 
+  const handleRemovePromo = useCallback(() => {
+    promoAppliedSelectionKeyRef.current = null;
+    setAppliedPromoCode(null);
+    setPromoCodeError('');
+    setPromoCodeValidating(false);
+    clearFetchedAvailabilityRanges();
+  }, [clearFetchedAvailabilityRanges, setAppliedPromoCode]);
+
   return {
     handleQuantityChange,
     handleApplyPromo,
+    handleRemovePromo,
+    promoCodeError,
+    promoCodeValidating,
   };
 }

package/src/components/booking/useChangeBookingAutoSelections.ts

@@ -1,7 +1,11 @@
 'use client';
 
-import { useEffect, useRef, type RefObject } from 'react';
+import { useCallback, useEffect, useRef, type RefObject } from 'react';
 import type { Availability, PickupLocation } from '../../lib/booking-api';
+import {
+  findFirstDateWithBookableAvailability,
+  selectedDateHasVisibleAvailability,
+} from './availability-date-selection';
 
 export interface UseChangeBookingAutoSelectionsOptions {
   autoSelectFirstAvailableDate?: boolean;
@@ -71,6 +75,55 @@ export function useChangeBookingAutoSelections({
   const hasAutoSelectedPartnerDateRef = useRef(false);
   const hasAutoSelectedPartnerPickupRef = useRef(false);
 
+  const isBookableForAutoSelection = useCallback(
+    (availability: Availability): boolean => {
+      if (isAdmin) return (availability.vacancies ?? 0) > 0;
+      if (isCustomerSelfServeChange && changeFlowInitialTicketCount > 0) {
+        return getCalendarEffectiveOutboundVacancies(availability) >= changeFlowInitialTicketCount;
+      }
+      return (availability.vacancies ?? 0) > 0;
+    },
+    [
+      changeFlowInitialTicketCount,
+      getCalendarEffectiveOutboundVacancies,
+      isAdmin,
+      isCustomerSelfServeChange,
+    ],
+  );
+
+  useEffect(() => {
+    if (!autoSelectFirstAvailableDate) return;
+    if (isPartialLaunch) return;
+    if (!selectedDate || dates.length === 0) return;
+    if (selectedDateHasVisibleAvailability(selectedDate, getRowsForDate)) return;
+
+    const first = findFirstDateWithBookableAvailability(
+      dates,
+      getRowsForDate,
+      isBookableForAutoSelection,
+    );
+    if (!first || first === selectedDate) return;
+
+    hasAutoSelectedPartnerDateRef.current = true;
+    setSelectedDate(first);
+    onDateSelect(first);
+    if (!suppressCalendarDateScroll) {
+      scrollAfterCalendarSelection(contentRef, useWindowScroll);
+    }
+  }, [
+    autoSelectFirstAvailableDate,
+    isPartialLaunch,
+    selectedDate,
+    dates,
+    getRowsForDate,
+    isBookableForAutoSelection,
+    setSelectedDate,
+    onDateSelect,
+    suppressCalendarDateScroll,
+    contentRef,
+    useWindowScroll,
+  ]);
+
   useEffect(() => {
     if (!autoSelectFirstAvailableDate) return;
     if (isPartialLaunch) return;
@@ -79,18 +132,11 @@ export function useChangeBookingAutoSelections({
     if (dates.length === 0) return;
     if (hasAutoSelectedPartnerDateRef.current) return;
 
-    const firstWithInventory = dates.find((date) => {
-      const rows = getRowsForDate(date);
-      if (rows.length === 0) return false;
-      if (isAdmin) return rows.some((availability) => (availability.vacancies ?? 0) > 0);
-      if (isCustomerSelfServeChange && changeFlowInitialTicketCount > 0) {
-        return rows.some(
-          (availability) =>
-            getCalendarEffectiveOutboundVacancies(availability) >= changeFlowInitialTicketCount,
-        );
-      }
-      return rows.some((availability) => (availability.vacancies ?? 0) > 0);
-    });
+    const firstWithInventory = findFirstDateWithBookableAvailability(
+      dates,
+      getRowsForDate,
+      isBookableForAutoSelection,
+    );
     const first = firstWithInventory ?? (isAdmin && dates[0] ? dates[0] : undefined);
     if (!first) return;
 
@@ -107,10 +153,7 @@ export function useChangeBookingAutoSelections({
     selectedDate,
     dates,
     getRowsForDate,
-    isAdmin,
-    isCustomerSelfServeChange,
-    changeFlowInitialTicketCount,
-    getCalendarEffectiveOutboundVacancies,
+    isBookableForAutoSelection,
     setSelectedDate,
     onDateSelect,
     suppressCalendarDateScroll,

package/src/components/booking/useStandardBookingAutoSelections.ts

@@ -3,9 +3,14 @@ import { parseISO } from 'date-fns';
 import type { Availability, Product, ReturnOption } from '../../lib/booking-api';
 import {
   availabilityMatchesSelectedDate,
+  findMergedAvailabilityForSelection,
   parseAvailabilityDateTime,
   pickDefaultAvailabilityForTimes,
 } from './standard-booking-availability';
+import {
+  findFirstDateWithBookableAvailability,
+  selectedDateHasVisibleAvailability,
+} from './availability-date-selection';
 
 interface UseStandardBookingAutoSelectionsParams {
   selectedDate: string;
@@ -91,19 +96,22 @@ export function useStandardBookingAutoSelections({
 
   useEffect(() => {
     if (!selectedDate || timesForSelectedDateLength === 0) return;
+    const eligibleTimes = getPickupCutoffEligibleTimesForDate(selectedDate);
     if (
       selectedAvailability &&
-      availabilityMatchesSelectedDate(selectedAvailability, selectedDate, companyTimezone)
+      availabilityMatchesSelectedDate(selectedAvailability, selectedDate, companyTimezone) &&
+      findMergedAvailabilityForSelection(eligibleTimes, selectedAvailability)
     ) {
       return;
     }
-    const toSelect = pickDefaultAvailabilityForTimes(
-      getPickupCutoffEligibleTimesForDate(selectedDate),
-      activeOptions,
-    );
+    const toSelect = pickDefaultAvailabilityForTimes(eligibleTimes, activeOptions);
     if (toSelect) {
       setSelectedAvailability(toSelect);
+      setSelectedReturnOption(null);
       setError('');
+    } else if (selectedAvailability) {
+      setSelectedAvailability(null);
+      setSelectedReturnOption(null);
     }
   }, [
     selectedDate,
@@ -114,9 +122,47 @@ export function useStandardBookingAutoSelections({
     companyTimezone,
     getPickupCutoffEligibleTimesForDate,
     setSelectedAvailability,
+    setSelectedReturnOption,
     setError,
   ]);
 
+  useEffect(() => {
+    if (!autoSelectFirstAvailableDate) return;
+    if (isPartialLaunch) return;
+    if (!selectedDate || dates.length === 0) return;
+    if (selectedDateHasVisibleAvailability(selectedDate, getPickupCutoffEligibleTimesForDate)) return;
+
+    const first = findFirstDateWithBookableAvailability(
+      dates,
+      getPickupCutoffEligibleTimesForDate,
+      (availability) => (availability.vacancies ?? 0) > 0,
+    );
+    if (!first || first === selectedDate) return;
+
+    hasAutoSelectedPartnerDateRef.current = true;
+    setSelectedDate(first);
+    setSelectedReturnOption(null);
+    setSelectedAvailability(
+      pickDefaultAvailabilityForTimes(getPickupCutoffEligibleTimesForDate(first), activeOptions),
+    );
+    if (!suppressCalendarDateScroll) {
+      scrollAfterCalendarSelection(contentRef, useWindowScroll);
+    }
+  }, [
+    autoSelectFirstAvailableDate,
+    isPartialLaunch,
+    selectedDate,
+    dates,
+    getPickupCutoffEligibleTimesForDate,
+    activeOptions,
+    setSelectedAvailability,
+    setSelectedDate,
+    setSelectedReturnOption,
+    suppressCalendarDateScroll,
+    contentRef,
+    useWindowScroll,
+  ]);
+
   useEffect(() => {
     if (!selectedAvailability?.returnOptions?.length || selectedReturnOption) return;
 
@@ -162,8 +208,10 @@ export function useStandardBookingAutoSelections({
     if (dates.length === 0) return;
     if (hasAutoSelectedPartnerDateRef.current) return;
 
-    const firstWithInventory = dates.find((date) =>
-      getPickupCutoffEligibleTimesForDate(date).some((availability) => (availability.vacancies ?? 0) > 0),
+    const firstWithInventory = findFirstDateWithBookableAvailability(
+      dates,
+      getPickupCutoffEligibleTimesForDate,
+      (availability) => (availability.vacancies ?? 0) > 0,
     );
     const first = firstWithInventory ?? (isAdmin && dates[0] ? dates[0] : undefined);
     if (!first) return;

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

@@ -55,6 +55,28 @@ export function filterAvailabilitiesAfterPublicBookingCutoff<T extends { dateTim
   );
 }
 
+/**
+ * Admin surfaces intentionally ignore the public advance-booking cutoff, but an
+ * availability whose actual start time has passed is no longer bookable by the
+ * API. Keep that narrower rule separate so admin and public behavior cannot
+ * accidentally inherit one another's cutoff policy.
+ */
+export function isAvailabilityAfterCurrentTime(
+  availability: { dateTime: string },
+  now: Date = new Date(),
+): boolean {
+  return isAvailabilityAfterPublicBookingCutoff(availability, now, 0);
+}
+
+export function filterAvailabilitiesAfterCurrentTime<T extends { dateTime: string }>(
+  availabilities: T[],
+  now: Date = new Date(),
+): T[] {
+  return availabilities.filter((availability) =>
+    isAvailabilityAfterCurrentTime(availability, now),
+  );
+}
+
 export function isDateWithinPublicPickupUnknownCutoff(date: Date, now: Date = new Date()): boolean {
   return date.getTime() <= now.getTime() + PUBLIC_PICKUP_UNKNOWN_CUTOFF_MS;
 }

package/src/lib/booking/change-booking-server-preview.ts

@@ -4,7 +4,10 @@
  *
  * See `CHANGE_BOOKING_BE_HANDOFF.md` in this package for fields the API should populate.
  */
-import type { ChangeBookingQuoteResponse } from '../booking-api';
+import type {
+  AdminAmendmentOperationSnapshot,
+  ChangeBookingQuoteResponse,
+} from '../booking-api';
 import type { PricingV2QuoteLineSnapshot } from '../booking-api';
 import type { PriceBasisSnapshot } from '../booking-api';
 import type { PriceSummaryLine } from '../../components/booking/PriceSummary';
@@ -207,6 +210,7 @@ export function mapQuoteLineItemsToPriceSummaryLines(
           : type;
       out.push({
         kind: 'ticket',
+        operationId: isPricingV2Line(item) ? item.metadata?.operationId : undefined,
         category,
         qty: qty > 0 ? qty : 1,
         itemTotal: amount,
@@ -228,6 +232,7 @@ export function mapQuoteLineItemsToPriceSummaryLines(
     ) {
       out.push({
         kind: 'ticket',
+        operationId: isPricingV2Line(item) ? item.metadata?.operationId : undefined,
         category: lettersOnly,
         qty,
         itemTotal: amount,
@@ -249,6 +254,64 @@ export function mapQuoteLineItemsToPriceSummaryLines(
   return out;
 }
 
+/** Clarify ticket deltas caused by moving a booking without changing receipt semantics. */
+export function labelAdminAmendmentPriceSummaryLines(
+  lines: PriceSummaryLine[],
+  operations: readonly AdminAmendmentOperationSnapshot[],
+  originalLines: readonly PriceSummaryLine[] = [],
+): PriceSummaryLine[] {
+  const movedServiceOperationIds = new Set(
+    operations
+      .filter((operation) => operation.type.trim().toUpperCase() === 'MOVE_SERVICE')
+      .map((operation) => operation.operationId),
+  );
+  if (movedServiceOperationIds.size === 0) return lines;
+
+  const normalizedTicketCategory = (category: string) => category
+    .replace(/^refund\s*[·:-]\s*/i, '')
+    .replace(/\s*[—-]\s*new date price difference\s*$/i, '')
+    .trim()
+    .toUpperCase();
+
+  return lines.map((line) => {
+    if (
+      line.kind !== 'ticket' ||
+      !line.operationId ||
+      !movedServiceOperationIds.has(line.operationId) ||
+      line.category.toLowerCase().includes('new date price difference')
+    ) {
+      return line;
+    }
+    const originalLine = originalLines.find(
+      (candidate) => candidate.kind === 'ticket' &&
+        normalizedTicketCategory(candidate.category) === normalizedTicketCategory(line.category),
+    );
+    const previousUnitAmount = originalLine?.kind === 'ticket' && originalLine.qty > 0
+      ? roundMoney(originalLine.itemTotal / originalLine.qty)
+      : null;
+    const differenceUnitAmount = line.qty > 0
+      ? roundMoney(line.itemTotal / line.qty)
+      : null;
+    const ticketLabel = normalizedTicketCategory(line.category).toLowerCase();
+    return {
+      ...line,
+      category: `${line.category} — new date price difference`,
+      ...(previousUnitAmount != null && differenceUnitAmount != null
+        ? {
+            unitPriceComparison: {
+              previousLabel: `Existing ${ticketLabel} price`,
+              updatedLabel: `New-date ${ticketLabel} price`,
+              differenceLabel: `Difference per ${ticketLabel}`,
+              previousUnitAmount,
+              updatedUnitAmount: roundMoney(previousUnitAmount + differenceUnitAmount),
+              differenceUnitAmount,
+            },
+          }
+        : {}),
+    };
+  });
+}
+
 function signedAmountDueFromQuote(quote: ChangeBookingQuoteResponse): number {
   const pricingQuote = quote.pricingQuote ?? quote.quote;
   // Prefer explicit settlement fields over balanceDelta. Receipt-total math and balanceDelta
@@ -280,10 +343,17 @@ export function buildChangeBookingServerPreview(
   const paymentCreditTotal = pricingQuote?.paymentCreditTotal ?? quote.paymentCreditTotal;
 
   const rawLines = lineItemsForSummary(quote);
-  const priceSummaryLines =
-    rawLines && rawLines.length > 0
-      ? withPaymentCreditSummaryLine(mapQuoteLineItemsToPriceSummaryLines(rawLines), paymentCreditTotal)
-      : withPaymentCreditSummaryLine([], paymentCreditTotal);
+  const mappedLines = rawLines && rawLines.length > 0
+    ? mapQuoteLineItemsToPriceSummaryLines(rawLines)
+    : [];
+  const priceSummaryLines = withPaymentCreditSummaryLine(
+    labelAdminAmendmentPriceSummaryLines(
+      mappedLines,
+      pricingQuote?.amendment?.operations ?? [],
+      mapQuoteLineItemsToPriceSummaryLines(quote.originalReceipt?.lineItems),
+    ),
+    paymentCreditTotal,
+  );
 
   const completeness: ChangeBookingPreviewCompleteness = priceSummaryLines.length > 0 ? 'full' : 'totals_only';
 

package/src/lib/booking-api.ts

@@ -1102,7 +1102,7 @@ export async function getPromoDiscount(
 
 export async function getAddOns(
   companyId: string,
-  options?: { productOptionId?: string; preCheckout?: boolean }
+  options?: { productOptionId?: string; preCheckout?: boolean; dateTime?: string }
 ): Promise<AddOn[]> {
   const params = new URLSearchParams({ companyId });
   if (options?.productOptionId) {
@@ -1110,6 +1110,7 @@ export async function getAddOns(
     if (po) params.set('productOptionId', po);
   }
   if (options?.preCheckout !== undefined) params.set('preCheckout', String(options.preCheckout));
+  if (options?.dateTime?.trim()) params.set('dateTime', options.dateTime.trim());
   const res = await fetchBookingGetWithRetry(`${API_BASE}/1/add-ons?${params}`);
   if (!res.ok) {
     const err = await res.json();
@@ -1251,6 +1252,8 @@ export type AdminAmendmentRefundDisposition =
   | 'PENDING_REFUND'
   | 'NO_REFUND';
 
+export type AdminPromoApplicationScope = 'CHANGE_ONLY' | 'ENTIRE_BOOKING';
+
 export interface AdminAmendmentOperationSnapshot {
   operationId: string;
   type: string;
@@ -1276,6 +1279,9 @@ export interface ChangeBookingQuoteRequest {
   newReturnAvailabilityId?: string | null;
   newPassengerCounts?: Array<{ category: string; count: number }>;
   newAddOnSelections?: Array<{ addOnId: string; variantId?: string; quantity?: number }>;
+  /** Explicit promo intent for this amendment. Historical booking promos are never implied. */
+  promoCode?: string | null;
+  promoApplicationScope?: AdminPromoApplicationScope | null;
   /** Full new-booking total shown in the UI; server verifies within tolerance then uses this for the session so charge matches screen. */
   clientProposedTotal?: number;
   /**
@@ -1354,6 +1360,7 @@ export interface ChangeBookingQuoteReceipt {
     amount?: number;
     type?: string;
     quantity?: number;
+    priceBasis?: PriceBasisSnapshot | null;
   }>;
 }
 
@@ -1704,6 +1711,7 @@ export function mapAdminChangeBookingQuoteV2Data(
         amount: line.amount ?? undefined,
         type: line.type ?? undefined,
         quantity: line.quantity ?? undefined,
+        priceBasis: line.priceBasis ?? undefined,
       })),
     },
   };
@@ -2239,6 +2247,9 @@ export interface PricingV2QuoteSnapshot {
   bookingReference?: string | null;
   reservationReference?: string | null;
   relatedChangeIntentId?: string | null;
+  amendment?: {
+    operations?: AdminAmendmentOperationSnapshot[] | null;
+  } | null;
   metadata?: Record<string, string> | null;
   [key: string]: unknown;
 }