@ticketboothapp/booking 1.2.63 → 1.2.65

package/src/components/booking/ChangeBookingFlow.tsx

@@ -7,7 +7,6 @@ import {
   getAvailabilities,
   cancelReservation,
   cancelReservationBestEffort,
-  createPaymentIntent,
   quoteChangeBooking,
   confirmFreeChangeBooking,
   createChangeBookingPaymentIntent,
@@ -62,10 +61,11 @@ import {
 } from '../../lib/booking/change-flow-pricing';
 import {
   mergePriceSummaryLinesForDrift,
+  mergeLineComparisonsWithFullDrift,
   normalizePricingDriftDetailFromQuote,
   normalizeTicketPricingTraceFromQuote,
   sumPriceSummaryLinesMajorUnits,
-  enrichLineComparisonsWithMergedRows,
+  computePricingDriftDelta,
 } from '../../lib/booking/change-booking-pricing-drift';
 import { ChangeBookingPricingDriftPanel } from './ChangeBookingPricingDriftPanel';
 import {
@@ -109,7 +109,6 @@ export type { ChangeBookingFlowProps } from './booking-flow-types';
  * `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.
- *
  */
 function mergeQuoteSliceWithServerPreview(
   slice: ReturnType<typeof sliceChangeQuoteForUi>,
@@ -631,7 +630,7 @@ function resolveInitialAvailabilityFromBooking(
 }
 
 /**
- * Customer self-serve **change booking** only (no standard new-booking paths).
+ * Customer **change booking** self-serve flow (`quoteChangeBooking`, Stripe).
  * Duplicated from {@link NewBookingFlow} intentionally so each flow can evolve independently.
  */
 export function ChangeBookingFlow({
@@ -679,6 +678,7 @@ export function ChangeBookingFlow({
     onShowManage,
     getSuccessUrl,
     suppressCalendarDateScroll,
+    mode: bookingAppMode,
   } = useBookingApp();
   const availabilitiesCache = useAvailabilitiesCache();
   const [availabilities, setAvailabilities] = useState<Availability[]>([]);
@@ -799,6 +799,9 @@ export function ChangeBookingFlow({
   }, [initialValues?.dateTime, companyTimezone]);
   /** Do not render catalog-/FE-derived dollar amounts in UI until `quoteChangeBooking` returns `serverDisplay`. */
   const suppressSelfServeCurrencyUi = true;
+  /** Self-serve change flow only (no provider/admin pricing paths). */
+  const isCustomerSelfServeChange = true;
+  const isAdmin = false;
 
   useEffect(() => {
     setPartnerAttributionConfirmed(false);
@@ -1790,27 +1793,27 @@ export function ChangeBookingFlow({
 
   const initialAddOnMinQtyByKey = useMemo(() => {
     const map = new Map<string, number>();
-    if (false) return map;
+    if (!isCustomerSelfServeChange) return map;
     for (const sel of initialAddOnBaselineSelections) {
       const key = `${sel.addOnId.trim()}::${sel.variantId?.trim() || ''}`;
       map.set(key, (map.get(key) ?? 0) + Math.max(1, Number(sel.quantity) || 1));
     }
     return map;
-  }, [true, initialAddOnBaselineSelections]);
+  }, [isCustomerSelfServeChange, initialAddOnBaselineSelections]);
 
   const initialAddOnMinTotalByAddOnId = useMemo(() => {
     const map = new Map<string, number>();
-    if (false) return map;
+    if (!isCustomerSelfServeChange) return map;
     for (const sel of initialAddOnBaselineSelections) {
       const addOnId = sel.addOnId.trim();
       map.set(addOnId, (map.get(addOnId) ?? 0) + Math.max(1, Number(sel.quantity) || 1));
     }
     return map;
-  }, [true, initialAddOnBaselineSelections]);
+  }, [isCustomerSelfServeChange, initialAddOnBaselineSelections]);
 
   const applyChangeFlowAddOnFloor = useCallback(
     (nextSelections: Array<{ addOnId: string; variantId?: string; quantity?: number }>) => {
-      if (false || initialAddOnMinQtyByKey.size === 0) return nextSelections;
+      if (!isCustomerSelfServeChange || initialAddOnMinQtyByKey.size === 0) return nextSelections;
       const qtyByKey = new Map<string, number>();
       for (const sel of nextSelections) {
         const key = `${sel.addOnId.trim()}::${sel.variantId?.trim() || ''}`;
@@ -1837,7 +1840,7 @@ export function ChangeBookingFlow({
         return { addOnId, variantId, quantity: qty };
       });
     },
-    [true, initialAddOnMinQtyByKey, initialAddOnMinTotalByAddOnId]
+    [isCustomerSelfServeChange, initialAddOnMinQtyByKey, initialAddOnMinTotalByAddOnId]
   );
 
   const updateAddOnSelections = useCallback(
@@ -2451,14 +2454,14 @@ export function ChangeBookingFlow({
     const options = selectedAvailability?.returnOptions ?? [];
     const serverReturnMap = latestChangeQuote?.serverPreview?.returnOptionPriceByReturnAvailabilityId;
     const floor = effectiveChangeFlowReturnUnitFloorPerPerson;
-    const applyReturnFloor = floor != null && true;
+    const applyReturnFloor = floor != null && isCustomerSelfServeChange;
     return options.map((opt) => {
       const vacancyCredit = changeFlowSeatCreditForReturnAvailabilityId(opt.returnAvailabilityId);
       const adjustedVacancies = Math.max(0, opt.vacancies ?? 0) + vacancyCredit;
       const rawPerPerson = opt.priceAdjustmentByCurrency?.[currency] ?? 0;
       const flooredPerPerson = applyReturnFloor ? Math.max(rawPerPerson, floor) : rawPerPerson;
       let perPerson = flooredPerPerson;
-      if (true && serverReturnMap && opt.returnAvailabilityId) {
+      if (isCustomerSelfServeChange && serverReturnMap && opt.returnAvailabilityId) {
         const sid = opt.returnAvailabilityId.trim();
         const sp = serverReturnMap[sid];
         if (sp != null && Number.isFinite(sp)) {
@@ -2481,7 +2484,7 @@ export function ChangeBookingFlow({
   }, [
     selectedAvailability?.returnOptions,
     effectiveChangeFlowReturnUnitFloorPerPerson,
-    true,
+    isCustomerSelfServeChange,
     currency,
     changeFlowSeatCreditForReturnAvailabilityId,
     latestChangeQuote?.serverPreview?.returnOptionPriceByReturnAvailabilityId,
@@ -2490,11 +2493,11 @@ export function ChangeBookingFlow({
   const selectedReturnOptionWithFloor = useMemo(() => {
     if (!selectedReturnOption) return selectedReturnOption;
     const floor = effectiveChangeFlowReturnUnitFloorPerPerson;
-    const applyReturnFloor = floor != null && true;
+    const applyReturnFloor = floor != null && isCustomerSelfServeChange;
     const rawPerPerson = selectedReturnOption.priceAdjustmentByCurrency?.[currency] ?? 0;
     let perPerson = rawPerPerson;
     const serverReturnMap = latestChangeQuote?.serverPreview?.returnOptionPriceByReturnAvailabilityId;
-    if (true && serverReturnMap && selectedReturnOption.returnAvailabilityId) {
+    if (isCustomerSelfServeChange && serverReturnMap && selectedReturnOption.returnAvailabilityId) {
       const sid = selectedReturnOption.returnAvailabilityId.trim();
       const sp = serverReturnMap[sid];
       if (sp != null && Number.isFinite(sp)) {
@@ -2515,7 +2518,7 @@ export function ChangeBookingFlow({
   }, [
     selectedReturnOption,
     effectiveChangeFlowReturnUnitFloorPerPerson,
-    true,
+    isCustomerSelfServeChange,
     currency,
     latestChangeQuote?.serverPreview?.returnOptionPriceByReturnAvailabilityId,
   ]);
@@ -2556,7 +2559,7 @@ export function ChangeBookingFlow({
   /** Quote `ticketUnitPriceByCategory` overrides catalog units for ticket rows (customer self-serve only). */
   const pricingForTicketSelector = useMemo(() => {
     const m = latestChangeQuote?.serverPreview?.ticketUnitPriceByCategory;
-    if (false || !m) return pricing;
+    if (!isCustomerSelfServeChange || !m) return pricing;
     return pricing.map((r) => {
       const u = m[r.category.toUpperCase()];
       if (u == null || !Number.isFinite(u)) return r;
@@ -2567,7 +2570,7 @@ export function ChangeBookingFlow({
         baseInDisplayCurrency: u,
       };
     });
-  }, [pricing, latestChangeQuote?.serverPreview?.ticketUnitPriceByCategory, true]);
+  }, [pricing, latestChangeQuote?.serverPreview?.ticketUnitPriceByCategory, isCustomerSelfServeChange]);
 
   // Price breakdown: mid-layer returns line items (base + one per rule/deal). UI renders each line; rate in brackets when used.
   const getPriceBreakdown = useCallback((category: string, priceCAD: number, baseInDisplayCurrency: number | undefined, appliedAdjustments: Array<{ type: string; id: string; name: string; changeByCurrency?: Record<string, number> }> = []): PriceBreakdownData | null => {
@@ -2672,7 +2675,7 @@ export function ChangeBookingFlow({
 
   // When return selection (or refreshed availabilities) caps the party below current ticket counts, trim tickets (non-admin).
   useEffect(() => {
-    if (false || !selectedAvailability) return;
+    if (isAdmin || !selectedAvailability) return;
     const cap = effectivePartySizeCap;
     if (totalQuantity <= cap) return;
     const over = totalQuantity - cap;
@@ -2700,7 +2703,7 @@ export function ChangeBookingFlow({
     effectivePartySizeCap,
     totalQuantity,
     selectedAvailability,
-    false,
+    isAdmin,
     changeBookingMinimumQuantities,
   ]);
 
@@ -2774,7 +2777,6 @@ export function ChangeBookingFlow({
    */
   const changeFlowProtectedReturnAdjustment = useMemo(() => {
     if (totalQuantity <= 0) return returnPriceAdjustment;
-    if (false) return returnPriceAdjustment;
     if (effectiveChangeFlowReturnUnitFloorPerPerson == null) return returnPriceAdjustment;
     const livePerPerson =
       returnOptionCatalogPerPerson ?? (selectedReturnOption?.priceAdjustmentByCurrency?.[currency] ?? 0);
@@ -2788,7 +2790,6 @@ export function ChangeBookingFlow({
   }, [
     totalQuantity,
     returnPriceAdjustment,
-    false,
     effectiveChangeFlowReturnUnitFloorPerPerson,
     selectedReturnOption,
     returnOptionCatalogPerPerson,
@@ -2799,7 +2800,7 @@ export function ChangeBookingFlow({
 
   /** Return row amount for PriceSummary, Stripe breakdown, and CheckoutModal (catalog vs protected same-product-option). */
   const checkoutReturnLineAmount = useMemo(() => {
-    if (true) {
+    if (isCustomerSelfServeChange) {
       return changeFlowProtectedReturnAdjustment;
     }
     if (changeFlowApplyReceiptPaidFloors) {
@@ -2807,7 +2808,7 @@ export function ChangeBookingFlow({
     }
     return returnPriceAdjustment;
   }, [
-    true,
+    isCustomerSelfServeChange,
     changeFlowApplyReceiptPaidFloors,
     changeFlowProtectedReturnAdjustment,
     returnPriceAdjustment,
@@ -2879,13 +2880,12 @@ export function ChangeBookingFlow({
     return [...feeLineItems, ...addOnLines];
   }, [feeLineItems, addOnSelections, addOns]);
 
+
   const checkoutPriceSummaryLines = useMemo((): PriceSummaryLine[] => {
     if (!selectedAvailability) return [];
     const returnLineAmount = checkoutReturnLineAmount;
-    /** Show row when a return is selected and either the priced amount is non-zero or a receipt return floor exists (catalog slot can be $0 while floored total is not). */
     const showReturnLine =
-      Boolean(selectedReturnOption) &&
-      (Math.abs(returnLineAmount) > 0.0005 || effectiveChangeFlowReturnUnitFloorPerPerson != null);
+      Boolean(selectedReturnOption) && Math.abs(returnLineAmount) > 0.0005;
     return [
       ...ticketLineItemsForChangeFlowDisplay.map((line): PriceSummaryLine => {
         const rate = pricing.find((r) => r.category === line.category);
@@ -2897,8 +2897,6 @@ export function ChangeBookingFlow({
         );
         return {
           kind: 'ticket',
-          lineKey: undefined,
-          editable: false,
           category: line.category,
           qty: line.qty,
           itemTotal: line.itemTotal,
@@ -2933,8 +2931,6 @@ export function ChangeBookingFlow({
             fee.name.toLowerCase().includes('license'));
         return {
           kind: 'line' as const,
-          lineKey: undefined,
-          editable: false,
           label: feeLineItems.some((f) => f.name === fee.name)
             ? `${fee.name} (${totalQuantity} ${totalQuantity === 1 ? 'person' : 'people'})`
             : fee.name,
@@ -2960,7 +2956,6 @@ export function ChangeBookingFlow({
     effectiveCancellationPolicyLabel,
     feeLineItemsWithAddOns,
     feeLineItems,
-    effectiveChangeFlowReturnUnitFloorPerPerson,
   ]);
 
   const checkoutPriceSummaryLinesForCheckout = useMemo(() => {
@@ -3131,7 +3126,45 @@ export function ChangeBookingFlow({
 
     const clientMappedFromApi = mapQuoteLineItemsToPriceSummaryLines(api?.clientLineItems);
     const useBeClientLines = clientMappedFromApi.length > 0;
-    const clientLinesForMerge = useBeClientLines ? clientMappedFromApi : checkoutPriceSummaryLines;
+    /**
+     * Checkout passes tax/discount via PriceSummary props, not always as `priceSummaryLines`. Include them here so
+     * drift rows and their sums align with `changeFlowNewBookingTotal` (subtotal + tax − promo).
+     */
+    const clientLinesForMerge: PriceSummaryLine[] = (() => {
+      if (useBeClientLines) return clientMappedFromApi;
+      const lines: PriceSummaryLine[] = [...checkoutPriceSummaryLines];
+      const hasTaxLine = lines.some(
+        (l) => l.kind === 'line' && String(l.type ?? '').toUpperCase() === 'TAX',
+      );
+      if (!hasTaxLine && !isTaxIncludedInPrice && Math.abs(effectiveTax) >= 0.005) {
+        lines.push({
+          kind: 'line',
+          label: t('booking.tax') !== 'booking.tax' ? t('booking.tax') : 'Taxes and fees',
+          amount: effectiveTax,
+          type: 'TAX',
+        });
+      }
+      const hasPromoSummaryLine = lines.some(
+        (l) =>
+          l.kind === 'line' &&
+          (/PROMO|DISCOUNT|VOUCHER|GIFT/i.test(String(l.type ?? '')) ||
+            (l.amount < -0.005 && /promo|discount/i.test(l.label))),
+      );
+      if (!hasPromoSummaryLine && Math.abs(effectivePromoDiscountAmount) >= 0.005) {
+        const trimmedPromoCode = appliedPromoCode?.trim() ?? '';
+        const promoLabel =
+          trimmedPromoCode.length > 0
+            ? `Promo: ${trimmedPromoCode}`
+            : originalReceipt?.promoLabel?.trim() || 'Discount';
+        lines.push({
+          kind: 'line',
+          label: promoLabel,
+          amount: -effectivePromoDiscountAmount,
+          type: 'PROMO_CODE',
+        });
+      }
+      return lines;
+    })();
 
     const serverMappedFromApi = mapQuoteLineItemsToPriceSummaryLines(api?.serverLineItems);
     const useBeServerLines = serverMappedFromApi.length > 0;
@@ -3175,14 +3208,35 @@ export function ChangeBookingFlow({
     }
 
     const mergedForDrift = mergePriceSummaryLinesForDrift(clientLinesForMerge, serverLinesForMerge);
-    let rows =
+    const rows =
       api?.lineComparisons && api.lineComparisons.length > 0
-        ? enrichLineComparisonsWithMergedRows(api.lineComparisons, mergedForDrift)
+        ? mergeLineComparisonsWithFullDrift(api.lineComparisons, mergedForDrift)
         : mergedForDrift;
 
+    const receiptAnchoring = api?.receiptAnchoring;
+    let driftRows = rows;
+    if (receiptAnchoring) {
+      const adj = roundMoney(
+        receiptAnchoring.reconciledTotalMajorUnits -
+          receiptAnchoring.requestedCatalogLineSumMajorUnits,
+      );
+      if (Math.abs(adj) >= 0.005) {
+        driftRows = [
+          ...rows,
+          {
+            key: 'meta:receipt-anchoring',
+            label: 'Receipt anchoring adjustment (BE only — not included in app total)',
+            clientAmount: null,
+            serverAmount: adj,
+            delta: computePricingDriftDelta(null, adj),
+          },
+        ];
+      }
+    }
+
     const hasTotalDelta = totalDelta != null && Math.abs(totalDelta) >= 0.005;
 
-    if (rows.length === 0 && !hasTotalDelta) {
+    if (driftRows.length === 0 && !hasTotalDelta) {
       return null;
     }
 
@@ -3211,7 +3265,7 @@ export function ChangeBookingFlow({
 
     return (
       <ChangeBookingPricingDriftPanel
-        rows={rows}
+        rows={driftRows}
         clientTotal={clientTotalForDrift}
         serverTotal={serverTotalFromQuote}
         totalDelta={totalDelta}
@@ -3219,6 +3273,7 @@ export function ChangeBookingFlow({
         locale={locale}
         ticketCartDetail={ticketCartDetail.length > 0 ? ticketCartDetail : undefined}
         serverTicketPricingTrace={latestChangeQuote.ticketPricingTrace ?? undefined}
+        receiptAnchoring={receiptAnchoring}
         footnote={
           usesBeLinePayload
             ? 'Lines use pricingDriftDetail.clientLineItems / serverLineItems when the quote includes them; totals prefer explicit major-unit fields, then sums of those lines, then the live cart / receipt preview.'
@@ -3237,6 +3292,12 @@ export function ChangeBookingFlow({
     locale,
     ticketLineItemsForChangeFlowDisplay,
     pricingForTicketSelector,
+    isTaxIncludedInPrice,
+    effectiveTax,
+    effectivePromoDiscountAmount,
+    appliedPromoCode,
+    originalReceipt?.promoLabel,
+    t,
   ]);
 
   /** Replaces PriceSummary with non-numeric status until quote returns authoritative totals (no FE dollar amounts). */
@@ -3398,8 +3459,7 @@ export function ChangeBookingFlow({
         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 ||
@@ -3429,28 +3489,25 @@ export function ChangeBookingFlow({
   const hasChangeSelection = changeSelectionDetails.hasChangesFromInitial;
 
   const changeFlowNeedsServerPrice =
-    true &&
     hasChangeSelection &&
     !!initialValues?.bookingReference?.trim() &&
     !!lastName.trim();
 
-  const isChangeQuoteBlocked = true && latestChangeQuote?.canProceed === false;
-  const requiresReturnInChangeFlow = true && !!initialValues?.returnAvailabilityId?.trim();
+  const isChangeQuoteBlocked = latestChangeQuote?.canProceed === false;
+  const requiresReturnInChangeFlow = !!initialValues?.returnAvailabilityId?.trim();
   const missingRequiredReturnSelection = requiresReturnInChangeFlow && !selectedReturnOption;
 
   const changeFlowSubmitDisabled =
     missingRequiredReturnSelection ||
-    (true &&
-      changeFlowNeedsServerPrice &&
+    (changeFlowNeedsServerPrice &&
       (changeQuoteLoading || (!latestChangeQuote && !changeQuoteFetchError)));
 
-  const providerTotalsPreview = null;
   const hasEffectiveChangeSelection = hasChangeSelection;
 
   const displayedChangeAmounts = resolveChangeFlowDisplayedAmounts({
-    providerPreview: providerTotalsPreview,
+    providerPreview: null,
     serverQuotePreview:
-      true && latestChangeQuote?.serverDisplay
+      latestChangeQuote?.serverDisplay
         ? latestChangeQuote.serverDisplay
         : null,
     fromCart: {
@@ -3466,7 +3523,7 @@ export function ChangeBookingFlow({
   const changeFlowClientEstimateDue = (() => {
     if (!originalReceipt) return totalPrice;
     // Customer self-serve: amount due comes from POST .../change/quote (`amountDueCents` / priceDiff), not FE delta math.
-    if (true && latestChangeQuote != null && !changeQuoteFetchError) {
+    if (latestChangeQuote != null && !changeQuoteFetchError) {
       return normalizeNearZeroOwed(latestChangeQuote.priceDiff);
     }
     return changeFlowBalanceVsOriginal({
@@ -3514,8 +3571,8 @@ export function ChangeBookingFlow({
   const checkoutFormError =
     (error || '') ||
     (missingRequiredReturnSelection ? 'Removing return option in self-serve is not available. Please contact support.' : '') ||
-    (true && isChangeQuoteBlocked ? (latestChangeQuote?.reasonIfBlocked ?? '') : '') ||
-    (true ? changeQuoteFetchError ?? '' : '');
+    (isChangeQuoteBlocked ? (latestChangeQuote?.reasonIfBlocked ?? '') : '') ||
+    (changeQuoteFetchError ?? '');
 
   const changeFlowSelectionPreview = useMemo((): ChangeFlowSelectionPreview | null => {
     if (!selectedAvailability || totalQuantity <= 0) return null;
@@ -3621,7 +3678,7 @@ export function ChangeBookingFlow({
 
   /** Debounced server quote so CTA + “amount owed” match PaymentIntent; avoids free confirm when FE estimate ≠ BE. */
   useEffect(() => {
-    if (false) {
+    if (!isCustomerSelfServeChange) {
       setChangeQuoteLoading(false);
       setChangeQuoteFetchError(null);
       setLatestChangeQuote(null);
@@ -3712,7 +3769,7 @@ export function ChangeBookingFlow({
       window.clearTimeout(timer);
     };
   }, [
-    true,
+    isCustomerSelfServeChange,
     hasChangeSelection,
     selectedAvailability,
     selectedAvailability?.dateTime,
@@ -3900,7 +3957,7 @@ export function ChangeBookingFlow({
     selectedAvailability,
     selectedReturnOption,
     companyTimezone,
-    false,
+    isAdmin,
     initialValues?.returnAvailabilityId,
     initialValues?.returnDateTime,
   ]);
@@ -3963,9 +4020,9 @@ export function ChangeBookingFlow({
     const firstWithInventory = dates.find((d) => {
       const rows = availabilitiesByDate[d] ?? [];
       if (rows.length === 0) return false;
-      if (false) return rows.some((a) => (a.vacancies ?? 0) > 0);
+      if (isAdmin) return rows.some((a) => (a.vacancies ?? 0) > 0);
       if (
-        true &&
+        isCustomerSelfServeChange &&
         changeFlowInitialTicketCount > 0
       ) {
         return rows.some(
@@ -3974,7 +4031,7 @@ export function ChangeBookingFlow({
       }
       return rows.some((a) => (a.vacancies ?? 0) > 0);
     });
-    const first = firstWithInventory ?? (false && dates[0] ? dates[0] : undefined);
+    const first = firstWithInventory ?? (isAdmin && dates[0] ? dates[0] : undefined);
     if (!first) return;
 
     hasAutoSelectedPartnerDateRef.current = true;
@@ -3997,8 +4054,8 @@ export function ChangeBookingFlow({
     selectedDate,
     dates,
     availabilitiesByDate,
-    false,
-    true,
+    isAdmin,
+    isCustomerSelfServeChange,
     changeFlowInitialTicketCount,
     getCalendarEffectiveOutboundVacancies,
     useWindowScroll,
@@ -4036,7 +4093,7 @@ export function ChangeBookingFlow({
   };
 
   const handleQuantityChange = (category: string, delta: number) => {
-    const maxAvailable = false ? Number.MAX_SAFE_INTEGER : effectivePartySizeCap;
+    const maxAvailable = isAdmin ? Number.MAX_SAFE_INTEGER : effectivePartySizeCap;
     const currentQty = quantities[category] || 0;
     const minQ =
       changeBookingMinimumQuantities != null
@@ -4044,7 +4101,7 @@ export function ChangeBookingFlow({
         : 0;
     const newQty = Math.max(minQ, currentQty + delta);
     // Admin can overbook; non-admin cannot exceed vacancies
-    if (delta > 0 && !false && orderSummary.totalQuantity >= maxAvailable) {
+    if (delta > 0 && !isAdmin && orderSummary.totalQuantity >= maxAvailable) {
       return;
     }
     setQuantities(prev => ({
@@ -4177,28 +4234,28 @@ export function ChangeBookingFlow({
       return;
     }
 
-    // Validate email (required)
-    if (!email) {
-      setError(t('booking.enterEmail') || 'Please enter your email address');
-      return;
-    }
+      // Validate email (required)
+      if (!email) {
+        setError(t('booking.enterEmail') || 'Please enter your email address');
+        return;
+      }
 
-    if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
-      setError(t('booking.invalidEmail') || 'Please enter a valid email address');
-      return;
-    }
+      if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
+        setError(t('booking.invalidEmail') || 'Please enter a valid email address');
+        return;
+      }
 
-    // Validate first name (required)
-    if (!firstName?.trim()) {
-      setError(t('booking.enterFirstName') || 'Please enter your first name');
-      return;
-    }
+      // Validate first name (required)
+      if (!firstName?.trim()) {
+        setError(t('booking.enterFirstName') || 'Please enter your first name');
+        return;
+      }
 
-    // Validate last name (required for manage booking lookup)
-    if (!lastName?.trim()) {
-      setError(t('booking.enterLastName') || 'Please enter your last name');
-      return;
-    }
+      // Validate last name (required for manage booking lookup)
+      if (!lastName?.trim()) {
+        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) {
@@ -4225,24 +4282,23 @@ export function ChangeBookingFlow({
         return;
       }
 
-
       const bookingSourceContext = buildBookingSourceContext(bookingSourceAttribution, {
         clientChannelSource: inferClientBookingSourceFromProductIds(
           product.productId,
           availabilityProductOptionId,
         ),
         forcePartnerPortalChannel: partnerPortalBooking,
-        forceDashboardSource: false,
+        forceDashboardSource: bookingAppMode === 'provider-dashboard',
       });
 
       // Get the hotel name if a pickup location was selected
       const selectedPickupLocation = pickupLocationId 
         ? product.pickupLocations?.find(loc => loc.id === pickupLocationId)
         : null;
+      let quotedPriceDiff: number | null = null;
       let changeIntentIdForCheckout: string | undefined;
       let changeBookingReferenceForPaidFlow: string | undefined;
 
-      {
         const changeBookingReference = initialValues?.bookingReference?.trim();
         const changeLastName = lastName.trim();
         if (!changeBookingReference || !changeLastName) {
@@ -4270,6 +4326,7 @@ export function ChangeBookingFlow({
           },
           currency
         );
+        quotedPriceDiff = quoteSlice.priceDiff;
         changeBookingReferenceForPaidFlow = changeBookingReference;
         changeIntentIdForCheckout = quoteSlice.changeIntentId ?? undefined;
         setLatestChangeQuote(
@@ -4329,13 +4386,12 @@ export function ChangeBookingFlow({
         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).
@@ -4362,10 +4418,10 @@ export function ChangeBookingFlow({
       // Backend will charge totalAmount and store this as the receipt so /manage matches.
       const taxForBreakdown = effectivePromoDiscountAmount > 0 ? effectiveTax : tax;
       const amountDueForCheckout = changeFlowBalanceVsOriginal({
-        newTotal: changeFlowNewBookingTotal,
-        originalReceiptTotal: originalReceipt?.total ?? 0,
-        audience: 'customer',
-      });
+            newTotal: changeFlowNewBookingTotal,
+            originalReceiptTotal: originalReceipt?.total ?? 0,
+            audience: 'customer',
+          });
       const lines = [
         ...ticketLineItemsForChangeFlowDisplay.map((line) => ({
           label: line.category,
@@ -4452,7 +4508,6 @@ export function ChangeBookingFlow({
             })()
           );
 
-
       const ticketLinesForModal: CheckoutModalLineItem[] = ticketLineItemsForChangeFlowDisplay.map((line) => {
         const rate = pricing.find((r) => r.category === line.category);
         const breakdown = getPriceBreakdown(
@@ -4473,7 +4528,7 @@ export function ChangeBookingFlow({
         // 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:
-          true && changeBookingReferenceForPaidFlow
+          changeBookingReferenceForPaidFlow
             ? (() => {
                 const origin = typeof window !== 'undefined' ? window.location.origin : '';
                 const ref = encodeURIComponent(
@@ -4501,7 +4556,7 @@ export function ChangeBookingFlow({
         promoDiscountAmount: effectivePromoDiscountAmount > 0 ? effectivePromoDiscountAmount : 0,
         discountLabel: appliedPromoCode ? `Promo: ${appliedPromoCode}` : (originalReceipt?.promoLabel || undefined),
         changeTotals:
-          true && originalReceipt
+          originalReceipt
             ? {
                 previousTotal: originalReceipt.total,
                 newTotal: displayChangeFlowProposedTotal,
@@ -4570,8 +4625,6 @@ export function ChangeBookingFlow({
     }
   };
 
-
-
   if (activeOptions.length === 0) {
     return (
       <div className="flex items-center justify-center py-16">
@@ -4655,12 +4708,12 @@ export function ChangeBookingFlow({
                 syncVisibleWeekToSelectedDate={true}
                 selectableSoldOutDate={changeFlowOriginalDate}
                 partySizeRequiredForCalendarSelection={
-                  true && !false && changeFlowInitialTicketCount > 0
+                  isCustomerSelfServeChange && !isAdmin && changeFlowInitialTicketCount > 0
                     ? changeFlowInitialTicketCount
                     : undefined
                 }
                 getEffectiveVacancies={
-                  true && !false && changeFlowInitialTicketCount > 0
+                  isCustomerSelfServeChange && !isAdmin && changeFlowInitialTicketCount > 0
                     ? getCalendarEffectiveOutboundVacancies
                     : undefined
                 }
@@ -4684,7 +4737,7 @@ export function ChangeBookingFlow({
                 earliestDate={earliestAvailabilityDate}
                 onVisibleRangeChange={handleVisibleRangeChange}
                 currency={currency}
-                showCapacity={false}
+                showCapacity={isAdmin}
                 extraDiscountPercent={calendarDiscountPercent}
                 capDiscountBadgesToBookingDate={changeFlowOriginalDate}
               />
@@ -4740,7 +4793,7 @@ export function ChangeBookingFlow({
               selectedTicketCount={totalQuantity}
               optionsMap={optionsMap}
               hasAnyMostPopular={hasAnyMostPopular}
-              isAdmin={false}
+              isAdmin={isAdmin}
               pickupLocationSkipped={pickupLocationSkipped}
               t={t}
               onTimeSelect={handleTimeSelect}
@@ -4756,7 +4809,7 @@ export function ChangeBookingFlow({
               companyTimezone={companyTimezone}
               currency={currency}
               locale={locale}
-              isAdmin={false}
+              isAdmin={isAdmin}
               t={t}
               onReturnSelect={(option) => {
                 const raw = selectedAvailability.returnOptions?.find(
@@ -4784,7 +4837,7 @@ export function ChangeBookingFlow({
               resourceCount={selectedReturnOption ? null : (selectedAvailability.resourceCount ?? null)}
               currency={currency}
               locale={locale}
-              isAdmin={false}
+              isAdmin={isAdmin}
               isSimplifiedPricingView={isSimplifiedPricingView}
               t={t}
               onQuantityChange={handleQuantityChange}
@@ -4806,7 +4859,7 @@ export function ChangeBookingFlow({
               currency={currency}
               locale={locale}
               onSelectionsChange={updateAddOnSelections}
-              minimumTotalByAddOnId={initialAddOnMinTotalByAddOnId}
+              minimumTotalByAddOnId={isCustomerSelfServeChange ? initialAddOnMinTotalByAddOnId : undefined}
               suppressPrices={false}
             />
           )}
@@ -4836,7 +4889,7 @@ export function ChangeBookingFlow({
                 currency={currency}
                 locale={locale}
                 t={t}
-                extraBetweenTaxAndTotal={undefined}
+                extraBetweenTaxAndTotal={<></>}
                 extraBeforeSubtotal={undefined}
                 firstName={firstName}
                 lastName={lastName}
@@ -4844,7 +4897,7 @@ export function ChangeBookingFlow({
                 onFirstNameChange={(v) => { setFirstName(v); setError(''); }}
                 onLastNameChange={(v) => { setLastName(v); setError(''); }}
                 onEmailChange={(v) => { setEmail(v); setError(''); }}
-                readOnlyContactFields={false}
+                readOnlyContactFields
                 pickupLocations={
                   selectedDate && product.pickupLocations && product.pickupLocations.length > 0
                     ? product.pickupLocations
@@ -4890,7 +4943,9 @@ export function ChangeBookingFlow({
                 onCheckout={handleCheckout}
                 submitLabel={changeCheckoutButtonLabel ?? deferredInvoiceSubmitLabel}
                 hideSubmitButton={
-                  showCheckoutModal || !hasEffectiveChangeSelection || isChangeQuoteBlocked
+                  showCheckoutModal ||
+                  !hasEffectiveChangeSelection ||
+                  isChangeQuoteBlocked
                 }
                 submitDisabled={changeFlowSubmitDisabled}
                 attributionSummary={flowUi?.partnerAttributionSummary}