@ticketboothapp/booking 1.2.165 → 1.2.167

package/src/components/booking/PrivateShuttleBookingFlow.tsx

@@ -32,9 +32,11 @@ import { PrivateShuttleStartTimeSection } from './PrivateShuttleStartTimeSection
 import {
   getPrivateShuttleAvailabilityOptionId,
   privateShuttleBookingCutoffMessage,
+  privateShuttleStartDateTime,
   privateShuttleStartTimeAllowed,
   resolveHydratedPrivateShuttleAvailability,
 } from './private-shuttle-availability';
+import { formatInTimeZone } from 'date-fns-tz';
 import { usePrivateShuttleAvailability } from './use-private-shuttle-availability';
 import type {
   ProviderDashboardChangeBookingPayload,
@@ -285,13 +287,35 @@ export function PrivateShuttleBookingFlow({
       setAddOns([]);
       return;
     }
+    const dateTimeForAddOns =
+      selectedDate && selectedStartTime
+        ? formatInTimeZone(
+            privateShuttleStartDateTime(selectedDate, selectedStartTime, companyTimezone),
+            companyTimezone,
+            "yyyy-MM-dd'T'HH:mm:ssXXX",
+          )
+        : selectedDate || undefined;
     getAddOns(product.companyId!, {
       productOptionId: selectedOption,
       preCheckout: true,
+      dateTime: dateTimeForAddOns,
     })
       .then(setAddOns)
       .catch(() => setAddOns([]));
-  }, [selectedOption, product.companyId]);
+  }, [selectedOption, selectedDate, selectedStartTime, product.companyId, companyTimezone]);
+
+  const previousAddOnIdsRef = useRef<Set<string>>(new Set());
+  useEffect(() => {
+    const availableIds = new Set(addOns.map((a) => a.addOnId));
+    const previousIds = previousAddOnIdsRef.current;
+    if (previousIds.size > 0) {
+      setAddOnSelections((prev) => {
+        const next = prev.filter((s) => !previousIds.has(s.addOnId) || availableIds.has(s.addOnId));
+        return next.length === prev.length ? prev : next;
+      });
+    }
+    previousAddOnIdsRef.current = availableIds;
+  }, [addOns]);
 
   useEffect(() => {
     if (!draftItineraryDestinations.includes('emerald_lake')) {

package/src/components/booking/admin-change-payment-choice-runner.ts

@@ -126,6 +126,18 @@ export function buildAdminChangePayNowCheckoutModalData(
   };
 }
 
+export function shouldRestoreAdminChangePaymentChoiceAfterCheckoutClose(
+  isProviderDashboardChange: boolean,
+  isChangeBookingContext: boolean,
+  adminChoiceData: Pick<AdminChangePaymentChoiceData, 'pricingQuoteId'> | null,
+): boolean {
+  return Boolean(
+    isProviderDashboardChange &&
+      isChangeBookingContext &&
+      adminChoiceData?.pricingQuoteId?.trim(),
+  );
+}
+
 export interface ConfirmAdminChangeBookingWithoutPaymentParams {
   adminChoiceData: AdminChangePaymentChoiceData;
   bookingSourceAttribution: Partial<BookingSourceMetadata>;

package/src/components/booking/admin-change-provider-payload.ts

@@ -1,4 +1,9 @@
-import type { Availability, Product, ReturnOption } from '../../lib/booking-api';
+import type {
+  AdminPromoApplicationScope,
+  Availability,
+  Product,
+  ReturnOption,
+} from '../../lib/booking-api';
 import type { ProviderDashboardChangeBookingPayload } from './provider-dashboard-change-booking';
 
 export type AdminChangeBookingItem = { category: string; count: number };
@@ -29,6 +34,7 @@ export interface BuildAdminChangeProviderPayloadParams {
   cancellationPolicyId: string | null;
   initialCancellationPolicyId?: string | null;
   appliedPromoCode: string | null;
+  promoApplicationScope?: AdminPromoApplicationScope;
   newTotalAmount: number;
   providerPricingOverrides: AdminChangeProviderLineOverride[];
   mergedProviderAdditionalAdjustments: AdminChangeProviderAdditionalAdjustment[];
@@ -56,6 +62,7 @@ export function buildAdminChangeProviderPayload({
   cancellationPolicyId,
   initialCancellationPolicyId,
   appliedPromoCode,
+  promoApplicationScope = 'CHANGE_ONLY',
   newTotalAmount,
   providerPricingOverrides,
   mergedProviderAdditionalAdjustments,
@@ -92,6 +99,7 @@ export function buildAdminChangeProviderPayload({
     addOnSelections,
     cancellationPolicyId: cancellationPolicyId ?? initialCancellationPolicyId ?? null,
     promoCode: appliedPromoCode ?? null,
+    promoApplicationScope: appliedPromoCode ? promoApplicationScope : null,
     newTotalAmount,
     additionalHoursCount: null,
     pricingAdjustment:

package/src/components/booking/admin-change-quote-request-key.ts

@@ -1,4 +1,4 @@
-import type { Availability } from '../../lib/booking-api';
+import type { AdminPromoApplicationScope, Availability } from '../../lib/booking-api';
 import { getAvailabilityOptionId } from './change-booking-flow-helpers';
 
 interface AdminChangeQuoteRequestKeyInput {
@@ -12,6 +12,8 @@ interface AdminChangeQuoteRequestKeyInput {
   addOnSelections: Array<{ addOnId: string; variantId?: string; quantity?: number }>;
   adminCustomReceiptLines: unknown[];
   cancellationPolicyId?: string | null;
+  promoCode?: string | null;
+  promoApplicationScope?: AdminPromoApplicationScope | null;
   structuredAdjustments?: unknown[];
   refundDispositionsByOperationId?: Record<string, string>;
   useAdminFeAuthoritativeQuote: boolean;
@@ -36,6 +38,8 @@ export function buildAdminChangeQuoteRequestKey(input: AdminChangeQuoteRequestKe
     addOnSelections: input.addOnSelections,
     adminCustomReceiptLines: input.adminCustomReceiptLines,
     cancellationPolicyId: input.cancellationPolicyId ?? null,
+    promoCode: input.promoCode?.trim().toUpperCase() ?? null,
+    promoApplicationScope: input.promoCode ? (input.promoApplicationScope ?? 'CHANGE_ONLY') : null,
     structuredAdjustments: input.structuredAdjustments ?? [],
     refundDispositionsByOperationId: Object.fromEntries(
       Object.entries(input.refundDispositionsByOperationId ?? {}).sort(([a], [b]) => a.localeCompare(b)),
@@ -44,11 +48,7 @@ export function buildAdminChangeQuoteRequestKey(input: AdminChangeQuoteRequestKe
   });
 }
 
-/**
- * A completed request is reusable only while its authoritative quote is still published.
- * Closing a nested payment dialog can clear transient quote state without changing the
- * selection inputs; in that case the same input key must be eligible for a refetch.
- */
+/** A completed request is reusable only while its quote is still published in UI state. */
 export function canReuseCompletedAdminChangeQuote(
   inputKey: string,
   lastCompletedInputKey: string | null,

package/src/components/booking/admin-change-receipt-lines.ts

@@ -0,0 +1,49 @@
+import type { PriceSummaryLine } from './PriceSummary';
+
+function isSelectedPromoLine(line: PriceSummaryLine, promoCode: string): boolean {
+  if (line.kind !== 'line') return false;
+  const type = String(line.type ?? '').trim().toUpperCase();
+  if (type === 'PROMO_CODE') return true;
+  if (type !== 'DISCOUNT') return false;
+
+  const label = line.label.trim().toUpperCase();
+  return label.startsWith('DISCOUNT ·') ||
+    label.startsWith('PROMO ') ||
+    label.includes(promoCode);
+}
+
+/**
+ * Keep component-level promo allocations in the server quote/ledger while presenting
+ * the selected promo as one customer-facing row in the admin amendment summary.
+ */
+export function collapseAdminPromoLines(
+  lines: PriceSummaryLine[],
+  promoCode: string | null | undefined,
+): PriceSummaryLine[] {
+  const normalizedCode = promoCode?.trim().toUpperCase() ?? '';
+  if (!normalizedCode) return lines;
+
+  const promoIndexes = lines
+    .map((line, index) => isSelectedPromoLine(line, normalizedCode) ? index : -1)
+    .filter((index) => index >= 0);
+  if (promoIndexes.length === 0) return lines;
+
+  const promoIndexSet = new Set(promoIndexes);
+  const firstPromoIndex = promoIndexes[0];
+  const promoAmount = Math.round(promoIndexes.reduce((sum, index) => {
+    const line = lines[index];
+    return sum + (line.kind === 'line' ? line.amount : 0);
+  }, 0) * 100) / 100;
+
+  return lines.flatMap((line, index) => {
+    if (index === firstPromoIndex) {
+      return [{
+        kind: 'line' as const,
+        label: `Promo: ${normalizedCode}`,
+        amount: promoAmount,
+        type: 'PROMO_CODE',
+      }];
+    }
+    return promoIndexSet.has(index) ? [] : [line];
+  });
+}

package/src/components/booking/admin-change-v2-quote-request.ts

@@ -0,0 +1,101 @@
+import type {
+  AdminAmendmentRefundDisposition,
+  AdminPromoApplicationScope,
+  Availability,
+  ChangeBookingQuoteRequest,
+  ChangeBookingQuoteResponse,
+} from '../../lib/booking-api';
+import { quoteAdminChangeBookingV2 } from '../../lib/booking-api';
+import type { Currency } from './CurrencySwitcher';
+import {
+  sliceAndMergeChangeQuoteForUi,
+  type ChangeBookingMergedQuoteState,
+} from './change-booking-quote-state';
+
+export type AdminChangeV2QuoteRequest = ChangeBookingQuoteRequest & {
+  cancellationPolicyId?: string | null;
+  structuredAdjustments?: unknown[];
+};
+
+export interface BuildAdminChangeV2QuoteRequestParams {
+  bookingReference: string;
+  lastName: string;
+  parentProductId: string;
+  optionId: string;
+  selectedAvailability: Availability;
+  pickupLocationId: string | null;
+  returnAvailabilityId: string | null;
+  bookingItems: Array<{ category: string; count: number }>;
+  addOnSelections: Array<{ addOnId: string; variantId?: string; quantity?: number }>;
+  cancellationPolicyId: string | null;
+  promoCode?: string | null;
+  promoApplicationScope?: AdminPromoApplicationScope;
+  structuredAdjustments: unknown[];
+  refundDispositionsByOperationId: Record<string, AdminAmendmentRefundDisposition>;
+  previousPassengerCount: number;
+  previousAvailabilityId: string | null;
+  previousReturnAvailabilityId: string | null;
+}
+
+/**
+ * Canonical server-authoritative provider/admin quote request.
+ * Preview and checkout must use the same endpoint and request shape so checkout cannot
+ * replace a valid Pricing V2 quote with a legacy response that has no quote id.
+ */
+export function buildAdminChangeV2QuoteRequest({
+  bookingReference,
+  lastName,
+  parentProductId,
+  optionId,
+  selectedAvailability,
+  pickupLocationId,
+  returnAvailabilityId,
+  bookingItems,
+  addOnSelections,
+  cancellationPolicyId,
+  promoCode,
+  promoApplicationScope = 'CHANGE_ONLY',
+  structuredAdjustments,
+  refundDispositionsByOperationId,
+  previousPassengerCount,
+  previousAvailabilityId,
+  previousReturnAvailabilityId,
+}: BuildAdminChangeV2QuoteRequestParams): AdminChangeV2QuoteRequest {
+  return {
+    bookingReference: bookingReference.trim(),
+    lastName: lastName.trim(),
+    newProductId: optionId,
+    newParentProductId: parentProductId,
+    newDateTime: selectedAvailability.dateTime,
+    newAvailabilityId: selectedAvailability.availabilityId || null,
+    newPickupLocationId: pickupLocationId || null,
+    newReturnAvailabilityId: returnAvailabilityId,
+    newPassengerCounts: bookingItems,
+    // Admin owns the complete target selection. [] intentionally clears all add-ons.
+    newAddOnSelections: addOnSelections,
+    cancellationPolicyId,
+    promoCode: promoCode?.trim() || null,
+    promoApplicationScope: promoCode?.trim() ? promoApplicationScope : null,
+    structuredAdjustments,
+    ...(Object.keys(refundDispositionsByOperationId).length > 0
+      ? { refundDispositionsByOperationId }
+      : {}),
+    capacitySeatCredit: {
+      enabled: true,
+      previousPassengerCount,
+      previousAvailabilityId,
+      previousReturnAvailabilityId,
+    },
+  };
+}
+
+export async function quoteAdminChangeV2ForUi(
+  request: AdminChangeV2QuoteRequest,
+  fallbackCart: { total: number; subtotal: number; tax: number },
+  currency: Currency,
+  quoteFn: (request: ChangeBookingQuoteRequest) => Promise<ChangeBookingQuoteResponse> =
+    quoteAdminChangeBookingV2,
+): Promise<ChangeBookingMergedQuoteState> {
+  const quote = await quoteFn(request);
+  return sliceAndMergeChangeQuoteForUi(quote, fallbackCart, currency).mergedQuote;
+}

package/src/components/booking/admin-refund-decision-context.ts

@@ -0,0 +1,85 @@
+import type {
+  AdminAmendmentOperationSnapshot,
+  AdminAmendmentRefundDisposition,
+} from '../../lib/booking-api';
+
+export interface AdminRefundDecisionContext {
+  selectionKey: string;
+  operations: AdminAmendmentOperationSnapshot[];
+  allowedByOperationId: Record<string, AdminAmendmentRefundDisposition[]>;
+  removedValueByOperationId: Record<string, number>;
+}
+
+interface MergeAdminRefundDecisionContextParams {
+  current: AdminRefundDecisionContext | null;
+  selectionKey: string;
+  operations: AdminAmendmentOperationSnapshot[];
+  allowedByOperationId: Record<string, AdminAmendmentRefundDisposition[]>;
+  removedValueByOperationId: Record<string, number>;
+}
+
+/**
+ * Refund-decision quote responses are incremental: after one operation is answered,
+ * the server can return only the operations that still need an answer. Keep all of
+ * the operations for the current booking selection so an answered operation does
+ * not disappear from the next request and get requested again.
+ */
+export function mergeAdminRefundDecisionContext({
+  current,
+  selectionKey,
+  operations,
+  allowedByOperationId,
+  removedValueByOperationId,
+}: MergeAdminRefundDecisionContextParams): AdminRefundDecisionContext | null {
+  const sameSelection = current?.selectionKey === selectionKey ? current : null;
+  if (!sameSelection && operations.length === 0) return null;
+
+  const operationsById = new Map<string, AdminAmendmentOperationSnapshot>();
+  for (const operation of sameSelection?.operations ?? []) {
+    operationsById.set(operation.operationId, operation);
+  }
+  for (const operation of operations) {
+    operationsById.set(operation.operationId, operation);
+  }
+
+  const relevantOperationIds = new Set(operationsById.keys());
+  const mergedAllowed = {
+    ...(sameSelection?.allowedByOperationId ?? {}),
+    ...allowedByOperationId,
+  };
+  const mergedRemovedValues = {
+    ...(sameSelection?.removedValueByOperationId ?? {}),
+    ...removedValueByOperationId,
+  };
+
+  return {
+    selectionKey,
+    operations: [...operationsById.values()],
+    allowedByOperationId: Object.fromEntries(
+      Object.entries(mergedAllowed).filter(([operationId]) =>
+        relevantOperationIds.has(operationId),
+      ),
+    ),
+    removedValueByOperationId: Object.fromEntries(
+      Object.entries(mergedRemovedValues).filter(([operationId]) =>
+        relevantOperationIds.has(operationId),
+      ),
+    ),
+  };
+}
+
+export function selectRefundDispositionsForOperations(
+  context: AdminRefundDecisionContext | null,
+  additionalOperations: AdminAmendmentOperationSnapshot[],
+  dispositionsByOperationId: Record<string, AdminAmendmentRefundDisposition>,
+): Record<string, AdminAmendmentRefundDisposition> {
+  const relevantOperationIds = new Set([
+    ...(context?.operations ?? []).map((operation) => operation.operationId),
+    ...additionalOperations.map((operation) => operation.operationId),
+  ]);
+  return Object.fromEntries(
+    Object.entries(dispositionsByOperationId).filter(([operationId]) =>
+      relevantOperationIds.has(operationId),
+    ),
+  );
+}

package/src/components/booking/availability-date-selection.ts

@@ -0,0 +1,16 @@
+import type { Availability } from '../../lib/booking-api';
+
+export function findFirstDateWithBookableAvailability(
+  dates: string[],
+  getRowsForDate: (date: string) => Availability[],
+  isBookable: (availability: Availability) => boolean,
+): string | undefined {
+  return dates.find((date) => getRowsForDate(date).some(isBookable));
+}
+
+export function selectedDateHasVisibleAvailability(
+  selectedDate: string,
+  getRowsForDate: (date: string) => Availability[],
+): boolean {
+  return selectedDate !== '' && getRowsForDate(selectedDate).length > 0;
+}

package/src/components/booking/provider-dashboard-change-booking.ts

@@ -1,5 +1,5 @@
 import type { Currency } from './CurrencySwitcher';
-import type { ItineraryDisplayStep } from '../../lib/booking-api';
+import type { AdminPromoApplicationScope, ItineraryDisplayStep } from '../../lib/booking-api';
 
 export type AdminAmendmentAdjustmentMode =
   | 'FIXED_AMOUNT'
@@ -52,6 +52,7 @@ export type ProviderDashboardChangeBookingPayload = {
   addOnSelections?: Array<{ addOnId: string; variantId?: string; quantity?: number }> | null;
   cancellationPolicyId?: string | null;
   promoCode?: string | null;
+  promoApplicationScope?: AdminPromoApplicationScope | null;
   newTotalAmount?: number;
   additionalHoursCount?: number | null;
   pricingAdjustment?: {

package/src/components/booking/use-standard-booking-availability.ts

@@ -18,7 +18,10 @@ import {
   type Product,
   type ReturnOption,
 } from '../../lib/booking-api';
-import { filterAvailabilitiesAfterPublicBookingCutoff } from '../../lib/booking/booking-cutoffs';
+import {
+  filterAvailabilitiesAfterCurrentTime,
+  filterAvailabilitiesAfterPublicBookingCutoff,
+} from '../../lib/booking/booking-cutoffs';
 import { shouldReplacePricingConfig } from '../../lib/booking/pricing-config';
 import { useAvailabilitiesCache, buildAvailabilitiesCacheKey } from '../../contexts/AvailabilitiesCacheContext';
 import {
@@ -628,7 +631,7 @@ export function useStandardBookingAvailability({
       });
 
       return isAdmin
-        ? currentOrFutureAvailabilities
+        ? filterAvailabilitiesAfterCurrentTime(currentOrFutureAvailabilities, bookingCutoffNow)
         : filterAvailabilitiesAfterPublicBookingCutoff(
           currentOrFutureAvailabilities,
           bookingCutoffNow,

package/src/components/booking/useAdminChangeCheckoutController.ts

@@ -13,6 +13,7 @@ import {
   type AdminAmendmentOperationSnapshot,
   type AdminAmendmentRefundDisposition,
   type AdminFeAuthoritativeReceipt,
+  type AdminPromoApplicationScope,
   type Availability,
   type ChangeBookingQuotePricingDriftDetail,
   type ChangeBookingQuoteTicketPricingTrace,
@@ -59,6 +60,7 @@ import {
   buildAdminChangePaymentChoiceData,
   buildAdminChangePayNowCheckoutModalData,
   confirmAdminChangeBookingWithoutPayment,
+  shouldRestoreAdminChangePaymentChoiceAfterCheckoutClose,
   type AdminChangeCheckoutModalData,
   type AdminChangePaymentChoiceData,
 } from './admin-change-payment-choice-runner';
@@ -66,6 +68,10 @@ import {
   confirmFreeAdminCustomerChange,
   quoteAdminCustomerChangeForCheckout,
 } from './admin-change-customer-quote-runner';
+import {
+  buildAdminChangeV2QuoteRequest,
+  quoteAdminChangeV2ForUi,
+} from './admin-change-v2-quote-request';
 import {
   reservationHoldHasExpired,
   RESERVATION_HOLD_EXPIRED_MESSAGE,
@@ -135,6 +141,7 @@ export interface UseAdminChangeCheckoutControllerParams {
   onChangeBooking?: ChangeBookingFlowProps['onChangeBooking'];
   cancellationPolicyId: string | null;
   appliedPromoCode: string | null;
+  promoApplicationScope: AdminPromoApplicationScope;
   displayChangeFlowProposedTotalWithEditableLines: number;
   providerPricingOverrides: AdminChangeProviderLineOverride[];
   mergedProviderAdditionalAdjustments: AdminChangeProviderAdditionalAdjustment[];
@@ -236,6 +243,7 @@ export function useAdminChangeCheckoutController({
   onChangeBooking,
   cancellationPolicyId,
   appliedPromoCode,
+  promoApplicationScope,
   displayChangeFlowProposedTotalWithEditableLines,
   providerPricingOverrides,
   mergedProviderAdditionalAdjustments,
@@ -290,8 +298,28 @@ export function useAdminChangeCheckoutController({
     setShowCheckoutModal(false);
     setCheckoutModalData(null);
     setCheckoutClientSecret('');
+  }, []);
+
+  const handleCheckoutClose = useCallback(() => {
+    if (paymentSubmitInFlightRef.current) return;
+    cancelPendingReservation();
     setError('');
-  }, [setError]);
+    // An existing-booking Pay now attempt owns an immutable quote/payment-choice snapshot.
+    // Closing Stripe must return to that choice instead of making the user create a new quote.
+    if (shouldRestoreAdminChangePaymentChoiceAfterCheckoutClose(
+      isProviderDashboardChange,
+      isChangeBookingContext,
+      adminChoiceData,
+    )) {
+      setShowAdminPaymentChoice(true);
+    }
+  }, [
+    adminChoiceData?.pricingQuoteId,
+    cancelPendingReservation,
+    isChangeBookingContext,
+    isProviderDashboardChange,
+    setError,
+  ]);
 
   const cancelPendingReservationBestEffort = useCallback(() => {
     if (paymentSubmitInFlightRef.current) return;
@@ -324,6 +352,7 @@ export function useAdminChangeCheckoutController({
   const buildProviderChangePayload = (
     availabilityProductOptionId: string,
     bookingItems: AdminChangeBookingItem[],
+    authoritativeQuote: AdminChangeLatestQuote | null = latestChangeQuote,
   ): ProviderDashboardChangeBookingPayload | null => {
     return buildAdminChangeProviderPayload({
       selectedAvailability,
@@ -336,13 +365,14 @@ export function useAdminChangeCheckoutController({
       cancellationPolicyId,
       initialCancellationPolicyId: initialValues?.cancellationPolicyId ?? null,
       appliedPromoCode,
+      promoApplicationScope,
       newTotalAmount: displayChangeFlowProposedTotalWithEditableLines,
       providerPricingOverrides,
       mergedProviderAdditionalAdjustments,
       adminStructuredAdjustments,
       refundDispositionsByOperationId,
-      pricingV2QuoteId: latestChangeQuote?.quoteId ?? null,
-      pricingV2QuotedTotal: latestChangeQuote?.quotedTotal ?? latestChangeQuote?.serverDisplay?.total ?? null,
+      pricingV2QuoteId: authoritativeQuote?.quoteId ?? null,
+      pricingV2QuotedTotal: authoritativeQuote?.quotedTotal ?? authoritativeQuote?.serverDisplay?.total ?? null,
       providerApplyAuthoritativeReceipt,
       previousPassengerCount: changeFlowInitialTicketCount,
       previousAvailabilityId: initialValues?.availabilityId ?? null,
@@ -437,8 +467,40 @@ export function useAdminChangeCheckoutController({
       let changeIntentIdForCheckout: string | undefined;
       let changeBookingReferenceForPaidFlow: string | undefined;
       let confirmedChangeAmountDueForCheckout: number | null = null;
+      let authoritativeChangeQuoteForCheckout = latestChangeQuote;
 
-      if (isCustomerSelfServeChange) {
+      if (isProviderDashboardChange && isChangeBookingContext) {
+        const bookingReference = initialValues?.bookingReference?.trim();
+        if (!bookingReference) throw new Error('Missing booking reference.');
+        authoritativeChangeQuoteForCheckout = await quoteAdminChangeV2ForUi(
+          buildAdminChangeV2QuoteRequest({
+            bookingReference,
+            lastName,
+            parentProductId: product.productId,
+            optionId: availabilityProductOptionId,
+            selectedAvailability,
+            pickupLocationId,
+            returnAvailabilityId: selectedReturnOption?.returnAvailabilityId ?? null,
+            bookingItems,
+            addOnSelections,
+            cancellationPolicyId,
+            promoCode: appliedPromoCode,
+            promoApplicationScope,
+            structuredAdjustments: adminStructuredAdjustments,
+            refundDispositionsByOperationId,
+            previousPassengerCount: changeFlowInitialTicketCount,
+            previousAvailabilityId: initialValues?.availabilityId ?? null,
+            previousReturnAvailabilityId: initialValues?.returnAvailabilityId ?? null,
+          }),
+          {
+            total: changeFlowNewBookingTotal,
+            subtotal: effectiveSubtotalForCheckout,
+            tax: effectiveTax,
+          },
+          currency,
+        );
+        setLatestChangeQuote(authoritativeChangeQuoteForCheckout);
+      } else if (isCustomerSelfServeChange) {
         const quoteResult = await quoteAdminCustomerChangeForCheckout({
           bookingReference: initialValues?.bookingReference,
           lastName,
@@ -465,11 +527,18 @@ export function useAdminChangeCheckoutController({
         });
         changeBookingReferenceForPaidFlow = quoteResult.bookingReference;
         setLatestChangeQuote(quoteResult.mergedQuote);
+        // React state is not updated synchronously. Everything in this checkout attempt must
+        // use the quote returned above, not the stale latestChangeQuote render closure.
+        authoritativeChangeQuoteForCheckout = quoteResult.mergedQuote;
         confirmedChangeAmountDueForCheckout = quoteResult.decision.amountDueForCheckout;
 
         if (quoteResult.decision.kind === 'free') {
           if (onChangeBooking) {
-            const providerPayload = buildProviderChangePayload(availabilityProductOptionId, bookingItems);
+            const providerPayload = buildProviderChangePayload(
+              availabilityProductOptionId,
+              bookingItems,
+              authoritativeChangeQuoteForCheckout,
+            );
             if (!providerPayload) {
               setError('No availability selected');
               setLoading(false);
@@ -502,7 +571,7 @@ export function useAdminChangeCheckoutController({
       const itineraryDisplay = computeItineraryDisplayForStorage() ?? computeItineraryDisplay();
       const taxForBreakdown = effectivePromoDiscountAmount > 0 ? effectiveTax : tax;
       const amountDueForCheckout = isProviderDashboardChange && isChangeBookingContext
-        ? Math.max(0, latestChangeQuote?.priceDiff ?? 0)
+        ? Math.max(0, authoritativeChangeQuoteForCheckout?.priceDiff ?? 0)
         : isCustomerSelfServeChange
         ? confirmedChangeAmountDueForCheckout ??
           Math.max(
@@ -547,14 +616,21 @@ export function useAdminChangeCheckoutController({
       // quote-bound Stripe authorization and applies only after that authorization succeeds.
       if (isProviderDashboardChange && isChangeBookingContext) {
         const bookingReference = initialValues?.bookingReference?.trim();
-        const quoteId = latestChangeQuote?.quoteId?.trim();
+        const quoteId = authoritativeChangeQuoteForCheckout?.quoteId?.trim();
         if (!bookingReference) throw new Error('Missing booking reference.');
-        if (!quoteId || latestChangeQuote?.canProceed === false) {
-          throw new Error(latestChangeQuote?.reasonIfBlocked || 'The authoritative change quote is not ready.');
+        if (!quoteId || authoritativeChangeQuoteForCheckout?.canProceed === false) {
+          throw new Error(
+            authoritativeChangeQuoteForCheckout?.reasonIfBlocked ||
+              'The authoritative change quote is not ready.',
+          );
         }
         if (amountDueForCheckout <= 0) {
           if (!onChangeBooking) throw new Error('Provider change handler is unavailable.');
-          const providerPayload = buildProviderChangePayload(availabilityProductOptionId, bookingItems);
+          const providerPayload = buildProviderChangePayload(
+            availabilityProductOptionId,
+            bookingItems,
+            authoritativeChangeQuoteForCheckout,
+          );
           if (!providerPayload) throw new Error('No availability selected');
           await onChangeBooking(providerPayload);
           onSuccess?.({ reservationReference: bookingReference });
@@ -591,7 +667,9 @@ export function useAdminChangeCheckoutController({
             'Pay later to apply the change and add the amount to the booking balance, or collect a new card payment before applying it.',
           confirmWithoutPaymentLabel: 'Pay later',
           previousTotal: originalReceipt?.total,
-          newTotal: latestChangeQuote?.serverDisplay?.total ?? latestChangeQuote?.quotedTotal,
+          newTotal:
+            authoritativeChangeQuoteForCheckout?.serverDisplay?.total ??
+            authoritativeChangeQuoteForCheckout?.quotedTotal,
           finalizeExistingChangeInline: true,
           preferConfirmWithoutPayment: true,
         }));
@@ -941,6 +1019,7 @@ export function useAdminChangeCheckoutController({
     showAdminPaymentChoice,
     adminChoiceData,
     cancelPendingReservation,
+    handleCheckoutClose,
     handleCheckout,
     handleConfirmWithoutPayment,
     handlePayNow,

package/src/components/booking/useAdminChangeQuoteDisplayState.tsx

@@ -326,9 +326,9 @@ export function useAdminChangeQuoteDisplayState({
     productChanged: selectedParentProductChanged,
   });
   const hasChangeSelection =
-    isProviderDashboardChange
+    (isProviderDashboardChange
       ? changeSelectionDetails.hasOperationalChangesFromInitial
-      : changeSelectionDetails.hasChangesFromInitial;
+      : changeSelectionDetails.hasChangesFromInitial) || Boolean(appliedPromoCode);
 
   const {
     providerTotalsPreview,