@ticketboothapp/booking 1.2.167 → 1.2.169

package/package.json

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

package/src/components/booking/AdminChangeBookingContent.tsx

@@ -142,6 +142,8 @@ const selectionControlsPropKeys = [
   'applyReceiptPaidFloors',
   'ticketUnitFloorByCategory',
   'addOns',
+  'knownAddOns',
+  'addOnCatalogLoaded',
   'addOnSelections',
   'onAddOnSelectionsChange',
   'minimumTotalByAddOnId',
@@ -157,8 +159,13 @@ const checkoutPanelPropKeys = [
   'originalReceipt',
   'priceSummaryLinesIncludeTaxRow',
   'serverAmendmentLines',
+  'serverResultingReceiptLines',
   'serverAmountDue',
   'serverUpdatedTotal',
+  'serverNetPaid',
+  'serverCurrentPaymentCredit',
+  'serverProjectedPaymentCredit',
+  'serverRefundCandidate',
   'serverQuoteError',
   'refundDecisionOperations',
   'returnPriceTreatmentOperations',
@@ -167,6 +174,8 @@ const checkoutPanelPropKeys = [
   'refundDispositionsByOperationId',
   'onRefundDispositionChange',
   'refundQuoteLoading',
+  'sourceProductName',
+  'targetProductName',
   'isTaxIncludedInPrice',
   'taxRate',
   'currency',
@@ -175,15 +184,18 @@ const checkoutPanelPropKeys = [
   'showProviderPricingInlineEditor',
   'providerPricingUi',
   'providerQuotedLines',
-  'debugPanel',
   'promoEditor',
   'promoCode',
   'showChangeFlowManualPriceLines',
   'showAdminCustomLineEditor',
   'adminCustomReceiptLines',
+  'hasPendingAdminCustomReceiptLineChanges',
+  'pendingAdminCustomReceiptLineIds',
+  'adjustmentComponentOptions',
   'onAddAdminCustomReceiptLine',
   'onUpdateAdminCustomReceiptLine',
   'onRemoveAdminCustomReceiptLine',
+  'onApplyAdminCustomReceiptLines',
   'firstName',
   'lastName',
   'email',

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -4,8 +4,10 @@ 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,
@@ -20,12 +22,14 @@ import { filterAvailabilitiesAfterCurrentTime } from '../../lib/booking/booking-
 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 {
@@ -42,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';
@@ -50,7 +56,6 @@ 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';
@@ -61,6 +66,8 @@ import { AdminChangePromoEditor } from './AdminChangePromoEditor';
 import { buildAdminChangeQuoteRequestKey } from './admin-change-quote-request-key';
 import type { AdminReleaseRefundDisposition } from './admin-refund-disposition';
 import {
+  defaultKeepOriginalReturnPriceDispositions,
+  defaultPendingRefundDispositions,
   mergeAdminRefundDecisionContext,
   selectRefundDispositionsForOperations,
   type AdminRefundDecisionContext,
@@ -179,27 +186,79 @@ export function AdminChangeBookingFlow({
     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 ?? [];
@@ -212,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). */
@@ -261,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>
@@ -278,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 {
@@ -311,8 +391,31 @@ export function AdminChangeBookingFlow({
     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,
@@ -376,6 +479,8 @@ export function AdminChangeBookingFlow({
     timesForSelectedDate,
     companyTimezone,
     changeFlowResolvedInitialProductOptionId,
+    mostPopularProductOptionId:
+      activeOptions.find((option) => option.mostPopular)?.optionId ?? null,
     precomputedPricesByOption,
     currency,
     originalReceiptSubtotal: originalReceipt?.subtotal,
@@ -396,7 +501,12 @@ export function AdminChangeBookingFlow({
     setError,
   });
 
+  const lockExistingAddOnQuantities = shouldLockExistingAddOnQuantities({
+    isCustomerSelfServeChange,
+    isAdmin,
+  });
   const {
+    initialAddOnQtyByKey,
     initialAddOnMinQtyByKey,
     initialAddOnMinTotalByAddOnId,
     updateAddOnSelections,
@@ -404,7 +514,7 @@ export function AdminChangeBookingFlow({
     initialValues,
     originalReceiptLineItems: originalReceipt?.lineItems,
     addOns,
-    isCustomerSelfServeChange,
+    lockExistingAddOnQuantities,
     setAddOnSelections,
   });
 
@@ -530,7 +640,6 @@ export function AdminChangeBookingFlow({
     editableSummaryLineAmountInputs,
     editableSummaryLineLabelInputs,
     editableSummaryPreSubtotalDelta,
-    editableSummaryPreSubtotalDebugRows,
     handleEditableLineAmountInputChange,
     handleEditableLineAmountInputBlur,
     handleEditableLineAmountReset,
@@ -558,7 +667,7 @@ export function AdminChangeBookingFlow({
     originalAddOnSelections: initialValues?.addOnSelections ?? null,
     originalProductOptionId: initialValues?.productOptionId ?? null,
     addOns,
-    adminCustomReceiptLines,
+    adminCustomReceiptLines: appliedAdminCustomReceiptLines,
     quantities,
     flowUi,
     isProviderDashboardChange,
@@ -596,8 +705,6 @@ export function AdminChangeBookingFlow({
     unchangedReceiptAnchor,
     showChangeFlowManualPriceLines,
     showAdminCustomLineEditor,
-    displayedChangeAmountsRaw,
-    displayLayerUsesExternalPricing,
     displayChangeFlowTax,
     displayChangeFlowProposedTotal,
     displayChangeFlowProposedTotalWithEditableLines,
@@ -627,7 +734,7 @@ export function AdminChangeBookingFlow({
     pickupLocationId,
     quantities,
     addOnSelections,
-    initialAddOnMinQtyByKey,
+    initialAddOnQtyByKey,
     changeFlowResolvedInitialProductOptionId,
     selectedParentProductChanged,
     isProviderDashboardChange,
@@ -636,7 +743,8 @@ export function AdminChangeBookingFlow({
     providerQuotedLines,
     editableSummaryPreSubtotalDelta,
     adminCustomAdjustmentTotal,
-    adminCustomReceiptLines,
+    adminCustomReceiptLines: appliedAdminCustomReceiptLines,
+    adminReverseAdjustmentIds,
     isManualOverrideEligibleLine,
     isAdmin,
     useAdminFeAuthoritativeQuote,
@@ -674,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,
@@ -717,8 +794,9 @@ export function AdminChangeBookingFlow({
     cancellationPolicyId,
     promoCode: appliedPromoCode,
     promoApplicationScope,
-    adminCustomReceiptLines,
+    adminCustomReceiptLines: appliedAdminCustomReceiptLines,
     structuredAdjustments: adminStructuredAdjustments,
+    reverseAdjustmentIds: adminReverseAdjustmentIds,
     useAdminFeAuthoritativeQuote,
   }), [
     initialValues?.bookingReference,
@@ -732,8 +810,9 @@ export function AdminChangeBookingFlow({
     cancellationPolicyId,
     appliedPromoCode,
     promoApplicationScope,
-    adminCustomReceiptLines,
+    appliedAdminCustomReceiptLines,
     adminStructuredAdjustments,
+    adminReverseAdjustmentIds,
     useAdminFeAuthoritativeQuote,
   ]);
   const responseRefundDecisionOperations = latestChangeQuote?.refundDecisionOperations ?? [];
@@ -754,6 +833,12 @@ export function AdminChangeBookingFlow({
     latestChangeQuote?.allowedRefundDispositionsByOperationId,
     latestChangeQuote?.removedValueByOperationId,
   ]);
+  useEffect(() => {
+    if (!isProviderDashboardChange || responseRefundDecisionOperations.length === 0) return;
+    setRefundDispositionsByOperationId((current) =>
+      defaultPendingRefundDispositions(responseRefundDecisionOperations, current),
+    );
+  }, [isProviderDashboardChange, responseRefundDecisionOperations]);
   const activeRefundDecisionContext = useMemo(() => mergeAdminRefundDecisionContext({
     current: refundDecisionContext,
     selectionKey: refundDecisionSelectionKey,
@@ -772,10 +857,14 @@ export function AdminChangeBookingFlow({
       ? responseReturnPriceTreatmentOperations
       : [];
   const activeRefundDispositionsByOperationId = useMemo(() => {
+    const dispositionsWithReturnPriceDefaults = defaultKeepOriginalReturnPriceDispositions(
+      activeReturnPriceTreatmentOperations,
+      refundDispositionsByOperationId,
+    );
     return selectRefundDispositionsForOperations(
       activeRefundDecisionContext,
       activeReturnPriceTreatmentOperations,
-      refundDispositionsByOperationId,
+      dispositionsWithReturnPriceDefaults,
     );
   }, [
     activeRefundDecisionContext?.operations,
@@ -816,8 +905,11 @@ export function AdminChangeBookingFlow({
     cancellationPolicyId,
     appliedPromoCode,
     promoApplicationScope,
-    adminCustomReceiptLines,
+    adminCustomReceiptLines: appliedAdminCustomReceiptLines,
     adminStructuredAdjustments,
+    adminReverseAdjustmentIds,
+    needsAdjustmentDiscovery:
+      isProviderDashboardChange && !hasHydratedExistingAdjustments,
     refundDispositionsByOperationId: activeRefundDispositionsByOperationId,
     useAdminFeAuthoritativeQuote,
     latestChangeQuote,
@@ -1036,6 +1128,7 @@ export function AdminChangeBookingFlow({
     providerPricingOverrides,
     mergedProviderAdditionalAdjustments,
     adminStructuredAdjustments,
+    adminReverseAdjustmentIds,
     refundDispositionsByOperationId: activeRefundDispositionsByOperationId,
     providerApplyAuthoritativeReceipt,
     onSuccess,
@@ -1050,7 +1143,7 @@ export function AdminChangeBookingFlow({
     effectiveCancellationPolicyLabel,
     addOns,
     feeLineItems,
-    adminCustomReceiptLines,
+    adminCustomReceiptLines: appliedAdminCustomReceiptLines,
     isTaxIncludedInPrice,
     originalReceiptPromoAdjustment,
     effectivePromoLineType,
@@ -1126,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,
@@ -1140,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: {
@@ -1158,16 +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,
@@ -1177,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,