@ticketboothapp/booking 1.2.64 → 1.2.66

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -7,11 +7,9 @@ import {
   getAvailabilities,
   cancelReservation,
   cancelReservationBestEffort,
-  createPaymentIntent,
   quoteChangeBooking,
   confirmFreeChangeBooking,
   createChangeBookingPaymentIntent,
-  confirmBookingWithoutPayment,
   getAddOns,
   validatePromoCode,
   getPromoDiscount,
@@ -33,7 +31,6 @@ import {
 } from '../../lib/booking-constants';
 import { getSundayOfWeek } from '../../lib/booking/sunday-week';
 import { Calendar } from './Calendar';
-import { AdminPaymentChoiceModal } from './AdminPaymentChoiceModal';
 import { ItineraryBox } from './ItineraryBox';
 import { ItineraryPlaceholder } from './ItineraryPlaceholder';
 import { PickupTimeSelector } from './PickupTimeSelector';
@@ -99,7 +96,6 @@ import { getItineraryStepLabel } from '../../lib/booking/itinerary-display';
 import { MANAGE_BOOKING_FROM_CHANGE_PAYMENT, MANAGE_BOOKING_QUERY_FROM } from '../../lib/manage-booking-post-checkout';
 import { useBookingHost } from '../../runtime';
 import type { BookingFlowUiOptions } from './booking-flow-ui';
-import type { ProviderDashboardChangeBookingPayload } from './provider-dashboard-change-booking';
 import type { ChangeBookingFlowProps, ChangeFlowSelectionPreview } from './booking-flow-types';
 import { BOOKING_FLOW_ABANDON_EVENT } from '../../providers/booking-dialog-provider';
 
@@ -111,8 +107,6 @@ import { BOOKING_FLOW_ABANDON_EVENT } from '../../providers/booking-dialog-provi
  * `serverPreview.priceSummaryLines` when the quote includes rows; otherwise falls back to FE-built lines after totals confirm.
  *
  * Until the first successful quote, `selfServeCheckoutPlaceholder` still avoids showing unchecked totals.
- *
- * **Provider dashboard** (`onChangeBooking`) — unchanged; manual pricing via `flowUi.providerDashboardChangePricingUi`.
  */
 function mergeQuoteSliceWithServerPreview(
   slice: ReturnType<typeof sliceChangeQuoteForUi>,
@@ -409,9 +403,8 @@ function pickOutboundMatchingPreviousSelection(
   anchor: { productOptionId: string | null; minutesFromMidnight: number },
   companyTimezone: string,
   optionsMap: Map<string, { mostPopular?: boolean }>,
-  isAdmin: boolean
 ): Availability | null {
-  const selectable = timesForSelectedDate.filter((a) => (a.vacancies ?? 0) > 0 || isAdmin);
+  const selectable = timesForSelectedDate.filter((a) => (a.vacancies ?? 0) > 0);
   if (selectable.length === 0) return null;
 
   const withOption =
@@ -445,9 +438,8 @@ function pickReturnMatchingPreviousSelection(
   sortedReturnOptions: ReturnOption[],
   anchor: { returnLocation: string; minutesFromMidnight: number },
   companyTimezone: string,
-  isAdmin: boolean
 ): ReturnOption | null {
-  const eligible = sortedReturnOptions.filter((o) => (o.vacancies ?? 0) > 0 || isAdmin);
+  const eligible = sortedReturnOptions.filter((o) => (o.vacancies ?? 0) > 0);
   if (eligible.length === 0) return null;
 
   const sameLoc = eligible.filter((o) => o.returnLocation === anchor.returnLocation);
@@ -636,8 +628,7 @@ function resolveInitialAvailabilityFromBooking(
 }
 
 /**
- * Admin / provider-dashboard **change booking** — literal duplicate of {@link ChangeBookingFlow} for now
- * so ticketbooth can diverge without affecting the public site flow.
+ * Embed fork (ticketbooth provider dashboard): same self-serve **change booking** as {@link ChangeBookingFlow}.
  */
 export function AdminChangeBookingFlow({
   product,
@@ -661,7 +652,6 @@ export function AdminChangeBookingFlow({
   partnerPortalBooking = false,
   availabilityPricingProfileId,
   availabilityCancellationPolicyProfileId,
-  onChangeBooking,
 }: ChangeBookingFlowProps) {
   /** Always the booking’s sold currency — not the site currency switcher / parent default. */
   const currency = useMemo((): Currency => {
@@ -673,16 +663,6 @@ export function AdminChangeBookingFlow({
     return DEFAULT_CURRENCY;
   }, [originalReceipt?.currency, initialValues?.currency, currencyFromParent]);
 
-  const isManualOverrideEligibleLine = (line: { editable: boolean; type?: string; label?: string }): boolean => {
-    if (!line.editable) return false;
-    const type = (line.type ?? '').toUpperCase();
-    const label = (line.label ?? '').toLowerCase();
-    const isPromoLikeType =
-      type.includes('PROMO') || type.includes('DISCOUNT') || type.includes('VOUCHER') || type.includes('GIFT');
-    const isPromoLikeLabel =
-      label.includes('promo') || label.includes('discount') || label.includes('voucher') || label.includes('gift');
-    return !(isPromoLikeType || isPromoLikeLabel);
-  };
   const { env, analytics } = useBookingHost();
   const { t } = useTranslations();
   const { locale } = useLocale();
@@ -691,7 +671,6 @@ export function AdminChangeBookingFlow({
   const cancellationPolicyProfileIdForAvailabilities =
     (availabilityCancellationPolicyProfileId ?? '').trim() || null;
   const {
-    permissions,
     isSimplifiedPricingView,
     onShowManage,
     getSuccessUrl,
@@ -699,7 +678,6 @@ export function AdminChangeBookingFlow({
     mode: bookingAppMode,
   } = useBookingApp();
   const availabilitiesCache = useAvailabilitiesCache();
-  const isAdmin = permissions.viewerRole === 'admin';
   const [availabilities, setAvailabilities] = useState<Availability[]>([]);
   const [selectedAvailability, setSelectedAvailability] = useState<Availability | null>(null);
   const [selectedReturnOption, setSelectedReturnOption] = useState<ReturnOption | null>(null);
@@ -798,12 +776,6 @@ export function AdminChangeBookingFlow({
       differenceTotal: number;
     };
   } | null>(null);
-  /** Admin only: skip sending confirmation at creation (provider dashboard). */
-  const [skipConfirmationCommunications, setSkipConfirmationCommunications] = useState(false);
-  /** Admin only: disable all auto communications for this booking (provider dashboard). */
-  const [disableAutoCommunications, setDisableAutoCommunications] = useState(false);
-  /** Admin only: show choice to pay now or confirm without payment (full balance owed). */
-  const [showAdminPaymentChoice, setShowAdminPaymentChoice] = useState(false);
   const hasAppliedInitialValuesRef = useRef(false);
   const hasAppliedInitialQuantitiesRef = useRef(false);
   const hasHydratedAddOnsFromReceiptRef = useRef(false);
@@ -822,10 +794,11 @@ export function AdminChangeBookingFlow({
       return null;
     }
   }, [initialValues?.dateTime, companyTimezone]);
-  const isProviderDashboardChange = Boolean(onChangeBooking);
-  const isCustomerSelfServeChange = !isProviderDashboardChange;
   /** Do not render catalog-/FE-derived dollar amounts in UI until `quoteChangeBooking` returns `serverDisplay`. */
-  const suppressSelfServeCurrencyUi = isCustomerSelfServeChange;
+  const suppressSelfServeCurrencyUi = true;
+  /** Self-serve change flow only (no provider/admin pricing paths). */
+  const isCustomerSelfServeChange = true;
+  const isAdmin = false;
 
   useEffect(() => {
     setPartnerAttributionConfirmed(false);
@@ -835,13 +808,13 @@ 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. */
+  /** Promo from booking is fixed — show read-only, never add new. */
   const lockedPromoCode = initialValues?.promoCode?.trim()
     ? initialValues.promoCode.trim().toUpperCase()
     : null;
   /** Public self-serve only: cannot reduce tickets below original counts. */
   const changeBookingMinimumQuantities = useMemo(() => {
-    if (!isCustomerSelfServeChange || !initialValues?.bookingItems?.length) return undefined;
+    if (!initialValues?.bookingItems?.length) return undefined;
     const m: Record<string, number> = {};
     for (const item of initialValues.bookingItems) {
       const key = item.category?.trim();
@@ -849,30 +822,7 @@ export function AdminChangeBookingFlow({
       m[key] = Math.max(0, Number(item.count) || 0);
     }
     return m;
-  }, [isCustomerSelfServeChange, initialValues?.bookingItems]);
-  const [adminChoiceData, setAdminChoiceData] = useState<{
-    reservationReference: string;
-    reservationExpiration?: string;
-    checkoutBreakdown: { lineItems: Array<{ label: string; amount: number; type?: string; quantity?: number }>; totalAmount: number; currency: string };
-    totalAmount: number;
-    datePart: string;
-    timePart: string;
-    availabilityProductOptionId: string;
-    itineraryDisplay?: ItineraryDisplayStep[] | null;
-    clientSecret: string;
-    ticketLinesForModal: CheckoutModalLineItem[];
-    feeLineItems: OrderSummary['feeLineItems'];
-    returnPriceAdjustment: number;
-    cancellationPolicyFee: number;
-    cancellationPolicyLabel?: string;
-    subtotal: number;
-    tax: number;
-    totalQuantity: number;
-    isTaxIncludedInPrice: boolean;
-    taxRate: number;
-    promoDiscountAmount: number;
-    discountLabel?: string | null;
-  } | null>(null);
+  }, [initialValues?.bookingItems]);
   const [latestChangeQuote, setLatestChangeQuote] = useState<{
     priceDiff: number;
     currency: Currency;
@@ -1709,14 +1659,12 @@ export function AdminChangeBookingFlow({
   }, [initialValues?.productId, product.productId]);
 
   /**
-   * Receipt pricing on protected seats/fees — **customer self-serve only**: Rule A (exact receipt unit when same calendar day
-   * + same product option) vs Rule B (`max(receipt, live)` when date or option changes). Provider dashboard uses live catalog.
+   * Receipt pricing on protected seats/fees: Rule A (exact receipt unit when same calendar day
+   * + same product option) vs Rule B (`max(receipt, live)` when date or option changes).
    */
   const changeFlowApplyReceiptPaidFloors = useMemo(
-    () =>
-      !isProviderDashboardChange &&
-      changeFlowBookingParentProductIdForFloors === product.productId.trim(),
-    [isProviderDashboardChange, changeFlowBookingParentProductIdForFloors, product.productId],
+    () => changeFlowBookingParentProductIdForFloors === product.productId.trim(),
+    [changeFlowBookingParentProductIdForFloors, product.productId],
   );
 
   useEffect(() => {
@@ -2826,7 +2774,6 @@ export function AdminChangeBookingFlow({
    */
   const changeFlowProtectedReturnAdjustment = useMemo(() => {
     if (totalQuantity <= 0) return returnPriceAdjustment;
-    if (isProviderDashboardChange) return returnPriceAdjustment;
     if (effectiveChangeFlowReturnUnitFloorPerPerson == null) return returnPriceAdjustment;
     const livePerPerson =
       returnOptionCatalogPerPerson ?? (selectedReturnOption?.priceAdjustmentByCurrency?.[currency] ?? 0);
@@ -2840,7 +2787,6 @@ export function AdminChangeBookingFlow({
   }, [
     totalQuantity,
     returnPriceAdjustment,
-    isProviderDashboardChange,
     effectiveChangeFlowReturnUnitFloorPerPerson,
     selectedReturnOption,
     returnOptionCatalogPerPerson,
@@ -2931,29 +2877,6 @@ export function AdminChangeBookingFlow({
     return [...feeLineItems, ...addOnLines];
   }, [feeLineItems, addOnSelections, addOns]);
 
-  const providerPricingUi = flowUi?.providerDashboardChangePricingUi;
-  const providerQuotedLines = providerPricingUi?.quotedLines ?? [];
-  const providerEditableLines = providerQuotedLines.filter((line) => isManualOverrideEligibleLine(line));
-  const showProviderPricingInlineEditor =
-    isProviderDashboardChange && isAdmin && (
-      providerPricingUi?.loading ||
-      providerPricingUi?.error != null ||
-      providerQuotedLines.length > 0
-    );
-  const normalizeReceiptLabel = (value: string): string =>
-    value
-      .toLowerCase()
-      .replace(/\([^)]*\)/g, '')
-      .replace(/[^a-z0-9]+/g, '')
-      .trim();
-  const providerEditableLineByNormalizedLabel = useMemo(() => {
-    const m = new Map<string, (typeof providerEditableLines)[number]>();
-    for (const line of providerEditableLines) {
-      const key = normalizeReceiptLabel(line.label ?? '');
-      if (key) m.set(key, line);
-    }
-    return m;
-  }, [providerEditableLines]);
 
   const checkoutPriceSummaryLines = useMemo((): PriceSummaryLine[] => {
     if (!selectedAvailability) return [];
@@ -2971,13 +2894,6 @@ export function AdminChangeBookingFlow({
         );
         return {
           kind: 'ticket',
-          lineKey:
-            showProviderPricingInlineEditor
-              ? providerEditableLineByNormalizedLabel.get(normalizeReceiptLabel(line.category))?.lineKey
-              : undefined,
-          editable:
-            showProviderPricingInlineEditor &&
-            providerEditableLineByNormalizedLabel.has(normalizeReceiptLabel(line.category)),
           category: line.category,
           qty: line.qty,
           itemTotal: line.itemTotal,
@@ -3012,25 +2928,6 @@ export function AdminChangeBookingFlow({
             fee.name.toLowerCase().includes('license'));
         return {
           kind: 'line' as const,
-          lineKey:
-            showProviderPricingInlineEditor
-              ? providerEditableLineByNormalizedLabel.get(
-                  normalizeReceiptLabel(
-                    feeLineItems.some((f) => f.name === fee.name)
-                      ? `${fee.name} (${totalQuantity} ${totalQuantity === 1 ? 'person' : 'people'})`
-                      : fee.name
-                  )
-                )?.lineKey
-              : undefined,
-          editable:
-            showProviderPricingInlineEditor &&
-            providerEditableLineByNormalizedLabel.has(
-              normalizeReceiptLabel(
-                feeLineItems.some((f) => f.name === fee.name)
-                  ? `${fee.name} (${totalQuantity} ${totalQuantity === 1 ? 'person' : 'people'})`
-                  : fee.name
-              )
-            ),
           label: feeLineItems.some((f) => f.name === fee.name)
             ? `${fee.name} (${totalQuantity} ${totalQuantity === 1 ? 'person' : 'people'})`
             : fee.name,
@@ -3056,8 +2953,6 @@ export function AdminChangeBookingFlow({
     effectiveCancellationPolicyLabel,
     feeLineItemsWithAddOns,
     feeLineItems,
-    showProviderPricingInlineEditor,
-    providerEditableLineByNormalizedLabel,
   ]);
 
   const checkoutPriceSummaryLinesForCheckout = useMemo(() => {
@@ -3561,8 +3456,7 @@ export function AdminChangeBookingFlow({
         countsChanged ||
         addOnsChanged ||
         returnChanged,
-      // Authoritative for "real user change" gating in provider dashboard:
-      // ignore option-id noise and only consider user-visible booking deltas.
+      // Authoritative for "real user change" gating: ignore option-id noise; only user-visible deltas.
       hasOperationalChangesFromInitial:
         dateChanged ||
         pickupChanged ||
@@ -3589,62 +3483,28 @@ export function AdminChangeBookingFlow({
     addOnSelections,
     initialAddOnMinQtyByKey,
   ]);
-  const hasChangeSelection =
-    isProviderDashboardChange
-      ? changeSelectionDetails.hasOperationalChangesFromInitial
-      : changeSelectionDetails.hasChangesFromInitial;
+  const hasChangeSelection = changeSelectionDetails.hasChangesFromInitial;
 
   const changeFlowNeedsServerPrice =
-    isCustomerSelfServeChange &&
     hasChangeSelection &&
     !!initialValues?.bookingReference?.trim() &&
     !!lastName.trim();
 
-  const isChangeQuoteBlocked = isCustomerSelfServeChange && latestChangeQuote?.canProceed === false;
-  const requiresReturnInChangeFlow = isCustomerSelfServeChange && !!initialValues?.returnAvailabilityId?.trim();
+  const isChangeQuoteBlocked = latestChangeQuote?.canProceed === false;
+  const requiresReturnInChangeFlow = !!initialValues?.returnAvailabilityId?.trim();
   const missingRequiredReturnSelection = requiresReturnInChangeFlow && !selectedReturnOption;
 
   const changeFlowSubmitDisabled =
     missingRequiredReturnSelection ||
-    (isCustomerSelfServeChange &&
-      changeFlowNeedsServerPrice &&
+    (changeFlowNeedsServerPrice &&
       (changeQuoteLoading || (!latestChangeQuote && !changeQuoteFetchError)));
 
-  const providerTotalsPreview =
-    showProviderPricingInlineEditor && providerPricingUi?.totalsPreview
-      ? providerPricingUi.totalsPreview
-      : null;
-  const providerHasEditedLineOverrides =
-    isProviderDashboardChange &&
-    providerQuotedLines.some((line) => {
-      if (!isManualOverrideEligibleLine(line)) return false;
-      const raw = providerPricingUi?.lineAmountInputs?.[line.lineKey];
-      const parsed = raw == null || raw.trim() === '' ? line.amount : Number(raw);
-      if (!Number.isFinite(parsed)) return false;
-      const rounded = Math.round(parsed * 100) / 100;
-      return Math.abs(rounded - line.amount) > 0.0001;
-    });
-  const providerHasAdditionalAdjustments =
-    isProviderDashboardChange &&
-    (providerPricingUi?.additionalAdjustments ?? []).some((adj) => {
-      const parsed = Number((adj.amountInput ?? '').trim());
-      const hasAmount = Number.isFinite(parsed) && parsed > 0;
-      const currentAmount = hasAmount ? (Math.round(parsed * 100) / 100).toFixed(2) : '';
-      const originalAmount = adj.originalAmountInput ?? '';
-      const currentLabel = (adj.label ?? '').trim();
-      const originalLabel = (adj.originalLabel ?? '').trim();
-      const currentMode = adj.mode;
-      const originalMode = adj.originalMode;
-      if (!originalMode) return hasAmount || currentLabel.length > 0;
-      return currentAmount !== originalAmount || currentLabel !== originalLabel || currentMode !== originalMode;
-    });
-  const hasEffectiveChangeSelection =
-    hasChangeSelection || providerHasEditedLineOverrides || providerHasAdditionalAdjustments;
+  const hasEffectiveChangeSelection = hasChangeSelection;
 
   const displayedChangeAmounts = resolveChangeFlowDisplayedAmounts({
-    providerPreview: providerTotalsPreview,
+    providerPreview: null,
     serverQuotePreview:
-      isCustomerSelfServeChange && latestChangeQuote?.serverDisplay
+      latestChangeQuote?.serverDisplay
         ? latestChangeQuote.serverDisplay
         : null,
     fromCart: {
@@ -3660,13 +3520,13 @@ export function AdminChangeBookingFlow({
   const changeFlowClientEstimateDue = (() => {
     if (!originalReceipt) return totalPrice;
     // Customer self-serve: amount due comes from POST .../change/quote (`amountDueCents` / priceDiff), not FE delta math.
-    if (isCustomerSelfServeChange && latestChangeQuote != null && !changeQuoteFetchError) {
+    if (latestChangeQuote != null && !changeQuoteFetchError) {
       return normalizeNearZeroOwed(latestChangeQuote.priceDiff);
     }
     return changeFlowBalanceVsOriginal({
       newTotal: displayChangeFlowProposedTotal,
       originalReceiptTotal: originalReceipt.total,
-      audience: isProviderDashboardChange ? 'provider' : 'customer',
+      audience: 'customer',
     });
   })();
 
@@ -3675,14 +3535,6 @@ export function AdminChangeBookingFlow({
 
   const changeCheckoutButtonLabel = (() => {
     if (!hasEffectiveChangeSelection) return undefined;
-    if (isProviderDashboardChange) {
-      const est = Math.round(changeFlowClientEstimateDue * 100) / 100;
-      return est > 0
-        ? `Change booking (${formatCurrencyAmount(est, currency, locale as 'en' | 'fr')})`
-        : est < 0
-          ? `Change booking (${formatCurrencyAmount(est, currency, locale as 'en' | 'fr')})`
-          : 'Change booking (no charge)';
-    }
     if (changeFlowNeedsServerPrice) {
       if (changeQuoteLoading) {
         const tr = t('booking.updatingPrice');
@@ -3716,39 +3568,8 @@ export function AdminChangeBookingFlow({
   const checkoutFormError =
     (error || '') ||
     (missingRequiredReturnSelection ? 'Removing return option in self-serve is not available. Please contact support.' : '') ||
-    (isCustomerSelfServeChange && isChangeQuoteBlocked ? (latestChangeQuote?.reasonIfBlocked ?? '') : '') ||
-    (isCustomerSelfServeChange ? changeQuoteFetchError ?? '' : '');
-
-  const providerPricingOverrides =
-    isProviderDashboardChange && providerQuotedLines.length > 0
-      ? providerQuotedLines
-          .filter((line) => isManualOverrideEligibleLine(line))
-          .map((line) => {
-            const raw = providerPricingUi?.lineAmountInputs?.[line.lineKey];
-            const parsed = raw == null || raw.trim() === '' ? line.amount : Number(raw);
-            if (!Number.isFinite(parsed)) return null;
-            const rounded = Math.round(parsed * 100) / 100;
-            return Math.abs(rounded - line.amount) > 0.0001
-              ? { lineKey: line.lineKey, amount: rounded, reason: 'Provider dashboard override' }
-              : null;
-          })
-          .filter((v): v is { lineKey: string; amount: number; reason: string } => v != null)
-      : [];
-  const providerAdditionalAdjustments =
-    isProviderDashboardChange
-      ? (providerPricingUi?.additionalAdjustments ?? [])
-          .map((adj) => {
-            const parsed = Number((adj.amountInput ?? '').trim());
-            if (!Number.isFinite(parsed) || parsed <= 0) return null;
-            const rounded = Math.round(parsed * 100) / 100;
-            const signed = adj.mode === 'DISCOUNT' ? -rounded : rounded;
-            return {
-              label: adj.label?.trim() || (signed < 0 ? 'Provider discount' : 'Provider charge'),
-              amount: signed,
-            };
-          })
-          .filter((v): v is { label: string; amount: number } => v != null)
-      : [];
+    (isChangeQuoteBlocked ? (latestChangeQuote?.reasonIfBlocked ?? '') : '') ||
+    (changeQuoteFetchError ?? '');
 
   const changeFlowSelectionPreview = useMemo((): ChangeFlowSelectionPreview | null => {
     if (!selectedAvailability || totalQuantity <= 0) return null;
@@ -3996,8 +3817,7 @@ export function AdminChangeBookingFlow({
           timesForSelectedDate,
           anchor,
           companyTimezone,
-          optionsMap,
-          isAdmin
+          optionsMap
         );
         changeFlowOutboundAnchorRef.current = null;
         if (matched) {
@@ -4088,8 +3908,7 @@ export function AdminChangeBookingFlow({
         const fromAnchor = pickReturnMatchingPreviousSelection(
           sorted,
           returnAnchor,
-          companyTimezone,
-          isAdmin
+          companyTimezone
         );
         changeFlowReturnAnchorRef.current = null;
         if (fromAnchor) {
@@ -4412,8 +4231,6 @@ export function AdminChangeBookingFlow({
       return;
     }
 
-    const skipContactFields = isProviderDashboardChange;
-    if (!skipContactFields) {
       // Validate email (required)
       if (!email) {
         setError(t('booking.enterEmail') || 'Please enter your email address');
@@ -4436,7 +4253,6 @@ export function AdminChangeBookingFlow({
         setError(t('booking.enterLastName') || 'Please enter your last name');
         return;
       }
-    }
 
     // Allow checkout if pickup location is selected OR if user chose "I don't know"
     if (product.pickupLocations && product.pickupLocations.length > 0 && !pickupLocationId && !pickupLocationSkipped) {
@@ -4463,45 +4279,6 @@ export function AdminChangeBookingFlow({
         return;
       }
 
-      if (onChangeBooking) {
-        const pickupForChange = pickupLocationId
-          ? product.pickupLocations?.find((loc) => loc.id === pickupLocationId)
-          : null;
-        await onChangeBooking({
-          productId: availabilityProductOptionId,
-          dateTime: selectedAvailability.dateTime,
-          bookingItems,
-          returnAvailabilityId: selectedReturnOption?.returnAvailabilityId ?? null,
-          pickupLocationId: pickupLocationId ?? null,
-          travelerHotel: pickupForChange?.name ?? null,
-          startTime: selectedAvailability.dateTime ?? null,
-          passengerCount: null,
-          childSafetySeatsCount: null,
-          foodRestrictions: null,
-          addOnSelections: addOnSelections.length > 0 ? addOnSelections : null,
-          cancellationPolicyId: cancellationPolicyId ?? initialValues?.cancellationPolicyId ?? null,
-          promoCode: appliedPromoCode ?? null,
-          newTotalAmount: displayChangeFlowProposedTotal,
-          additionalHoursCount: null,
-          pricingAdjustment:
-            providerPricingOverrides.length > 0 || providerAdditionalAdjustments.length > 0
-              ? {
-                  mode: 'MANUAL_LINES',
-                  lineOverrides: providerPricingOverrides,
-                  additionalAdjustments: providerAdditionalAdjustments,
-                }
-              : undefined,
-          capacitySeatCredit: {
-            enabled: true,
-            previousPassengerCount: changeFlowInitialTicketCount,
-            previousAvailabilityId: initialValues?.availabilityId ?? null,
-            previousReturnAvailabilityId: initialValues?.returnAvailabilityId ?? null,
-          },
-        });
-        setLoading(false);
-        return;
-      }
-
       const bookingSourceContext = buildBookingSourceContext(bookingSourceAttribution, {
         clientChannelSource: inferClientBookingSourceFromProductIds(
           product.productId,
@@ -4519,7 +4296,6 @@ export function AdminChangeBookingFlow({
       let changeIntentIdForCheckout: string | undefined;
       let changeBookingReferenceForPaidFlow: string | undefined;
 
-      if (isCustomerSelfServeChange) {
         const changeBookingReference = initialValues?.bookingReference?.trim();
         const changeLastName = lastName.trim();
         if (!changeBookingReference || !changeLastName) {
@@ -4607,13 +4383,12 @@ export function AdminChangeBookingFlow({
         if (!changeIntentIdForCheckout) {
           throw new Error('Missing change intent for payment.');
         }
-      }
       
       pendingReservationRef.current = null;
 
       // Note: Do NOT call onSuccess here for paid bookings — we're about to show the Stripe
       // CheckoutModal. onSuccess (e.g. closing the parent dialog) should only run when we're
-      // actually done (free booking redirect, admin confirm-without-payment). Calling it here
+      // actually done (free booking redirect). Calling it here
       // would close the dialog before the payment modal opens.
 
       // Update stored booking data (no holds reservation — change flow keys off booking reference elsewhere).
@@ -4639,13 +4414,11 @@ export function AdminChangeBookingFlow({
       // Build checkout breakdown from the exact same values we show in the UI and Stripe modal.
       // Backend will charge totalAmount and store this as the receipt so /manage matches.
       const taxForBreakdown = effectivePromoDiscountAmount > 0 ? effectiveTax : tax;
-      const amountDueForCheckout = isCustomerSelfServeChange
-        ? changeFlowBalanceVsOriginal({
+      const amountDueForCheckout = changeFlowBalanceVsOriginal({
             newTotal: changeFlowNewBookingTotal,
             originalReceiptTotal: originalReceipt?.total ?? 0,
             audience: 'customer',
-          })
-        : totalPrice;
+          });
       const lines = [
         ...ticketLineItemsForChangeFlowDisplay.map((line) => ({
           label: line.category,
@@ -4722,8 +4495,7 @@ export function AdminChangeBookingFlow({
         roundingLabel: t('booking.rounding') || 'Rounding',
       });
 
-      const paymentIntent = isCustomerSelfServeChange
-        ? await createChangeBookingPaymentIntent(
+      const paymentIntent = await createChangeBookingPaymentIntent(
             (() => {
               const id = changeIntentIdForCheckout ?? latestChangeQuote?.changeIntentId;
               if (!id) {
@@ -4731,76 +4503,7 @@ export function AdminChangeBookingFlow({
               }
               return id;
             })()
-          )
-        : await createPaymentIntent({
-            productId: product.productId,
-            optionId: availabilityProductOptionId,
-            date: datePart,
-            time: timePart,
-            quantity: totalQuantity,
-            customerEmail: email,
-            customerFirstName: firstName.trim() || undefined,
-            customerLastName: lastName.trim() || undefined,
-            currency: currency,
-            travelerHotel: selectedPickupLocation?.name || undefined,
-            pickupLocationId: pickupLocationId || undefined,
-            itineraryDisplay: itineraryDisplay ?? undefined,
-            returnAvailabilityId: selectedReturnOption?.returnAvailabilityId,
-            promoCode: (lockedPromoCode || appliedPromoCode) || undefined,
-            cancellationPolicyId: cancellationPolicyId || undefined,
-            termsAcceptedAt: termsAcceptedAt ?? undefined,
-            checkoutBreakdown,
-            skipConfirmationCommunications: isAdmin && skipConfirmationCommunications ? true : undefined,
-            disableAutoCommunications: isAdmin && disableAutoCommunications ? true : undefined,
-            ...bookingSourceContext,
-          });
-
-      // Admin: show choice to pay now or confirm without payment (customer owes full balance)
-      if (isAdmin) {
-        const adminReservationRef =
-          initialValues?.bookingReference?.trim() ??
-          changeBookingReferenceForPaidFlow ??
-          '';
-        if (!adminReservationRef) {
-          throw new Error('Missing reservation reference for admin payment flow');
-        }
-        setError('');
-        setAdminChoiceData({
-          reservationReference: adminReservationRef,
-          reservationExpiration: undefined,
-          checkoutBreakdown,
-          totalAmount: amountDueForCheckout,
-          datePart,
-          timePart,
-          availabilityProductOptionId,
-          itineraryDisplay: itineraryDisplay ?? undefined,
-          clientSecret: paymentIntent.clientSecret ?? '',
-          ticketLinesForModal: ticketLineItemsForChangeFlowDisplay.map((line) => {
-            const rate = pricing.find((r) => r.category === line.category);
-            const breakdown = getPriceBreakdown(
-              line.category,
-              rate?.priceCAD ?? 0,
-              rate?.baseInDisplayCurrency,
-              rate?.appliedAdjustments ?? []
-            );
-            return { line, breakdown };
-          }),
-          feeLineItems: feeLineItemsWithAddOns,
-          returnPriceAdjustment: checkoutReturnLineAmount,
-          cancellationPolicyFee,
-          cancellationPolicyLabel: effectiveCancellationPolicyLabel,
-          subtotal: effectiveSubtotal,
-          tax: effectivePromoDiscountAmount > 0 ? effectiveTax : tax,
-          totalQuantity,
-          isTaxIncludedInPrice,
-          taxRate: pricingConfig?.taxRate ?? 0,
-          promoDiscountAmount: effectivePromoDiscountAmount > 0 ? effectivePromoDiscountAmount : 0,
-          discountLabel: appliedPromoCode ? `Promo: ${appliedPromoCode}` : (originalReceipt?.promoLabel || undefined),
-        });
-        setShowAdminPaymentChoice(true);
-        setLoading(false);
-        return;
-      }
+          );
 
       const ticketLinesForModal: CheckoutModalLineItem[] = ticketLineItemsForChangeFlowDisplay.map((line) => {
         const rate = pricing.find((r) => r.category === line.category);
@@ -4822,7 +4525,7 @@ export function AdminChangeBookingFlow({
         // Paid change: always return to stable ref+lastName + explicit intent (not reservationRef).
         // /manage-booking runs bounded refresh only when `from=change_payment` (see manage-booking page).
         successUrlOverride:
-          isCustomerSelfServeChange && changeBookingReferenceForPaidFlow
+          changeBookingReferenceForPaidFlow
             ? (() => {
                 const origin = typeof window !== 'undefined' ? window.location.origin : '';
                 const ref = encodeURIComponent(
@@ -4850,7 +4553,7 @@ export function AdminChangeBookingFlow({
         promoDiscountAmount: effectivePromoDiscountAmount > 0 ? effectivePromoDiscountAmount : 0,
         discountLabel: appliedPromoCode ? `Promo: ${appliedPromoCode}` : (originalReceipt?.promoLabel || undefined),
         changeTotals:
-          isCustomerSelfServeChange && originalReceipt
+          originalReceipt
             ? {
                 previousTotal: originalReceipt.total,
                 newTotal: displayChangeFlowProposedTotal,
@@ -4919,86 +4622,6 @@ export function AdminChangeBookingFlow({
     }
   };
 
-  const handleConfirmWithoutPayment = async () => {
-    if (!adminChoiceData) return;
-    setLoading(true);
-    setError('');
-    try {
-      const bookingSourceContext = buildBookingSourceContext(bookingSourceAttribution, {
-        clientChannelSource: inferClientBookingSourceFromProductIds(
-          product.productId,
-          adminChoiceData.availabilityProductOptionId,
-        ),
-        forcePartnerPortalChannel: partnerPortalBooking,
-        forceDashboardSource: bookingAppMode === 'provider-dashboard',
-      });
-      const result = await confirmBookingWithoutPayment({
-        reservationReference: adminChoiceData.reservationReference,
-        productId: product.productId,
-        optionId: adminChoiceData.availabilityProductOptionId,
-        date: adminChoiceData.datePart,
-        time: adminChoiceData.timePart,
-        customerEmail: email || undefined,
-        customerFirstName: firstName.trim() || undefined,
-        customerLastName: lastName.trim() || undefined,
-        currency: currency,
-        travelerHotel: product.pickupLocations?.find(loc => loc.id === pickupLocationId)?.name || undefined,
-        pickupLocationId: pickupLocationId || undefined,
-        itineraryDisplay: adminChoiceData.itineraryDisplay ?? undefined,
-        termsAcceptedAt: termsAcceptedAt ?? undefined,
-        skipConfirmationCommunications: skipConfirmationCommunications ? true : undefined,
-        disableAutoCommunications: disableAutoCommunications ? true : undefined,
-        checkoutBreakdown: adminChoiceData.checkoutBreakdown,
-        depositAmount: 0,
-        balanceAmount: adminChoiceData.totalAmount,
-        totalAmount: adminChoiceData.totalAmount,
-        ...bookingSourceContext,
-      });
-      pendingReservationRef.current = null;
-      const ref = formatBookingRefForDisplay(result.bookingReference);
-      const ln = lastName.trim();
-      setShowAdminPaymentChoice(false);
-      setAdminChoiceData(null);
-      onSuccess?.({ reservationReference: adminChoiceData.reservationReference });
-      if (onShowManage) {
-        onShowManage({ ref, lastName: ln });
-      } else {
-        const params = new URLSearchParams({ ref, lastName: ln, booking_complete: '1' });
-        window.location.href = `/manage-booking?${params.toString()}`;
-      }
-    } catch (err) {
-      setError(err instanceof Error ? err.message : 'Failed to confirm booking');
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  const handlePayNow = () => {
-    if (!adminChoiceData) return;
-    setShowAdminPaymentChoice(false);
-    setCheckoutClientSecret(adminChoiceData.clientSecret);
-    setCheckoutModalData({
-      reservationReference: adminChoiceData.reservationReference,
-      reservationExpiration: adminChoiceData.reservationExpiration,
-      customerLastName: lastName.trim(),
-      ticketLines: adminChoiceData.ticketLinesForModal,
-      feeLineItems: adminChoiceData.feeLineItems,
-      returnPriceAdjustment: adminChoiceData.returnPriceAdjustment,
-      cancellationPolicyFee: adminChoiceData.cancellationPolicyFee,
-      cancellationPolicyLabel: adminChoiceData.cancellationPolicyLabel,
-      subtotal: adminChoiceData.subtotal,
-      tax: adminChoiceData.tax,
-      total: adminChoiceData.totalAmount,
-      totalQuantity: adminChoiceData.totalQuantity,
-      isTaxIncludedInPrice: adminChoiceData.isTaxIncludedInPrice,
-      taxRate: adminChoiceData.taxRate,
-      promoDiscountAmount: adminChoiceData.promoDiscountAmount,
-      discountLabel: adminChoiceData.discountLabel,
-    });
-    setShowCheckoutModal(true);
-    setAdminChoiceData(null);
-  };
-
   if (activeOptions.length === 0) {
     return (
       <div className="flex items-center justify-center py-16">
@@ -5009,17 +4632,6 @@ export function AdminChangeBookingFlow({
 
   return (
     <div className="booking-flow-root space-y-8">
-      {/* Admin: choose to pay now or confirm without payment (full balance owed) */}
-      <AdminPaymentChoiceModal
-        open={!!(showAdminPaymentChoice && adminChoiceData)}
-        totalAmount={adminChoiceData?.totalAmount ?? 0}
-        currency={currency}
-        loading={loading}
-        error={error}
-        onPayNow={handlePayNow}
-        onConfirmWithoutPayment={handleConfirmWithoutPayment}
-        onCancel={() => { setShowAdminPaymentChoice(false); setAdminChoiceData(null); setError(''); }}
-      />
       {checkoutModalData && (
         <CheckoutModal
           open={showCheckoutModal}
@@ -5274,92 +4886,8 @@ export function AdminChangeBookingFlow({
                 currency={currency}
                 locale={locale}
                 t={t}
-                extraBetweenTaxAndTotal={
-                  <>
-                    {showProviderPricingInlineEditor && providerPricingUi?.error ? (
-                      <div className="mt-2 text-sm text-red-700">{providerPricingUi.error}</div>
-                    ) : null}
-                    {showProviderPricingInlineEditor &&
-                    providerPricingUi?.loading &&
-                    providerQuotedLines.length === 0 ? (
-                      <div className="mt-2 text-sm text-stone-500">Loading price lines...</div>
-                    ) : null}
-                    {showProviderPricingInlineEditor &&
-                    providerPricingUi?.helperText &&
-                    !providerPricingUi.error ? (
-                      <div className="mt-2 text-xs text-stone-500">{providerPricingUi.helperText}</div>
-                    ) : null}
-                  </>
-                }
-                extraBeforeSubtotal={
-                  showProviderPricingInlineEditor && (providerPricingUi?.additionalAdjustments?.length ?? 0) > 0 ? (
-                    <div className="space-y-1">
-                      {providerPricingUi?.additionalAdjustments?.map((adj) => (
-                        <div key={adj.id} className="flex items-center justify-between gap-2 text-sm">
-                          <div className="flex min-w-0 items-center gap-1">
-                            <button
-                              type="button"
-                              className="rounded border border-stone-300 px-1 text-xs text-stone-600 hover:bg-stone-100"
-                              onClick={() => providerPricingUi?.onRemoveAdditionalAdjustment?.(adj.id)}
-                            >
-                              -
-                            </button>
-                            <input
-                              type="text"
-                              className="w-40 rounded border border-stone-300 px-2 py-0.5 text-sm"
-                              placeholder="Line description"
-                              value={adj.label}
-                              onChange={(e) =>
-                                providerPricingUi?.onUpdateAdditionalAdjustment?.(adj.id, { label: e.target.value })
-                              }
-                            />
-                          </div>
-                          <div className="flex items-center gap-1">
-                            <select
-                              className="rounded border border-stone-300 px-1 py-0.5 text-xs"
-                              value={adj.mode}
-                              onChange={(e) =>
-                                providerPricingUi?.onUpdateAdditionalAdjustment?.(adj.id, {
-                                  mode: e.target.value as 'DISCOUNT' | 'CHARGE',
-                                })
-                              }
-                            >
-                              <option value="DISCOUNT">-</option>
-                              <option value="CHARGE">+</option>
-                            </select>
-                            <input
-                              type="text"
-                              inputMode="decimal"
-                              className="h-6 w-24 rounded border border-stone-300 bg-white px-2 py-0.5 text-right text-sm font-medium leading-none text-stone-700"
-                              placeholder="0.00"
-                              value={adj.amountInput}
-                              onChange={(e) =>
-                                providerPricingUi?.onUpdateAdditionalAdjustment?.(adj.id, {
-                                  amountInput: e.target.value,
-                                })
-                              }
-                            />
-                          </div>
-                        </div>
-                      ))}
-                      <button
-                        type="button"
-                        className="rounded border border-stone-300 px-2 py-0.5 text-xs text-stone-600 hover:bg-stone-100"
-                        onClick={() => providerPricingUi?.onAddAdditionalAdjustment?.()}
-                      >
-                        + add line item
-                      </button>
-                    </div>
-                  ) : showProviderPricingInlineEditor ? (
-                    <button
-                      type="button"
-                      className="rounded border border-stone-300 px-2 py-0.5 text-xs text-stone-600 hover:bg-stone-100"
-                      onClick={() => providerPricingUi?.onAddAdditionalAdjustment?.()}
-                    >
-                      + add line item
-                    </button>
-                  ) : undefined
-                }
+                extraBetweenTaxAndTotal={<></>}
+                extraBeforeSubtotal={undefined}
                 firstName={firstName}
                 lastName={lastName}
                 email={email}
@@ -5400,12 +4928,12 @@ export function AdminChangeBookingFlow({
                   setTermsAccepted(checked);
                   setTermsAcceptedAt(checked ? new Date().toISOString() : null);
                 }}
-                isAdmin={isAdmin}
+                isAdmin={false}
                 showCommunicationAdminSection={false}
-                skipConfirmationCommunications={skipConfirmationCommunications}
-                disableAutoCommunications={disableAutoCommunications}
-                onSkipConfirmationChange={setSkipConfirmationCommunications}
-                onDisableCommunicationsChange={setDisableAutoCommunications}
+                skipConfirmationCommunications={false}
+                disableAutoCommunications={false}
+                onSkipConfirmationChange={() => {}}
+                onDisableCommunicationsChange={() => {}}
                 error={checkoutFormError}
                 loading={loading}
                 totalQuantity={totalQuantity}
@@ -5413,7 +4941,6 @@ export function AdminChangeBookingFlow({
                 submitLabel={changeCheckoutButtonLabel ?? deferredInvoiceSubmitLabel}
                 hideSubmitButton={
                   showCheckoutModal ||
-                  showAdminPaymentChoice ||
                   !hasEffectiveChangeSelection ||
                   isChangeQuoteBlocked
                 }
@@ -5422,16 +4949,10 @@ export function AdminChangeBookingFlow({
                 attributionConfirmLabel={flowUi?.partnerAttributionConfirmLabel}
                 attributionConfirmed={partnerAttributionConfirmed}
                 onAttributionConfirmedChange={setPartnerAttributionConfirmed}
-                lineAmountInputs={showProviderPricingInlineEditor ? providerPricingUi?.lineAmountInputs : undefined}
-                onLineAmountInputChange={
-                  showProviderPricingInlineEditor ? providerPricingUi?.onLineAmountInputChange : undefined
-                }
-                onLineAmountInputBlur={
-                  showProviderPricingInlineEditor ? providerPricingUi?.onLineAmountInputBlur : undefined
-                }
-                onLineAmountReset={
-                  showProviderPricingInlineEditor ? providerPricingUi?.onLineAmountReset : undefined
-                }
+                lineAmountInputs={undefined}
+                onLineAmountInputChange={undefined}
+                onLineAmountInputBlur={undefined}
+                onLineAmountReset={undefined}
               />
             </>
           )}