@ticketboothapp/booking 1.2.166 → 1.2.167

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)),
@@ -43,3 +47,12 @@ export function buildAdminChangeQuoteRequestKey(input: AdminChangeQuoteRequestKe
     useAdminFeAuthoritativeQuote: input.useAdminFeAuthoritativeQuote,
   });
 }
+
+/** A completed request is reusable only while its quote is still published in UI state. */
+export function canReuseCompletedAdminChangeQuote(
+  inputKey: string,
+  lastCompletedInputKey: string | null,
+  hasPublishedQuote: boolean,
+): boolean {
+  return Boolean(inputKey) && lastCompletedInputKey === inputKey && hasPublishedQuote;
+}

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,
@@ -67,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,
@@ -136,6 +141,7 @@ export interface UseAdminChangeCheckoutControllerParams {
   onChangeBooking?: ChangeBookingFlowProps['onChangeBooking'];
   cancellationPolicyId: string | null;
   appliedPromoCode: string | null;
+  promoApplicationScope: AdminPromoApplicationScope;
   displayChangeFlowProposedTotalWithEditableLines: number;
   providerPricingOverrides: AdminChangeProviderLineOverride[];
   mergedProviderAdditionalAdjustments: AdminChangeProviderAdditionalAdjustment[];
@@ -237,6 +243,7 @@ export function useAdminChangeCheckoutController({
   onChangeBooking,
   cancellationPolicyId,
   appliedPromoCode,
+  promoApplicationScope,
   displayChangeFlowProposedTotalWithEditableLines,
   providerPricingOverrides,
   mergedProviderAdditionalAdjustments,
@@ -358,6 +365,7 @@ export function useAdminChangeCheckoutController({
       cancellationPolicyId,
       initialCancellationPolicyId: initialValues?.cancellationPolicyId ?? null,
       appliedPromoCode,
+      promoApplicationScope,
       newTotalAmount: displayChangeFlowProposedTotalWithEditableLines,
       providerPricingOverrides,
       mergedProviderAdditionalAdjustments,
@@ -461,7 +469,38 @@ export function useAdminChangeCheckoutController({
       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,

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,

package/src/components/booking/useAdminChangeQuotePreview.ts

@@ -8,8 +8,8 @@ import {
 } from 'react';
 import {
   quoteChangeBooking,
-  quoteAdminChangeBookingV2,
   type AdminAmendmentRefundDisposition,
+  type AdminPromoApplicationScope,
   type AdminFeAuthoritativeReceipt,
   type Availability,
   type ItineraryDisplayStep,
@@ -27,7 +27,14 @@ import {
 } from './change-booking-flow-helpers';
 import type { Currency } from './CurrencySwitcher';
 import type { AdminChangeLatestQuote } from './useAdminChangeCheckoutController';
-import { buildAdminChangeQuoteRequestKey } from './admin-change-quote-request-key';
+import {
+  buildAdminChangeQuoteRequestKey,
+  canReuseCompletedAdminChangeQuote,
+} from './admin-change-quote-request-key';
+import {
+  buildAdminChangeV2QuoteRequest,
+  quoteAdminChangeV2ForUi,
+} from './admin-change-v2-quote-request';
 import type { ProviderDashboardChangeBookingPayload } from './provider-dashboard-change-booking';
 
 type AddOnSelection = { addOnId: string; variantId?: string; quantity?: number };
@@ -60,6 +67,8 @@ export interface UseAdminChangeQuotePreviewParams {
   quantities: Record<string, number>;
   addOnSelections: AddOnSelection[];
   cancellationPolicyId: string | null;
+  appliedPromoCode: string | null;
+  promoApplicationScope: AdminPromoApplicationScope;
   adminCustomReceiptLines: AdminCustomReceiptLine[];
   adminStructuredAdjustments: NonNullable<ProviderDashboardChangeBookingPayload['structuredAdjustments']>;
   refundDispositionsByOperationId: Record<string, AdminAmendmentRefundDisposition>;
@@ -119,6 +128,8 @@ export function useAdminChangeQuotePreview({
   quantities,
   addOnSelections,
   cancellationPolicyId,
+  appliedPromoCode,
+  promoApplicationScope,
   adminCustomReceiptLines,
   adminStructuredAdjustments,
   refundDispositionsByOperationId,
@@ -167,6 +178,7 @@ export function useAdminChangeQuotePreview({
     latestChangeQuote?.canProceed === false &&
     (latestChangeQuote.refundDecisionOperations?.length ?? 0) === 0;
   const refundDecisionRequired = (latestChangeQuote?.refundDecisionOperations?.length ?? 0) > 0;
+  const hasPublishedChangeQuote = latestChangeQuote !== null;
   const changeQuoteInputsKey = useMemo(() => buildAdminChangeQuoteRequestKey({
     bookingReference: initialValues?.bookingReference,
     lastName,
@@ -178,6 +190,8 @@ export function useAdminChangeQuotePreview({
     addOnSelections,
     adminCustomReceiptLines,
     cancellationPolicyId,
+    promoCode: appliedPromoCode,
+    promoApplicationScope,
     structuredAdjustments: adminStructuredAdjustments,
     refundDispositionsByOperationId,
     useAdminFeAuthoritativeQuote,
@@ -192,6 +206,8 @@ export function useAdminChangeQuotePreview({
     addOnSelections,
     adminCustomReceiptLines,
     cancellationPolicyId,
+    appliedPromoCode,
+    promoApplicationScope,
     adminStructuredAdjustments,
     refundDispositionsByOperationId,
     useAdminFeAuthoritativeQuote,
@@ -208,6 +224,14 @@ export function useAdminChangeQuotePreview({
   const changeCheckoutButtonLabel = (() => {
     if (!hasEffectiveChangeSelection) return undefined;
     if (isProviderDashboardChange) {
+      if (changeQuoteLoading || (!latestChangeQuote && !changeQuoteFetchError)) {
+        const tr = t('booking.updatingPrice');
+        return tr !== 'booking.updatingPrice' ? tr : 'Updating price\u2026';
+      }
+      if (changeQuoteFetchError) {
+        const tr = t('booking.changeBookingRetry');
+        return tr !== 'booking.changeBookingRetry' ? tr : 'Change booking (retry)';
+      }
       if (isChangeQuoteBlocked) {
         const tr = t('booking.changeBookingNotAvailable');
         return tr !== 'booking.changeBookingNotAvailable' ? tr : 'Change not available';
@@ -215,8 +239,8 @@ export function useAdminChangeQuotePreview({
       // Prefer authoritative V2 signed due (charge positive / refund negative). Do not use the
       // FE cart estimate once a server quote exists — receipt total deltas can disagree with
       // floored/settlement amounts (DEFECT-PV2-018 follow-up).
-      const serverDue = latestChangeQuote?.serverPreview?.amountDue;
-      const due = Math.round((serverDue ?? changeFlowClientEstimateDue) * 100) / 100;
+      const serverDue = latestChangeQuote?.serverPreview?.amountDue ?? latestChangeQuote?.priceDiff ?? 0;
+      const due = Math.round(serverDue * 100) / 100;
       return due > 0
         ? `Change booking (${formatCurrencyAmount(due, currency, locale as 'en' | 'fr')})`
         : due < 0
@@ -398,11 +422,15 @@ export function useAdminChangeQuotePreview({
       return;
     }
 
-    if (
-      changeQuoteInputsKey &&
-      (inFlightQuoteInputsKeyRef.current === changeQuoteInputsKey ||
-        lastCompletedQuoteInputsKeyRef.current === changeQuoteInputsKey)
-    ) {
+    if (changeQuoteInputsKey && inFlightQuoteInputsKeyRef.current === changeQuoteInputsKey) {
+      return;
+    }
+
+    if (canReuseCompletedAdminChangeQuote(
+      changeQuoteInputsKey,
+      lastCompletedQuoteInputsKeyRef.current,
+      hasPublishedChangeQuote,
+    )) {
       setChangeQuoteLoading(false);
       return;
     }
@@ -429,44 +457,44 @@ export function useAdminChangeQuotePreview({
           .filter(([, count]) => count > 0)
           .map(([category, count]) => ({ category, count }));
         try {
-          const quoteRequestBase = {
+          const quoteRequestBase = buildAdminChangeV2QuoteRequest({
             bookingReference: bookingReferenceForQuote,
-            lastName: lastName.trim(),
-            newProductId: optionId,
-            newParentProductId: product.productId,
-            newDateTime: selectedAvailability.dateTime,
-            newAvailabilityId: selectedAvailability.availabilityId || null,
-            newPickupLocationId: pickupLocationId || null,
-            newReturnAvailabilityId: selectedReturnOption?.returnAvailabilityId ?? null,
-            newPassengerCounts: bookingItems,
-            // Admin owns the complete target selection. [] intentionally clears all add-ons.
-            newAddOnSelections: addOnSelections,
-            cancellationPolicyId,
+            lastName,
+            parentProductId: product.productId,
+            optionId,
+            selectedAvailability,
+            pickupLocationId,
+            returnAvailabilityId: selectedReturnOption?.returnAvailabilityId ?? null,
+            bookingItems,
+            addOnSelections,
+            cancellationPolicyId: cancellationPolicyId ?? null,
+            promoCode: appliedPromoCode,
+            promoApplicationScope,
             structuredAdjustments: adminStructuredAdjustments,
-            ...(Object.keys(refundDispositionsByOperationId).length > 0
-              ? { refundDispositionsByOperationId }
-              : {}),
-            clientProposedTotal: changeFlowNewBookingTotal,
-            capacitySeatCredit: {
-              enabled: true,
-              previousPassengerCount: changeFlowInitialTicketCount,
-              previousAvailabilityId: initialValues.availabilityId ?? null,
-              previousReturnAvailabilityId: initialValues.returnAvailabilityId ?? null,
-            },
-          };
-          const quote = useAdminFeAuthoritativeQuote
-            ? await quoteAdminChangeBookingV2({
+            refundDispositionsByOperationId,
+            previousPassengerCount: changeFlowInitialTicketCount,
+            previousAvailabilityId: initialValues.availabilityId ?? null,
+            previousReturnAvailabilityId: initialValues.returnAvailabilityId ?? null,
+          });
+          const mergedQuote = useAdminFeAuthoritativeQuote
+            ? await quoteAdminChangeV2ForUi(
+                quoteRequestBase,
+                {
+                  total: changeFlowNewBookingTotal,
+                  subtotal: effectiveSubtotalForCheckout,
+                  tax: effectiveTax,
+                },
+                currency,
+              )
+            : sliceAndMergeChangeQuoteForUi(await quoteChangeBooking({
                 ...quoteRequestBase,
-                // V2 is server-authoritative. Do not bind it to the outbound-only FE estimate.
-                clientProposedTotal: undefined,
-              })
-            : await quoteChangeBooking(quoteRequestBase);
+                clientProposedTotal: changeFlowNewBookingTotal,
+              }), {
+                total: changeFlowNewBookingTotal,
+                subtotal: effectiveSubtotalForCheckout,
+                tax: effectiveTax,
+              }, currency).mergedQuote;
           if (seq !== changeQuoteRequestSeq.current) return;
-          const mergedQuote = sliceAndMergeChangeQuoteForUi(quote, {
-              total: changeFlowNewBookingTotal,
-              subtotal: effectiveSubtotalForCheckout,
-              tax: effectiveTax,
-            }, currency).mergedQuote;
           // Commit the completed identity before publishing its result. This keeps a
           // render caused by setLatestChangeQuote from being interpreted as a new request.
           lastCompletedQuoteInputsKeyRef.current = changeQuoteInputsKey;
@@ -497,6 +525,7 @@ export function useAdminChangeQuotePreview({
     hasChangeSelection,
     missingRequiredReturnSelection,
     changeQuoteInputsKey,
+    hasPublishedChangeQuote,
   ]);
 
   return {