@ticketboothapp/booking 1.2.166 → 1.2.168

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -3,8 +3,11 @@
 import { useState, useEffect, useMemo, useRef, useCallback } from 'react';
 import {
   type AdminAmendmentRefundDisposition,
+  type AdminPromoApplicationScope,
+  type AddOn,
   type Availability,
   type ReturnOption,
+  getAddOns,
 } from '../../lib/booking-api';
 import {
   AdminChangeBookingContent,
@@ -15,15 +18,18 @@ import { CURRENCIES, DEFAULT_CURRENCY, type Currency } from './CurrencySwitcher'
 import { useCompanyTimezone } from '../../contexts/CompanyContext';
 import { useBookingApp } from '../../contexts/BookingAppContext';
 import { useBookingHost } from '../../runtime';
+import { filterAvailabilitiesAfterCurrentTime } from '../../lib/booking/booking-cutoffs';
 import type { ChangeBookingFlowProps } from './booking-flow-types';
 import {
   normalizeAddOnSelections,
+  resolveChangeBookingCancellationPolicyId,
 } from './change-booking-flow-helpers';
 import {
   buildChangeBookingMinimumQuantities,
   isAdminManualOverrideEligibleLine,
   resolveChangeFlowOriginalDate,
   resolveInitialChangeProductOptionId,
+  shouldLockExistingAddOnQuantities,
 } from './admin-change-flow-state-helpers';
 import { useAdminChangeProducts } from './useAdminChangeProducts';
 import {
@@ -40,6 +46,8 @@ import { useAdminChangePriceSummary } from './useAdminChangePriceSummary';
 import { useAdminChangeReceiptDerivation } from './useAdminChangeReceiptDerivation';
 import { useAdminChangeQuotePreview } from './useAdminChangeQuotePreview';
 import { useBookingAvailabilityAddOns } from './useBookingAvailabilityAddOns';
+import { incompatibleAddOnSelections } from './incompatible-add-on-selections';
+import { incompatibleAddOnChangeError } from './change-booking-error-message';
 import { useBookingPromoAndQuantityController } from './useBookingPromoAndQuantityController';
 import { useChangeBookingItineraryUiState } from './useChangeBookingItineraryUiState';
 import { useChangeBookingAutoSelections } from './useChangeBookingAutoSelections';
@@ -48,22 +56,22 @@ import { useChangeBookingAddOnFloorController } from './useChangeBookingAddOnFlo
 import { useChangeBookingReceiptFloorController } from './useChangeBookingReceiptFloorController';
 import { useAdminCustomReceiptLines } from './useAdminCustomReceiptLines';
 import { useAdminChangeQuoteDisplayState } from './useAdminChangeQuoteDisplayState';
-import { useAdminChangePricingDebugPanel } from './useAdminChangePricingDebugPanel';
 import { useAdminChangeOrderSummaryModel } from './useAdminChangeOrderSummaryModel';
 import { useActiveProductOptions } from './useActiveProductOptions';
 import { useSeedPromoCodeInput } from './useSeedPromoCodeInput';
 import { useAdminChangeProductReset } from './useAdminChangeProductReset';
 import { useBookingQuantityCapTrim } from './useBookingQuantityCapTrim';
 import { useBookingViewItemAnalytics } from './useBookingViewItemAnalytics';
+import { AdminChangePromoEditor } from './AdminChangePromoEditor';
 import { buildAdminChangeQuoteRequestKey } from './admin-change-quote-request-key';
 import type { AdminReleaseRefundDisposition } from './admin-refund-disposition';
-
-type AdminRefundDecisionContext = {
-  selectionKey: string;
-  operations: NonNullable<AdminChangeLatestQuote['refundDecisionOperations']>;
-  allowedByOperationId: NonNullable<AdminChangeLatestQuote['allowedRefundDispositionsByOperationId']>;
-  removedValueByOperationId: NonNullable<AdminChangeLatestQuote['removedValueByOperationId']>;
-};
+import {
+  defaultKeepOriginalReturnPriceDispositions,
+  defaultPendingRefundDispositions,
+  mergeAdminRefundDecisionContext,
+  selectRefundDispositionsForOperations,
+  type AdminRefundDecisionContext,
+} from './admin-refund-decision-context';
 
 /**
  * ## Pricing contract (customer self-serve)
@@ -148,6 +156,24 @@ export function AdminChangeBookingFlow({
     isAdmin,
     companyId: env.COMPANY_ID,
   });
+  const [adminAvailabilityNowMs, setAdminAvailabilityNowMs] = useState(() => Date.now());
+
+  useEffect(() => {
+    const interval = window.setInterval(() => setAdminAvailabilityNowMs(Date.now()), 60 * 1000);
+    return () => window.clearInterval(interval);
+  }, []);
+
+  const adminAvailabilityNow = useMemo(
+    () => new Date(adminAvailabilityNowMs),
+    [adminAvailabilityNowMs],
+  );
+  const filterAdminCalendarAvailabilities = useCallback(
+    (rows: Availability[]) =>
+      product.productType === 'PRIVATE_SHUTTLE'
+        ? rows
+        : filterAvailabilitiesAfterCurrentTime(rows, adminAvailabilityNow),
+    [adminAvailabilityNow, product.productType],
+  );
   const [selectedAvailability, setSelectedAvailability] = useState<Availability | null>(null);
   const [selectedReturnOption, setSelectedReturnOption] = useState<ReturnOption | null>(null);
   const [quantities, setQuantities] = useState<Record<string, number>>({});
@@ -156,29 +182,83 @@ export function AdminChangeBookingFlow({
   const [lastName, setLastName] = useState('');
   const [promoCodeInput, setPromoCodeInput] = useState('');
   const [appliedPromoCode, setAppliedPromoCode] = useState<string | null>(null);
+  const [promoApplicationScope, setPromoApplicationScope] =
+    useState<AdminPromoApplicationScope>('CHANGE_ONLY');
   const [pickupLocationId, setPickupLocationId] = useState<string | null>(null);
   const [pickupLocationSkipped, setPickupLocationSkipped] = useState(false);
-  /** Cancellation policy is fixed to the existing booking snapshot — not user-editable in change flow. */
-  const cancellationPolicyId = useMemo(
+  /** The policy remains non-editable, but a family conversion must adopt the target default. */
+  const [cancellationPolicyId, setCancellationPolicyId] = useState<string | null>(
     () => initialValues?.cancellationPolicyId?.trim() ?? null,
-    [initialValues?.cancellationPolicyId],
   );
   /** Add-on selections (lunch, animals, etc.) - filtered by selected product option */
   const [addOnSelections, setAddOnSelections] = useState<Array<{ addOnId: string; variantId?: string; quantity?: number }>>(() =>
     normalizeAddOnSelections(initialValues?.addOnSelections ?? [])
   );
   /** Fetched add-ons for the selected product option */
-  const { addOns, setAddOns } = useBookingAvailabilityAddOns({
+  const {
+    addOns,
+    setAddOns,
+    availabilityProductOptionId,
+    loadedProductOptionId,
+  } = useBookingAvailabilityAddOns({
     selectedAvailability,
     companyId: product.companyId,
   });
-  const {
-    adminCustomReceiptLines,
-    handleAddAdminCustomReceiptLine,
-    handleUpdateAdminCustomReceiptLine,
-    handleRemoveAdminCustomReceiptLine,
-  } = useAdminCustomReceiptLines(selectedChangeProductId);
-
+  const [knownAddOns, setKnownAddOns] = useState<AddOn[]>([]);
+  const mergeKnownAddOns = useCallback((rows: AddOn[]) => {
+    if (rows.length === 0) return;
+    setKnownAddOns((current) => {
+      const merged = new Map(current.map((addOn) => [addOn.addOnId, addOn]));
+      let changed = false;
+      for (const addOn of rows) {
+        if (merged.get(addOn.addOnId) !== addOn) {
+          merged.set(addOn.addOnId, addOn);
+          changed = true;
+        }
+      }
+      return changed ? Array.from(merged.values()) : current;
+    });
+  }, []);
+  useEffect(() => {
+    mergeKnownAddOns(addOns);
+  }, [addOns, mergeKnownAddOns]);
+  useEffect(() => {
+    let cancelled = false;
+    if (!product.companyId) return;
+    getAddOns(product.companyId, {
+      preCheckout: true,
+      dateTime: initialValues?.dateTime?.trim() || undefined,
+    })
+      .then((rows) => {
+        if (!cancelled) mergeKnownAddOns(rows);
+      })
+      .catch(() => {
+        // The selected tour's catalog still renders; the warning keeps a generic fallback.
+      });
+    return () => {
+      cancelled = true;
+    };
+  }, [product.companyId, initialValues?.dateTime, mergeKnownAddOns]);
+  const addOnCatalogLoaded =
+    availabilityProductOptionId != null &&
+    loadedProductOptionId === availabilityProductOptionId;
+  const incompatibleSelections = incompatibleAddOnSelections(
+    addOnSelections,
+    addOns,
+    addOnCatalogLoaded,
+  );
+  const incompatibleAddOnIds = Array.from(
+    new Set(incompatibleSelections.map((selection) => selection.addOnId)),
+  );
+  const hasIncompatibleAddOnSelections = incompatibleAddOnIds.length > 0;
+  const incompatibleAddOnError = hasIncompatibleAddOnSelections
+    ? incompatibleAddOnChangeError(
+        incompatibleAddOnIds.map((addOnId) => (
+          knownAddOns.find((addOn) => addOn.addOnId === addOnId)?.name ?? 'Selected add-on'
+        )),
+        product.name,
+      )
+    : '';
   useEffect(() => {
     if (!pickupLocationId) return;
     const pickupLocations = product.pickupLocations ?? [];
@@ -191,7 +271,7 @@ export function AdminChangeBookingFlow({
   useSeedPromoCodeInput(autoAppliedPromoCode, setPromoCodeInput);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState('');
-  const [termsAccepted, setTermsAccepted] = useState(false);
+  const [termsAccepted, setTermsAccepted] = useState(true);
   const [termsAcceptedAt, setTermsAcceptedAt] = useState<string | null>(null);
   const [partnerAttributionConfirmed, setPartnerAttributionConfirmed] = useState(false);
   /** Admin only: skip sending confirmation at creation (provider dashboard). */
@@ -224,10 +304,11 @@ export function AdminChangeBookingFlow({
    * user picks a different return time — baseline is the first auto-selected return for this outbound.
    */
   const [implicitReturnBaselineId, setImplicitReturnBaselineId] = useState<string | null>(null);
-  /** Any change flow (self-serve or provider): promo from booking is fixed — show read-only, never add new. */
-  const lockedPromoCode = initialValues?.promoCode?.trim()
+  const historicalPromoCode = initialValues?.promoCode?.trim()
     ? initialValues.promoCode.trim().toUpperCase()
     : null;
+  /** Public/self-serve keeps its historical promo locked. Admin amendments require new explicit intent. */
+  const lockedPromoCode = isProviderDashboardChange ? null : historicalPromoCode;
   /** Public self-serve only: cannot reduce tickets below original counts. Provider-dashboard admins may reduce party size. */
   const changeBookingMinimumQuantities = useMemo(
     () =>
@@ -239,6 +320,21 @@ export function AdminChangeBookingFlow({
     [isCustomerSelfServeChange, initialValues?.bookingItems, isAdmin],
   );
   const [latestChangeQuote, setLatestChangeQuote] = useState<AdminChangeLatestQuote | null>(null);
+  const {
+    adminCustomReceiptLines,
+    appliedAdminCustomReceiptLines,
+    adminReverseAdjustmentIds,
+    hasPendingAdminCustomReceiptLineChanges,
+    pendingAdminCustomReceiptLineIds,
+    hasHydratedExistingAdjustments,
+    handleAddAdminCustomReceiptLine,
+    handleUpdateAdminCustomReceiptLine,
+    handleRemoveAdminCustomReceiptLine,
+    handleApplyAdminCustomReceiptLines: handleApplyAdminCustomReceiptLineDrafts,
+  } = useAdminCustomReceiptLines(
+    selectedChangeProductId,
+    latestChangeQuote?.reversibleAdjustments,
+  );
   const [refundDecisionContext, setRefundDecisionContext] = useState<AdminRefundDecisionContext | null>(null);
   const [refundDispositionsByOperationId, setRefundDispositionsByOperationId] = useState<
     Record<string, AdminAmendmentRefundDisposition>
@@ -256,6 +352,12 @@ export function AdminChangeBookingFlow({
       (latestChangeQuote.refundDecisionOperations?.length ?? 0) > 0) &&
     latestChangeQuote.serverDisplay != null;
   const changeQuoteRequestSeq = useRef(0);
+  const handleApplyAdminCustomReceiptLines = useCallback(() => {
+    setLatestChangeQuote(null);
+    setChangeQuoteFetchError(null);
+    setChangeQuoteLoading(true);
+    handleApplyAdminCustomReceiptLineDrafts();
+  }, [handleApplyAdminCustomReceiptLineDrafts]);
   const { activeOptions, activeOptionIdsKey, optionsMap } = useActiveProductOptions(product.options);
 
   const {
@@ -283,13 +385,37 @@ export function AdminChangeBookingFlow({
     appliedPromoCode,
     pricingProfileIdForAvailabilities,
     cancellationPolicyProfileIdForAvailabilities,
+    filterCalendarAvailabilities: filterAdminCalendarAvailabilities,
     resetKey: selectedChangeProductId,
     setQuantities,
     setError,
   });
 
+  useEffect(() => {
+    const policies = pricingConfig?.cancellationPolicies;
+    if (!policies?.length) return;
+    const isProductFamilyConversion =
+      isInitialPrivateShuttleBooking !== (product.productType === 'PRIVATE_SHUTTLE');
+    const resolvedPolicyId = resolveChangeBookingCancellationPolicyId(
+      cancellationPolicyId,
+      policies,
+      currency,
+      isProductFamilyConversion,
+    );
+    if (resolvedPolicyId !== cancellationPolicyId) {
+      setCancellationPolicyId(resolvedPolicyId);
+    }
+  }, [
+    cancellationPolicyId,
+    currency,
+    isInitialPrivateShuttleBooking,
+    pricingConfig?.cancellationPolicies,
+    product.productType,
+  ]);
+
   useAdminChangeProductReset({
     selectedChangeProductId,
+    setQuantities,
     setSelectedAvailability,
     setSelectedReturnOption,
     setAddOns,
@@ -353,6 +479,8 @@ export function AdminChangeBookingFlow({
     timesForSelectedDate,
     companyTimezone,
     changeFlowResolvedInitialProductOptionId,
+    mostPopularProductOptionId:
+      activeOptions.find((option) => option.mostPopular)?.optionId ?? null,
     precomputedPricesByOption,
     currency,
     originalReceiptSubtotal: originalReceipt?.subtotal,
@@ -373,7 +501,12 @@ export function AdminChangeBookingFlow({
     setError,
   });
 
+  const lockExistingAddOnQuantities = shouldLockExistingAddOnQuantities({
+    isCustomerSelfServeChange,
+    isAdmin,
+  });
   const {
+    initialAddOnQtyByKey,
     initialAddOnMinQtyByKey,
     initialAddOnMinTotalByAddOnId,
     updateAddOnSelections,
@@ -381,7 +514,7 @@ export function AdminChangeBookingFlow({
     initialValues,
     originalReceiptLineItems: originalReceipt?.lineItems,
     addOns,
-    isCustomerSelfServeChange,
+    lockExistingAddOnQuantities,
     setAddOnSelections,
   });
 
@@ -507,7 +640,6 @@ export function AdminChangeBookingFlow({
     editableSummaryLineAmountInputs,
     editableSummaryLineLabelInputs,
     editableSummaryPreSubtotalDelta,
-    editableSummaryPreSubtotalDebugRows,
     handleEditableLineAmountInputChange,
     handleEditableLineAmountInputBlur,
     handleEditableLineAmountReset,
@@ -535,7 +667,7 @@ export function AdminChangeBookingFlow({
     originalAddOnSelections: initialValues?.addOnSelections ?? null,
     originalProductOptionId: initialValues?.productOptionId ?? null,
     addOns,
-    adminCustomReceiptLines,
+    adminCustomReceiptLines: appliedAdminCustomReceiptLines,
     quantities,
     flowUi,
     isProviderDashboardChange,
@@ -573,8 +705,6 @@ export function AdminChangeBookingFlow({
     unchangedReceiptAnchor,
     showChangeFlowManualPriceLines,
     showAdminCustomLineEditor,
-    displayedChangeAmountsRaw,
-    displayLayerUsesExternalPricing,
     displayChangeFlowTax,
     displayChangeFlowProposedTotal,
     displayChangeFlowProposedTotalWithEditableLines,
@@ -604,7 +734,7 @@ export function AdminChangeBookingFlow({
     pickupLocationId,
     quantities,
     addOnSelections,
-    initialAddOnMinQtyByKey,
+    initialAddOnQtyByKey,
     changeFlowResolvedInitialProductOptionId,
     selectedParentProductChanged,
     isProviderDashboardChange,
@@ -613,7 +743,8 @@ export function AdminChangeBookingFlow({
     providerQuotedLines,
     editableSummaryPreSubtotalDelta,
     adminCustomAdjustmentTotal,
-    adminCustomReceiptLines,
+    adminCustomReceiptLines: appliedAdminCustomReceiptLines,
+    adminReverseAdjustmentIds,
     isManualOverrideEligibleLine,
     isAdmin,
     useAdminFeAuthoritativeQuote,
@@ -651,37 +782,6 @@ export function AdminChangeBookingFlow({
     editableSummaryPreSubtotalDelta,
   });
 
-  const changeFlowAdminPricingDebugPanel = useAdminChangePricingDebugPanel({
-    isAdmin,
-    hasSelectedAvailability: selectedAvailability != null,
-    totalQuantity,
-    useAdminFeAuthoritativeQuote,
-    currency,
-    locale,
-    originalReceipt,
-    isCustomerSelfServeChange,
-    latestChangeQuote,
-    changeQuoteFetchError,
-    displayLayerUsesExternalPricing,
-    selfServePricingConfirmed,
-    changeQuoteLoading,
-    effectiveSubtotal,
-    adminCustomAdjustmentTotal,
-    editableSummaryPreSubtotalDebugRows,
-    effectiveSubtotalForCheckout,
-    effectiveTax,
-    effectivePromoDiscountAmount,
-    totalPrice,
-    changeFlowNewBookingTotal,
-    displayedChangeAmountsRaw,
-    editableSummaryPreSubtotalDelta,
-    displayChangeFlowProposedTotal,
-    displayChangeFlowProposedTotalWithEditableLines,
-    adminFeAuthoritativeReceipt,
-    changeFlowClientEstimateDue,
-    changeFlowAmountDue,
-  });
-
   const refundDecisionSelectionKey = useMemo(() => buildAdminChangeQuoteRequestKey({
     bookingReference: initialValues?.bookingReference,
     lastName,
@@ -692,8 +792,11 @@ export function AdminChangeBookingFlow({
     quantities,
     addOnSelections,
     cancellationPolicyId,
-    adminCustomReceiptLines,
+    promoCode: appliedPromoCode,
+    promoApplicationScope,
+    adminCustomReceiptLines: appliedAdminCustomReceiptLines,
     structuredAdjustments: adminStructuredAdjustments,
+    reverseAdjustmentIds: adminReverseAdjustmentIds,
     useAdminFeAuthoritativeQuote,
   }), [
     initialValues?.bookingReference,
@@ -705,8 +808,11 @@ export function AdminChangeBookingFlow({
     quantities,
     addOnSelections,
     cancellationPolicyId,
-    adminCustomReceiptLines,
+    appliedPromoCode,
+    promoApplicationScope,
+    appliedAdminCustomReceiptLines,
     adminStructuredAdjustments,
+    adminReverseAdjustmentIds,
     useAdminFeAuthoritativeQuote,
   ]);
   const responseRefundDecisionOperations = latestChangeQuote?.refundDecisionOperations ?? [];
@@ -714,41 +820,51 @@ export function AdminChangeBookingFlow({
     latestChangeQuote?.returnPriceTreatmentOperations ?? [];
   useEffect(() => {
     if (responseRefundDecisionOperations.length === 0) return;
-    setRefundDecisionContext({
+    setRefundDecisionContext((current) => mergeAdminRefundDecisionContext({
+      current,
       selectionKey: refundDecisionSelectionKey,
       operations: responseRefundDecisionOperations,
       allowedByOperationId: latestChangeQuote?.allowedRefundDispositionsByOperationId ?? {},
       removedValueByOperationId: latestChangeQuote?.removedValueByOperationId ?? {},
-    });
+    }));
   }, [
     refundDecisionSelectionKey,
     responseRefundDecisionOperations,
     latestChangeQuote?.allowedRefundDispositionsByOperationId,
     latestChangeQuote?.removedValueByOperationId,
   ]);
-  const activeRefundDecisionContext = responseRefundDecisionOperations.length > 0
-    ? {
-        selectionKey: refundDecisionSelectionKey,
-        operations: responseRefundDecisionOperations,
-        allowedByOperationId: latestChangeQuote?.allowedRefundDispositionsByOperationId ?? {},
-        removedValueByOperationId: latestChangeQuote?.removedValueByOperationId ?? {},
-      }
-    : refundDecisionContext?.selectionKey === refundDecisionSelectionKey
-      ? refundDecisionContext
-      : null;
+  useEffect(() => {
+    if (!isProviderDashboardChange || responseRefundDecisionOperations.length === 0) return;
+    setRefundDispositionsByOperationId((current) =>
+      defaultPendingRefundDispositions(responseRefundDecisionOperations, current),
+    );
+  }, [isProviderDashboardChange, responseRefundDecisionOperations]);
+  const activeRefundDecisionContext = useMemo(() => mergeAdminRefundDecisionContext({
+    current: refundDecisionContext,
+    selectionKey: refundDecisionSelectionKey,
+    operations: responseRefundDecisionOperations,
+    allowedByOperationId: latestChangeQuote?.allowedRefundDispositionsByOperationId ?? {},
+    removedValueByOperationId: latestChangeQuote?.removedValueByOperationId ?? {},
+  }), [
+    refundDecisionContext,
+    refundDecisionSelectionKey,
+    responseRefundDecisionOperations,
+    latestChangeQuote?.allowedRefundDispositionsByOperationId,
+    latestChangeQuote?.removedValueByOperationId,
+  ]);
   const activeReturnPriceTreatmentOperations =
     responseReturnPriceTreatmentOperations.length > 0
       ? responseReturnPriceTreatmentOperations
       : [];
   const activeRefundDispositionsByOperationId = useMemo(() => {
-    const relevantOperationIds = new Set([
-      ...(activeRefundDecisionContext?.operations ?? []).map((operation) => operation.operationId),
-      ...activeReturnPriceTreatmentOperations.map((operation) => operation.operationId),
-    ]);
-    return Object.fromEntries(
-      Object.entries(refundDispositionsByOperationId).filter(([operationId]) =>
-        relevantOperationIds.has(operationId),
-      ),
+    const dispositionsWithReturnPriceDefaults = defaultKeepOriginalReturnPriceDispositions(
+      activeReturnPriceTreatmentOperations,
+      refundDispositionsByOperationId,
+    );
+    return selectRefundDispositionsForOperations(
+      activeRefundDecisionContext,
+      activeReturnPriceTreatmentOperations,
+      dispositionsWithReturnPriceDefaults,
     );
   }, [
     activeRefundDecisionContext?.operations,
@@ -787,8 +903,13 @@ export function AdminChangeBookingFlow({
     quantities,
     addOnSelections,
     cancellationPolicyId,
-    adminCustomReceiptLines,
+    appliedPromoCode,
+    promoApplicationScope,
+    adminCustomReceiptLines: appliedAdminCustomReceiptLines,
     adminStructuredAdjustments,
+    adminReverseAdjustmentIds,
+    needsAdjustmentDiscovery:
+      isProviderDashboardChange && !hasHydratedExistingAdjustments,
     refundDispositionsByOperationId: activeRefundDispositionsByOperationId,
     useAdminFeAuthoritativeQuote,
     latestChangeQuote,
@@ -899,7 +1020,13 @@ export function AdminChangeBookingFlow({
     setPickupLocationSkipped,
   });
 
-  const { handleQuantityChange } = useBookingPromoAndQuantityController({
+  const {
+    handleQuantityChange,
+    handleApplyPromo,
+    handleRemovePromo,
+    promoCodeError,
+    promoCodeValidating,
+  } = useBookingPromoAndQuantityController({
     isAdmin,
     effectivePartySizeCap,
     currentTotalQuantity: orderSummary.totalQuantity,
@@ -918,6 +1045,33 @@ export function AdminChangeBookingFlow({
     setError,
   });
 
+  const adminPromoEditor = (
+    <AdminChangePromoEditor
+      previousPromoCode={historicalPromoCode}
+      promoCodeInput={promoCodeInput}
+      appliedPromoCode={appliedPromoCode}
+      promoCodeError={promoCodeError}
+      promoCodeValidating={promoCodeValidating}
+      scope={promoApplicationScope}
+      currency={currency}
+      locale={locale}
+      t={t}
+      onInputChange={(value) => {
+        setPromoCodeInput(value);
+        if (appliedPromoCode && value.trim().toUpperCase() !== appliedPromoCode) {
+          setAppliedPromoCode(null);
+        }
+      }}
+      onApply={() => { void handleApplyPromo(); }}
+      onRemove={() => {
+        setPromoCodeInput('');
+        setPromoApplicationScope('CHANGE_ONLY');
+        handleRemovePromo();
+      }}
+      onScopeChange={setPromoApplicationScope}
+    />
+  );
+
   const {
     showCheckoutModal,
     checkoutClientSecret,
@@ -969,10 +1123,12 @@ export function AdminChangeBookingFlow({
     onChangeBooking,
     cancellationPolicyId,
     appliedPromoCode,
+    promoApplicationScope,
     displayChangeFlowProposedTotalWithEditableLines,
     providerPricingOverrides,
     mergedProviderAdditionalAdjustments,
     adminStructuredAdjustments,
+    adminReverseAdjustmentIds,
     refundDispositionsByOperationId: activeRefundDispositionsByOperationId,
     providerApplyAuthoritativeReceipt,
     onSuccess,
@@ -987,7 +1143,7 @@ export function AdminChangeBookingFlow({
     effectiveCancellationPolicyLabel,
     addOns,
     feeLineItems,
-    adminCustomReceiptLines,
+    adminCustomReceiptLines: appliedAdminCustomReceiptLines,
     isTaxIncludedInPrice,
     originalReceiptPromoAdjustment,
     effectivePromoLineType,
@@ -1063,9 +1219,9 @@ export function AdminChangeBookingFlow({
         isSimplifiedPricingView, onQuantityChange: handleQuantityChange,
         minimumQuantities: changeBookingMinimumQuantities, applyReceiptPaidFloors: changeFlowApplyReceiptPaidFloors,
         ticketUnitFloorByCategory: changeFlowTicketBookedUnitPriceByCategory,
-        ...{ addOns, addOnSelections },
+        ...{ addOns, knownAddOns, addOnCatalogLoaded, addOnSelections },
         onAddOnSelectionsChange: updateAddOnSelections,
-        minimumTotalByAddOnId: isCustomerSelfServeChange ? initialAddOnMinTotalByAddOnId : undefined,
+        minimumTotalByAddOnId: lockExistingAddOnQuantities ? initialAddOnMinTotalByAddOnId : undefined,
         priceSummaryLines: taxIncludedReconciledCheckoutPriceSummaryLines,
         replacePriceSummary: hasChangeSelection ? selfServeCheckoutPlaceholder : undefined,
         changeFlowAmountDue,
@@ -1077,13 +1233,23 @@ export function AdminChangeBookingFlow({
         // normalized server preview, render it; do not discard valid data because an
         // optional/versioned metadata string is missing or renamed.
         serverAmendmentLines: latestChangeQuote?.serverPreview?.priceSummaryLines ?? null,
+        serverResultingReceiptLines:
+          latestChangeQuote?.serverPreview?.resultingReceiptLines ?? null,
         serverAmountDue: latestChangeQuote?.serverPreview?.amountDue ?? null,
         serverUpdatedTotal: latestChangeQuote?.serverPreview?.totalNewBooking ?? null,
+        serverNetPaid: latestChangeQuote?.amountPreviouslyPaid ?? null,
+        serverCurrentPaymentCredit: latestChangeQuote?.currentPaymentCreditTotal ?? 0,
+        serverProjectedPaymentCredit: latestChangeQuote?.projectedPaymentCreditTotal ?? 0,
+        serverRefundCandidate: latestChangeQuote?.refundCandidate ?? 0,
         serverQuoteError:
-          changeQuoteFetchError ??
-          (isChangeQuoteBlocked
-            ? (latestChangeQuote?.reasonIfBlocked ?? 'This change cannot be priced right now.')
-            : null),
+          hasIncompatibleAddOnSelections
+            ? incompatibleAddOnError
+            : (
+              changeQuoteFetchError ??
+              (isChangeQuoteBlocked
+                ? (latestChangeQuote?.reasonIfBlocked ?? 'This change cannot be priced right now.')
+                : null)
+            ),
         refundDecisionOperations: activeRefundDecisionContext?.operations ?? [],
         returnPriceTreatmentOperations: activeReturnPriceTreatmentOperations,
         allowedRefundDispositionsByOperationId: {
@@ -1095,14 +1261,21 @@ export function AdminChangeBookingFlow({
         refundDispositionsByOperationId: activeRefundDispositionsByOperationId,
         onRefundDispositionChange: handleRefundDispositionChange,
         refundQuoteLoading: changeQuoteLoading,
+        sourceProductName: initialProduct.name,
+        targetProductName: product.name,
         ...{ priceSummaryLinesIncludeTaxRow, isTaxIncludedInPrice, showProviderPricingInlineEditor },
         taxRate: pricingConfig?.taxRate,
         ...{ providerPricingUi, providerQuotedLines },
-        debugPanel: changeFlowAdminPricingDebugPanel,
+        promoEditor: adminPromoEditor,
+        promoCode: appliedPromoCode,
         ...{ showChangeFlowManualPriceLines, showAdminCustomLineEditor, adminCustomReceiptLines },
+        hasPendingAdminCustomReceiptLineChanges,
+        pendingAdminCustomReceiptLineIds,
+        adjustmentComponentOptions: latestChangeQuote?.selectableAdjustmentComponents ?? [],
         onAddAdminCustomReceiptLine: handleAddAdminCustomReceiptLine,
         onUpdateAdminCustomReceiptLine: handleUpdateAdminCustomReceiptLine,
         onRemoveAdminCustomReceiptLine: handleRemoveAdminCustomReceiptLine,
+        onApplyAdminCustomReceiptLines: handleApplyAdminCustomReceiptLines,
         onFirstNameChange: setFirstName, onLastNameChange: setLastName, onEmailChange: setEmail,
         onClearError: () => setError(''),
         pickupLocations: product.pickupLocations, destinations: product.destinations, highlightedPickupLocationIds,
@@ -1112,11 +1285,18 @@ export function AdminChangeBookingFlow({
         ...{ skipConfirmationCommunications, disableAutoCommunications },
         onSkipConfirmationChange: setSkipConfirmationCommunications,
         onDisableCommunicationsChange: setDisableAutoCommunications,
-        checkoutError: checkoutFormError,
+        checkoutError: incompatibleAddOnError || checkoutFormError,
         onCheckout: handleCheckout,
         submitLabel: changeCheckoutButtonLabel ?? deferredInvoiceSubmitLabel,
         ...{ hasEffectiveChangeSelection, isChangeQuoteBlocked },
-        submitDisabled: changeFlowSubmitDisabled,
+        submitDisabled:
+          changeFlowSubmitDisabled ||
+          hasIncompatibleAddOnSelections ||
+          hasPendingAdminCustomReceiptLineChanges ||
+          adminCustomReceiptLines.some(
+            (line) =>
+              line.scope === 'SELECTED_COMPONENTS' && line.selectedComponentIds.length === 0,
+          ),
         attributionSummary: flowUi?.partnerAttributionSummary, attributionConfirmLabel: flowUi?.partnerAttributionConfirmLabel,
         attributionConfirmed: partnerAttributionConfirmed,
         onAttributionConfirmedChange: setPartnerAttributionConfirmed,