@ticketboothapp/booking 1.2.55 → 1.2.58

package/src/components/booking/BookingFlow.tsx

@@ -76,6 +76,7 @@ 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 { BOOKING_FLOW_ABANDON_EVENT } from '../../providers/booking-dialog-provider';
 
 /** Live selection snapshot for change-booking compare UI (parent dialog). */
@@ -134,6 +135,14 @@ function extractTrailingQty(label: string): { baseLabel: string; qty: number } {
   return { baseLabel, qty };
 }
 
+function normalizeLineLabelForCompare(label: string): string {
+  return label
+    .toLowerCase()
+    .replace(/\([^)]*\)/g, '')
+    .replace(/[^a-z0-9]+/g, '')
+    .trim();
+}
+
 function deriveAddOnSelectionsFromReceiptLines(
   addOns: AddOn[],
   lines: Array<{ type?: string; label?: string; amount?: number; quantity?: number }>
@@ -308,6 +317,11 @@ interface BookingFlowProps {
   availabilityPricingProfileId?: string | null;
   /** When set (e.g. partner portal), get-availabilities filters cancellation policies by this profile. */
   availabilityCancellationPolicyProfileId?: string | null;
+  /**
+   * Provider dashboard: with `mode="change"`, submit via this callback instead of customer self-serve
+   * quote and payment (`quoteChangeBooking`, Stripe).
+   */
+  onChangeBooking?: (data: ProviderDashboardChangeBookingPayload) => Promise<void>;
 }
 
 function parseAvailabilityDateTime(value: string): Date {
@@ -602,7 +616,18 @@ export function BookingFlow({
   partnerPortalBooking = false,
   availabilityPricingProfileId,
   availabilityCancellationPolicyProfileId,
+  onChangeBooking,
 }: BookingFlowProps) {
+  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, strings: defaultStrings, analytics, catalog } = useBookingHost();
   const { t } = useTranslations();
   const { locale } = useLocale();
@@ -638,6 +663,8 @@ export function BookingFlow({
     changeWindowHoursBefore?: number | null;
   } | null>(null);
   const cancellationPolicyRef = useRef<HTMLDivElement>(null);
+  /** Dedupe parent updates from `onChangeFlowSelectionPreview` when serialized preview is unchanged. */
+  const lastChangeFlowPreviewKeyRef = useRef<string | null>(null);
   const [promoCodeValidating, setPromoCodeValidating] = useState(false);
   const [pickupLocationId, setPickupLocationId] = useState<string | null>(null);
   const [pickupLocationSkipped, setPickupLocationSkipped] = useState(false);
@@ -673,6 +700,8 @@ export function BookingFlow({
   const [precomputedPricesByOption, setPrecomputedPricesByOption] = useState<Record<string, PrecomputedPricesByCategory> | null>(null);
   const pricingConfigSetRef = useRef(false); // Track if pricingConfig has been set (optimize: only set once)
   const fetchingRef = useRef(false); // Prevent concurrent fetches
+  const hasLoadedAvailabilitiesRef = useRef(false); // First successful availability paint completed
+  const inFlightRangeRef = useRef<{ start: Date; end: Date } | null>(null); // Range currently being fetched
   const fetchedRangesRef = useRef<Array<{ start: Date; end: Date }>>([]); // Track fetched date ranges
   const pendingRangeRef = useRef<{ start: Date; end: Date } | null>(null); // Range to fetch when current fetch completes (user navigated during fetch)
   const [visibleRange, setVisibleRange] = useState<{ start: Date; end: Date } | null>(null);
@@ -737,6 +766,8 @@ export function BookingFlow({
   const hasAutoSelectedPartnerPickupRef = useRef(false);
   const handleDateSelectRef = useRef<(date: string) => void>(() => {});
   const isChangeFlow = mode === 'change';
+  const isProviderDashboardChange = Boolean(onChangeBooking);
+  const isCustomerSelfServeChange = isChangeFlow && !isProviderDashboardChange;
 
   useEffect(() => {
     setPartnerAttributionConfirmed(false);
@@ -746,12 +777,14 @@ export function BookingFlow({
    * user picks a different return time — baseline is the first auto-selected return for this outbound.
    */
   const [implicitReturnBaselineId, setImplicitReturnBaselineId] = useState<string | null>(null);
-  const lockedPromoCode = isChangeFlow
-    ? (initialValues?.promoCode?.trim().toUpperCase() || null)
-    : null;
-  /** Change booking: cannot reduce tickets below original counts (can still decrease after increasing). */
+  /** Any change flow (self-serve or provider): promo from booking is fixed — show read-only, never add new. */
+  const lockedPromoCode =
+    isChangeFlow && initialValues?.promoCode?.trim()
+      ? initialValues.promoCode.trim().toUpperCase()
+      : null;
+  /** Public self-serve only: cannot reduce tickets below original counts. */
   const changeBookingMinimumQuantities = useMemo(() => {
-    if (!isChangeFlow || !initialValues?.bookingItems?.length) return undefined;
+    if (!isCustomerSelfServeChange || !initialValues?.bookingItems?.length) return undefined;
     const m: Record<string, number> = {};
     for (const item of initialValues.bookingItems) {
       const key = item.category?.trim();
@@ -759,7 +792,7 @@ export function BookingFlow({
       m[key] = Math.max(0, Number(item.count) || 0);
     }
     return m;
-  }, [isChangeFlow, initialValues?.bookingItems]);
+  }, [isCustomerSelfServeChange, initialValues?.bookingItems]);
   const [adminChoiceData, setAdminChoiceData] = useState<{
     reservationReference: string;
     reservationExpiration?: string;
@@ -1068,6 +1101,14 @@ export function BookingFlow({
     async function fetchAvailabilities() {
       // Prevent concurrent fetches - store range to fetch when current one completes
       if (fetchingRef.current && visibleRange) {
+        const inFlight = inFlightRangeRef.current;
+        if (
+          inFlight &&
+          inFlight.start.getTime() === visibleRange.start.getTime() &&
+          inFlight.end.getTime() === visibleRange.end.getTime()
+        ) {
+          return;
+        }
         pendingRangeRef.current = { start: visibleRange.start, end: visibleRange.end };
         return;
       }
@@ -1119,6 +1160,9 @@ export function BookingFlow({
         const isStale = availabilitiesCache?.isStale(cached) ?? false;
         if (cacheCoversRange) {
           setAvailabilities(cached.availabilities);
+          if (cached.availabilities.length > 0) {
+            hasLoadedAvailabilitiesRef.current = true;
+          }
           if (cached.pricingConfig) {
             setPricingConfig(cached.pricingConfig);
             pricingConfigSetRef.current = true;
@@ -1137,6 +1181,9 @@ export function BookingFlow({
         }
         // Partial cache: show cached data immediately, then fetch missing range below
         setAvailabilities(cached.availabilities);
+        if (cached.availabilities.length > 0) {
+          hasLoadedAvailabilitiesRef.current = true;
+        }
         if (cached.pricingConfig) {
           setPricingConfig(cached.pricingConfig);
           pricingConfigSetRef.current = true;
@@ -1160,8 +1207,14 @@ export function BookingFlow({
       }
       
       const hasPartialCache = cached && cached.availabilities.length > 0;
+      const shouldUsePrimaryLoader =
+        !hasPartialCache && !hasLoadedAvailabilitiesRef.current;
       fetchingRef.current = true;
-      if (!hasPartialCache) setLoadingAvailabilities(true);
+      inFlightRangeRef.current = {
+        start: new Date(clampedStart),
+        end: new Date(clampedEnd),
+      };
+      if (shouldUsePrimaryLoader) setLoadingAvailabilities(true);
       else setIsFetchingMoreAvailabilities(true);
       
       try {
@@ -1218,6 +1271,9 @@ export function BookingFlow({
         
         const results = await Promise.all(availabilityPromises);
         const allFetchedAvailabilities = results.flatMap(r => r.availabilities);
+        if (allFetchedAvailabilities.length > 0) {
+          hasLoadedAvailabilitiesRef.current = true;
+        }
         setPrecomputedPricesByOption(prev => {
           const next = { ...(prev || {}) };
           results.forEach(r => {
@@ -1298,6 +1354,7 @@ export function BookingFlow({
         setLoadingAvailabilities(false);
         setIsFetchingMoreAvailabilities(false);
         fetchingRef.current = false;
+        inFlightRangeRef.current = null;
         // If user navigated during fetch, trigger fetch for the pending range
         const pending = pendingRangeRef.current;
         if (pending) {
@@ -1645,27 +1702,27 @@ export function BookingFlow({
 
   const initialAddOnMinQtyByKey = useMemo(() => {
     const map = new Map<string, number>();
-    if (!isChangeFlow) 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;
-  }, [isChangeFlow, initialAddOnBaselineSelections]);
+  }, [isCustomerSelfServeChange, initialAddOnBaselineSelections]);
 
   const initialAddOnMinTotalByAddOnId = useMemo(() => {
     const map = new Map<string, number>();
-    if (!isChangeFlow) 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;
-  }, [isChangeFlow, initialAddOnBaselineSelections]);
+  }, [isCustomerSelfServeChange, initialAddOnBaselineSelections]);
 
   const applyChangeFlowAddOnFloor = useCallback(
     (nextSelections: Array<{ addOnId: string; variantId?: string; quantity?: number }>) => {
-      if (!isChangeFlow || 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() || ''}`;
@@ -1692,7 +1749,7 @@ export function BookingFlow({
         return { addOnId, variantId, quantity: qty };
       });
     },
-    [isChangeFlow, initialAddOnMinQtyByKey, initialAddOnMinTotalByAddOnId]
+    [isCustomerSelfServeChange, initialAddOnMinQtyByKey, initialAddOnMinTotalByAddOnId]
   );
 
   const updateAddOnSelections = useCallback(
@@ -2016,7 +2073,7 @@ export function BookingFlow({
     [pricingConfig?.fees]
   );
 
-  const changeFlowTicketPriceFloorByCategory = useMemo(() => {
+  const changeFlowTicketBookedUnitPriceByCategory = useMemo(() => {
     if (!isChangeFlow || !originalReceipt?.lineItems?.length) return new Map<string, number>();
     const amountByCategory = new Map<string, number>();
     const qtyByCategory = new Map<string, number>();
@@ -2057,6 +2114,25 @@ export function BookingFlow({
     if (totalAmount <= 0 || totalQty <= 0) return null;
     return totalAmount / totalQty;
   }, [isChangeFlow, originalReceipt?.lineItems, initialValues?.bookingItems]);
+  const changeFlowBookedFeeUnitByNormalizedLabel = useMemo(() => {
+    const feeUnitByLabel = new Map<string, number>();
+    if (!isChangeFlow || !originalReceipt?.lineItems?.length) return feeUnitByLabel;
+    const fallbackBookedQty =
+      (initialValues?.bookingItems ?? []).reduce((sum, item) => sum + Math.max(0, Number(item.count) || 0), 0);
+    for (const line of originalReceipt.lineItems) {
+      const type = (line.type || '').trim().toUpperCase();
+      if (!line.label || type === 'TICKET' || type === 'RETURN_OPTION' || type === 'TAX') continue;
+      if (type.includes('PROMO') || type.includes('VOUCHER') || type.includes('GIFT')) continue;
+      const amount = Number(line.amount ?? 0);
+      const qtyRaw = Number(line.quantity ?? 0);
+      const qty = qtyRaw > 0 ? qtyRaw : fallbackBookedQty;
+      if (!Number.isFinite(amount) || !Number.isFinite(qty) || amount <= 0 || qty <= 0) continue;
+      const key = normalizeLineLabelForCompare(line.label);
+      if (!key) continue;
+      feeUnitByLabel.set(key, amount / qty);
+    }
+    return feeUnitByLabel;
+  }, [isChangeFlow, originalReceipt?.lineItems, initialValues?.bookingItems]);
 
   const returnOptionsWithFloor = useMemo(() => {
     const options = selectedAvailability?.returnOptions ?? [];
@@ -2130,13 +2206,11 @@ export function BookingFlow({
       const backendInDisplayCurrency = rate.priceByCurrency?.[currency] ?? (currency === 'CAD' ? backendPriceCAD : 0);
       const baseInDisplayCurrency = getBaseInDisplayCurrency(rate.category);
       const built = buildRate(rate.category, backendPriceCAD, backendInDisplayCurrency, baseInDisplayCurrency, rate.appliedAdjustments ?? rate.applied_adjustments ?? []);
-      const floorUnitPrice = changeFlowTicketPriceFloorByCategory.get(rate.category.toUpperCase());
-      const price = floorUnitPrice != null ? Math.max(built.price, floorUnitPrice) : built.price;
       return {
         category: rate.category,
         rateId: rate.rateId || rate.category,
         available: rate.available,
-        price,
+        price: built.price,
         priceCAD: built.priceCAD,
         baseInDisplayCurrency: built.baseInDisplayCurrency,
         appliedAdjustments: built.appliedAdjustments,
@@ -2146,19 +2220,17 @@ export function BookingFlow({
       const baseInDisplayCurrency = getBaseInDisplayCurrency(p.category);
       const backendInDisplayCurrency = currency === 'CAD' ? priceCADFromApi : 0;
       const built = buildRate(p.category, priceCADFromApi, backendInDisplayCurrency, baseInDisplayCurrency, []);
-      const floorUnitPrice = changeFlowTicketPriceFloorByCategory.get(p.category.toUpperCase());
-      const price = floorUnitPrice != null ? Math.max(built.price, floorUnitPrice) : built.price;
       return {
         category: p.category,
         rateId: p.category,
         available: selectedAvailability.vacancies,
-        price,
+        price: built.price,
         priceCAD: built.priceCAD,
         baseInDisplayCurrency: built.baseInDisplayCurrency,
         appliedAdjustments: built.appliedAdjustments,
       };
     }) || [];
-  }, [selectedAvailability, currency, hasFees, pricingConfig, precomputedPricesByOption, activeOptions, isSimplifiedPricingView, changeFlowTicketPriceFloorByCategory]);
+  }, [selectedAvailability, currency, hasFees, pricingConfig, precomputedPricesByOption, activeOptions, isSimplifiedPricingView]);
 
   // 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 => {
@@ -2194,6 +2266,51 @@ export function BookingFlow({
     [quantities, pricing, selectedReturnOptionWithFloor, pricingConfig, currency, hasFees, cancellationPolicyId]
   );
   const { totalQuantity, subtotal, tax, total: totalFromSummary, feeLineItems, returnPriceAdjustment, cancellationPolicyFee, isTaxIncludedInPrice, ticketLineItems } = orderSummary;
+  const changeFlowInitialTicketQtyByCategory = useMemo(() => {
+    const qtyByCategory = new Map<string, number>();
+    if (!isChangeFlow || !initialValues?.bookingItems?.length) return qtyByCategory;
+    for (const item of initialValues.bookingItems) {
+      const category = item.category?.trim().toUpperCase();
+      if (!category) continue;
+      qtyByCategory.set(category, Math.max(0, Number(item.count) || 0));
+    }
+    return qtyByCategory;
+  }, [isChangeFlow, initialValues?.bookingItems]);
+  const changeFlowPreserveBookedTicketPricing = useMemo(() => {
+    if (!isChangeFlow || !selectedAvailability || !initialValues?.dateTime) return false;
+    const selectedMs = parseAvailabilityDateTime(selectedAvailability.dateTime).getTime();
+    const initialMs = parseAvailabilityDateTime(initialValues.dateTime).getTime();
+    if (selectedMs !== initialMs) return false;
+    const selectedOptionId = selectedAvailability.productOptionId?.trim() || null;
+    const initialOptionId = initialValues.productOptionId?.trim() || null;
+    // If option IDs are missing, still protect pricing when date/time is unchanged.
+    if (!selectedOptionId || !initialOptionId) return true;
+    return selectedOptionId === initialOptionId;
+  }, [isChangeFlow, selectedAvailability, initialValues?.dateTime, initialValues?.productOptionId]);
+  const changeFlowProtectedTicketSubtotal = useMemo(() => {
+    const currentTicketSubtotal = ticketLineItems.reduce(
+      (sum, line) => sum + Math.max(0, Number(line.itemTotal) || 0),
+      0,
+    );
+    if (!changeFlowPreserveBookedTicketPricing) return currentTicketSubtotal;
+    return ticketLineItems.reduce((sum, line) => {
+      const category = line.category?.trim().toUpperCase();
+      const qty = Math.max(0, Number(line.qty) || 0);
+      const liveUnitPrice = qty > 0 ? line.itemTotal / qty : 0;
+      if (!category || qty <= 0) return sum;
+      const bookedUnitPrice = changeFlowTicketBookedUnitPriceByCategory.get(category);
+      if (bookedUnitPrice == null) return sum + line.itemTotal;
+      const baselineQty = Math.max(0, changeFlowInitialTicketQtyByCategory.get(category) ?? 0);
+      const protectedQty = Math.min(qty, baselineQty);
+      const incrementalQty = Math.max(0, qty - baselineQty);
+      return sum + protectedQty * bookedUnitPrice + incrementalQty * liveUnitPrice;
+    }, 0);
+  }, [
+    changeFlowPreserveBookedTicketPricing,
+    ticketLineItems,
+    changeFlowTicketBookedUnitPriceByCategory,
+    changeFlowInitialTicketQtyByCategory,
+  ]);
   /** Round-trip party limit: both legs must fit — use the tighter of outbound vs return vacancies. */
   const effectivePartySizeCap = useMemo(() => {
     if (!selectedAvailability) return 0;
@@ -2257,7 +2374,63 @@ export function BookingFlow({
   }, [addOnSelections, addOns]);
 
   // Effective subtotal includes add-ons (for promo discount and total)
-  const effectiveSubtotal = subtotal + addOnTotal;
+  const currentTicketSubtotal = useMemo(
+    () => ticketLineItems.reduce((sum, line) => sum + Math.max(0, Number(line.itemTotal) || 0), 0),
+    [ticketLineItems],
+  );
+  const changeFlowInitialTotalTicketQty = useMemo(() => {
+    let sum = 0;
+    for (const qty of changeFlowInitialTicketQtyByCategory.values()) sum += qty;
+    return sum;
+  }, [changeFlowInitialTicketQtyByCategory]);
+  const currentFeeSubtotal = useMemo(
+    () => feeLineItems.reduce((sum, line) => sum + Math.max(0, Number(line.totalAmount) || 0), 0),
+    [feeLineItems],
+  );
+  const changeFlowProtectedFeeSubtotal = useMemo(() => {
+    if (!changeFlowPreserveBookedTicketPricing || totalQuantity <= 0) return currentFeeSubtotal;
+    return feeLineItems.reduce((sum, line) => {
+      const key = normalizeLineLabelForCompare(line.name || '');
+      const currentUnitPrice = line.totalAmount / totalQuantity;
+      const bookedUnitPrice = key ? changeFlowBookedFeeUnitByNormalizedLabel.get(key) : null;
+      if (bookedUnitPrice == null) return sum + line.totalAmount;
+      const protectedQty = Math.min(totalQuantity, changeFlowInitialTotalTicketQty);
+      const incrementalQty = Math.max(0, totalQuantity - changeFlowInitialTotalTicketQty);
+      return sum + protectedQty * bookedUnitPrice + incrementalQty * currentUnitPrice;
+    }, 0);
+  }, [
+    changeFlowPreserveBookedTicketPricing,
+    totalQuantity,
+    currentFeeSubtotal,
+    feeLineItems,
+    changeFlowBookedFeeUnitByNormalizedLabel,
+    changeFlowInitialTotalTicketQty,
+  ]);
+  const changeFlowProtectedReturnAdjustment = useMemo(() => {
+    if (!changeFlowPreserveBookedTicketPricing || totalQuantity <= 0) return returnPriceAdjustment;
+    if (changeFlowReturnUnitFloorPerPerson == null) return returnPriceAdjustment;
+    const currentUnitPrice = returnPriceAdjustment / totalQuantity;
+    const protectedQty = Math.min(totalQuantity, changeFlowInitialTotalTicketQty);
+    const incrementalQty = Math.max(0, totalQuantity - changeFlowInitialTotalTicketQty);
+    return protectedQty * changeFlowReturnUnitFloorPerPerson + incrementalQty * currentUnitPrice;
+  }, [
+    changeFlowPreserveBookedTicketPricing,
+    totalQuantity,
+    returnPriceAdjustment,
+    changeFlowReturnUnitFloorPerPerson,
+    changeFlowInitialTotalTicketQty,
+  ]);
+  const effectiveSubtotalBeforeAddOns =
+    isChangeFlow && changeFlowPreserveBookedTicketPricing
+      ? subtotal -
+        currentTicketSubtotal -
+        currentFeeSubtotal -
+        returnPriceAdjustment +
+        changeFlowProtectedTicketSubtotal +
+        changeFlowProtectedFeeSubtotal +
+        changeFlowProtectedReturnAdjustment
+      : subtotal;
+  const effectiveSubtotal = effectiveSubtotalBeforeAddOns + addOnTotal;
 
   /** Stable signature for promo discount API (avoid effect re-fire on object identity churn). */
   const quantitiesSignature = useMemo(
@@ -2289,6 +2462,30 @@ export function BookingFlow({
     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 && isChangeFlow && (
+      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 [];
     return [
@@ -2302,6 +2499,13 @@ export function BookingFlow({
         );
         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,
@@ -2336,6 +2540,25 @@ export function BookingFlow({
             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,
@@ -2362,6 +2585,8 @@ export function BookingFlow({
     effectiveCancellationPolicyLabel,
     feeLineItemsWithAddOns,
     feeLineItems,
+    showProviderPricingInlineEditor,
+    providerEditableLineByNormalizedLabel,
   ]);
 
   // Promo discount from backend (order-level only; rates are pre-promo)
@@ -2493,10 +2718,30 @@ export function BookingFlow({
     : totalPrice;
   const changeSelectionDetails = useMemo(() => {
     if (!isChangeFlow || !initialValues) {
-      return { hasChangesFromInitial: true, dateChanged: false, ticketsChanged: false };
+      return {
+        hasChangesFromInitial: true,
+        hasOperationalChangesFromInitial: true,
+        dateChanged: false,
+        ticketsChanged: false,
+        optionChanged: false,
+        pickupChanged: false,
+        countsChanged: false,
+        addOnsChanged: false,
+        returnChanged: false,
+      };
     }
     if (!selectedAvailability) {
-      return { hasChangesFromInitial: false, dateChanged: false, ticketsChanged: false };
+      return {
+        hasChangesFromInitial: false,
+        hasOperationalChangesFromInitial: false,
+        dateChanged: false,
+        ticketsChanged: false,
+        optionChanged: false,
+        pickupChanged: false,
+        countsChanged: false,
+        addOnsChanged: false,
+        returnChanged: false,
+      };
     }
     const initialMs = initialValues.dateTime ? parseAvailabilityDateTime(initialValues.dateTime).getTime() : null;
     const selectedMs = parseAvailabilityDateTime(selectedAvailability.dateTime).getTime();
@@ -2508,7 +2753,13 @@ export function BookingFlow({
     const optionChanged = Boolean(
       initialOpt && selectedOpt && initialOpt !== selectedOpt
     );
-    const pickupChanged = (initialValues.pickupLocationId ?? null) !== (pickupLocationId ?? null);
+    const normalizePickupId = (value: string | null | undefined) => {
+      const trimmed = value?.trim();
+      return trimmed ? trimmed : null;
+    };
+    const pickupChanged =
+      normalizePickupId(initialValues.pickupLocationId ?? null) !==
+      normalizePickupId(pickupLocationId ?? null);
     const normalizeCounts = (items: Array<{ category: string; count: number }> | null | undefined) => {
       const map = new Map<string, number>();
       for (const item of items ?? []) {
@@ -2554,7 +2805,16 @@ export function BookingFlow({
     let returnChanged = false;
     if (hasReturnOptions && selectedReturnOption) {
       if (initialReturnId && selectedReturnId) {
-        returnChanged = initialReturnId !== selectedReturnId;
+        if (initialReturnId === selectedReturnId) {
+          returnChanged = false;
+        } else if (initialReturnDt && selectedReturnDt) {
+          // Some refreshes can rotate return availability IDs for the same departure time.
+          returnChanged =
+            parseAvailabilityDateTime(initialReturnDt).getTime() !==
+            parseAvailabilityDateTime(selectedReturnDt).getTime();
+        } else {
+          returnChanged = true;
+        }
       } else if (initialReturnDt && selectedReturnDt) {
         returnChanged =
           parseAvailabilityDateTime(initialReturnDt).getTime() !==
@@ -2571,9 +2831,22 @@ export function BookingFlow({
         countsChanged ||
         addOnsChanged ||
         returnChanged,
+      // Authoritative for "real user change" gating in provider dashboard:
+      // ignore option-id noise and only consider user-visible booking deltas.
+      hasOperationalChangesFromInitial:
+        dateChanged ||
+        pickupChanged ||
+        countsChanged ||
+        addOnsChanged ||
+        returnChanged,
       dateChanged,
       // Tickets line corresponds to "option + ticket counts"; add-ons and pickup changes affect itinerary but not the ticket label.
       ticketsChanged: Boolean(optionChanged || countsChanged),
+      optionChanged,
+      pickupChanged,
+      countsChanged,
+      addOnsChanged,
+      returnChanged,
     };
   }, [
     isChangeFlow,
@@ -2586,25 +2859,72 @@ export function BookingFlow({
     addOnSelections,
     initialAddOnMinQtyByKey,
   ]);
-  const hasChangeSelection = changeSelectionDetails.hasChangesFromInitial;
+  const hasChangeSelection =
+    isProviderDashboardChange
+      ? changeSelectionDetails.hasOperationalChangesFromInitial
+      : changeSelectionDetails.hasChangesFromInitial;
 
   const changeFlowNeedsServerPrice =
-    isChangeFlow &&
+    isCustomerSelfServeChange &&
     hasChangeSelection &&
     !!initialValues?.bookingReference?.trim() &&
     !!lastName.trim();
 
-  const isChangeQuoteBlocked = isChangeFlow && latestChangeQuote?.canProceed === false;
-  const requiresReturnInChangeFlow = isChangeFlow && !!initialValues?.returnAvailabilityId?.trim();
+  const isChangeQuoteBlocked = isCustomerSelfServeChange && latestChangeQuote?.canProceed === false;
+  const requiresReturnInChangeFlow = isCustomerSelfServeChange && !!initialValues?.returnAvailabilityId?.trim();
   const missingRequiredReturnSelection = requiresReturnInChangeFlow && !selectedReturnOption;
 
   const changeFlowSubmitDisabled =
     isChangeFlow &&
     (missingRequiredReturnSelection ||
-      (changeFlowNeedsServerPrice && (changeQuoteLoading || (!latestChangeQuote && !changeQuoteFetchError))));
+      (isCustomerSelfServeChange &&
+        changeFlowNeedsServerPrice &&
+        (changeQuoteLoading || (!latestChangeQuote && !changeQuoteFetchError))));
+
+  const providerTotalsPreview =
+    showProviderPricingInlineEditor && providerPricingUi?.totalsPreview
+      ? providerPricingUi.totalsPreview
+      : null;
+  const displayChangeFlowProposedTotal = providerTotalsPreview
+    ? providerTotalsPreview.totalAmount
+    : changeFlowProposedTotal;
+  const displayChangeFlowSubtotal = providerTotalsPreview
+    ? providerTotalsPreview.subtotalBeforeTax
+    : effectiveSubtotal;
+  const displayChangeFlowTax = providerTotalsPreview
+    ? providerTotalsPreview.taxAmount
+    : effectiveTax;
+  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 changeFlowClientEstimateDue = originalReceipt
-    ? Math.max(changeFlowProposedTotal - originalReceipt.total, 0)
+    ? (isProviderDashboardChange
+        ? displayChangeFlowProposedTotal - originalReceipt.total
+        : Math.max(displayChangeFlowProposedTotal - originalReceipt.total, 0))
     : totalPrice;
 
   /**
@@ -2612,12 +2932,24 @@ export function BookingFlow({
    * Quote is still required before submit (session + canProceed); `clientProposedTotal` on quote keeps BE in sync.
    */
   const changeFlowAmountDueRaw = isChangeFlow ? changeFlowClientEstimateDue : totalPrice;
-  const changeFlowAmountDue =
-    isChangeFlow ? Math.round(changeFlowAmountDueRaw * 100) / 100 : changeFlowAmountDueRaw;
+  const changeFlowAmountDue = isChangeFlow
+    ? (() => {
+        const rounded = Math.round(changeFlowAmountDueRaw * 100) / 100;
+        return Math.abs(rounded) < 0.01 ? 0 : rounded;
+      })()
+    : changeFlowAmountDueRaw;
 
   const changeCheckoutButtonLabel = (() => {
     if (!isChangeFlow) return undefined;
-    if (!hasChangeSelection) return undefined;
+    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');
@@ -2653,8 +2985,39 @@ export function BookingFlow({
   const checkoutFormError =
     (error || '') ||
     (missingRequiredReturnSelection ? 'Removing return option in self-serve is not available. Please contact support.' : '') ||
-    (isChangeQuoteBlocked ? (latestChangeQuote?.reasonIfBlocked ?? '') : '') ||
-    (changeQuoteFetchError ?? '');
+    (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)
+      : [];
 
   const changeFlowSelectionPreview = useMemo((): ChangeFlowSelectionPreview | null => {
     if (!isChangeFlow) return null;
@@ -2692,8 +3055,29 @@ export function BookingFlow({
   ]);
 
   useEffect(() => {
-    if (!isChangeFlow || !onChangeFlowSelectionPreview) return;
-    onChangeFlowSelectionPreview(changeFlowSelectionPreview);
+    if (!isChangeFlow) {
+      lastChangeFlowPreviewKeyRef.current = null;
+      return;
+    }
+    if (!onChangeFlowSelectionPreview) return;
+    const next = changeFlowSelectionPreview;
+    const key =
+      next === null
+        ? 'null'
+        : JSON.stringify({
+            tourName: next.tourName,
+            dateTime: next.dateTime,
+            ticketsLine: next.ticketsLine,
+            itinerarySteps: next.itinerarySteps,
+            dateChanged: next.dateChanged,
+            ticketsChanged: next.ticketsChanged,
+            hasChangesFromInitial: next.hasChangesFromInitial,
+            selectionTotal: next.selectionTotal,
+            selectionCurrency: next.selectionCurrency,
+          });
+    if (key === lastChangeFlowPreviewKeyRef.current) return;
+    lastChangeFlowPreviewKeyRef.current = key;
+    onChangeFlowSelectionPreview(next);
   }, [isChangeFlow, changeFlowSelectionPreview, onChangeFlowSelectionPreview]);
 
   useEffect(() => {
@@ -2721,9 +3105,10 @@ export function BookingFlow({
 
   /** Debounced server quote so CTA + “amount owed” match PaymentIntent; avoids free confirm when FE estimate ≠ BE. */
   useEffect(() => {
-    if (!isChangeFlow) {
+    if (!isCustomerSelfServeChange) {
       setChangeQuoteLoading(false);
       setChangeQuoteFetchError(null);
+      setLatestChangeQuote(null);
       return;
     }
 
@@ -2803,7 +3188,7 @@ export function BookingFlow({
       window.clearTimeout(timer);
     };
   }, [
-    isChangeFlow,
+    isCustomerSelfServeChange,
     hasChangeSelection,
     selectedAvailability,
     selectedAvailability?.dateTime,
@@ -3313,31 +3698,33 @@ export function BookingFlow({
       setError('Removing return option in self-serve is not available. Please contact support.');
       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;
-    }
 
-    // Validate first name (required)
-    if (!firstName?.trim()) {
-      setError(t('booking.enterFirstName') || 'Please enter your first name');
-      return;
-    }
+    const skipContactFields = isProviderDashboardChange && isChangeFlow;
+    if (!skipContactFields) {
+      // Validate email (required)
+      if (!email) {
+        setError(t('booking.enterEmail') || 'Please enter your email address');
+        return;
+      }
 
-    // Validate last name (required for manage booking lookup)
-    if (!lastName?.trim()) {
-      setError(t('booking.enterLastName') || 'Please enter your last name');
-      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 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) {
       setError(t('booking.selectPickupLocation'));
@@ -3363,6 +3750,39 @@ export function BookingFlow({
         return;
       }
 
+      if (onChangeBooking && isChangeFlow) {
+        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,
+        });
+        setLoading(false);
+        return;
+      }
+
       const bookingSourceContext = buildBookingSourceContext(bookingSourceAttribution, {
         clientChannelSource: inferClientBookingSourceFromProductIds(
           product.productId,
@@ -3380,7 +3800,7 @@ export function BookingFlow({
       let changeIntentIdForCheckout: string | undefined;
       let changeBookingReferenceForPaidFlow: string | undefined;
 
-      if (isChangeFlow) {
+      if (isCustomerSelfServeChange) {
         const changeBookingReference = initialValues?.bookingReference?.trim();
         const changeLastName = lastName.trim();
         if (!changeBookingReference || !changeLastName) {
@@ -3526,7 +3946,7 @@ export function BookingFlow({
       // 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 = isChangeFlow
+      const amountDueForCheckout = isCustomerSelfServeChange
         ? Math.max(0, changeFlowProposedTotal - (originalReceipt?.total ?? 0))
         : totalPrice;
       const lines = [
@@ -3648,7 +4068,7 @@ export function BookingFlow({
         return;
       }
 
-      const paymentIntent = isChangeFlow
+      const paymentIntent = isCustomerSelfServeChange
         ? await createChangeBookingPaymentIntent(
             (() => {
               const id = changeIntentIdForCheckout ?? latestChangeQuote?.changeIntentId;
@@ -3785,7 +4205,7 @@ export function BookingFlow({
         // 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:
-          isChangeFlow && changeBookingReferenceForPaidFlow
+          isCustomerSelfServeChange && changeBookingReferenceForPaidFlow
             ? (() => {
                 const origin = typeof window !== 'undefined' ? window.location.origin : '';
                 const ref = encodeURIComponent(
@@ -3813,7 +4233,7 @@ export function BookingFlow({
         promoDiscountAmount: effectivePromoDiscountAmount > 0 ? effectivePromoDiscountAmount : 0,
         discountLabel: appliedPromoCode ? `Promo: ${appliedPromoCode}` : (originalReceipt?.promoLabel || undefined),
         changeTotals:
-          isChangeFlow && originalReceipt
+          isCustomerSelfServeChange && originalReceipt
             ? {
                 previousTotal: originalReceipt.total,
                 newTotal: totalPrice,
@@ -4109,7 +4529,7 @@ export function BookingFlow({
                 currency={currency}
                 showCapacity={isAdmin}
                 extraDiscountPercent={calendarDiscountPercent}
-                capDiscountToSelectedDate={isChangeFlow && changeFlowTicketPriceFloorByCategory.size > 0}
+                capDiscountToSelectedDate={isChangeFlow && changeFlowTicketBookedUnitPriceByCategory.size > 0}
               />
             </div>
           </div>
@@ -4235,7 +4655,7 @@ export function BookingFlow({
               t={t}
               onQuantityChange={handleQuantityChange}
               minimumQuantities={changeBookingMinimumQuantities}
-              ticketUnitFloorByCategory={isChangeFlow ? changeFlowTicketPriceFloorByCategory : undefined}
+              ticketUnitFloorByCategory={isChangeFlow ? changeFlowTicketBookedUnitPriceByCategory : undefined}
             />
           )}
 
@@ -4247,48 +4667,71 @@ export function BookingFlow({
               currency={currency}
               locale={locale}
               onSelectionsChange={updateAddOnSelections}
-              minimumTotalByAddOnId={isChangeFlow ? initialAddOnMinTotalByAddOnId : undefined}
+              minimumTotalByAddOnId={isCustomerSelfServeChange ? initialAddOnMinTotalByAddOnId : undefined}
             />
           )}
 
           {/* Total and Checkout — shared PriceSummary component */}
           {selectedAvailability && (
             <CheckoutForm
-              priceSummaryLines={checkoutPriceSummaryLines}
-              totalPrice={changeFlowAmountDue}
-              totalSummaryLabel={
-                isChangeFlow
-                  ? (t('booking.totalOwedForBookingChange') &&
-                    t('booking.totalOwedForBookingChange') !== 'booking.totalOwedForBookingChange'
-                      ? t('booking.totalOwedForBookingChange')
-                      : 'Total owed for booking difference')
-                  : undefined
-              }
-              subtotal={subtotal !== totalFromSummary || effectivePromoDiscountAmount > 0 || addOnTotal > 0 ? effectiveSubtotal : undefined}
-              taxAmount={!isTaxIncludedInPrice && (effectivePromoDiscountAmount > 0 ? effectiveTax : tax) > 0 ? (effectivePromoDiscountAmount > 0 ? effectiveTax : tax) : 0}
-              taxRate={pricingConfig?.taxRate}
-              currency={currency}
-              locale={locale}
-              t={t}
-              extraBetweenTaxAndTotal={
-                <>
-                  {isChangeFlow && originalReceipt && lockedPromoCode ? (
-                    <PromoCodeInput
-                      promoCodeInput={promoCodeInput}
-                      appliedPromoCode={appliedPromoCode}
-                      promoCodeError={promoCodeError}
-                      promoCodeValidating={promoCodeValidating}
-                      promoDiscountAmount={effectivePromoDiscountAmount}
-                      currency={currency}
-                      locale={locale}
-                      t={t}
-                      onInputChange={() => {}}
-                      onApply={() => {}}
-                      onRemove={() => {}}
-                      locked
-                    />
-                  ) : (
-                    !isChangeFlow ? (
+                priceSummaryLines={checkoutPriceSummaryLines}
+                totalPrice={changeFlowAmountDue}
+                totalSummaryLabel={
+                  isChangeFlow
+                    ? (t('booking.totalOwedForBookingChange') &&
+                      t('booking.totalOwedForBookingChange') !== 'booking.totalOwedForBookingChange'
+                        ? t('booking.totalOwedForBookingChange')
+                        : 'Total owed for booking difference')
+                    : undefined
+                }
+                subtotal={
+                  isChangeFlow
+                    ? displayChangeFlowSubtotal
+                    : (subtotal !== totalFromSummary || effectivePromoDiscountAmount > 0 || addOnTotal > 0
+                        ? effectiveSubtotal
+                        : undefined)
+                }
+                taxAmount={
+                  !isTaxIncludedInPrice &&
+                  (isChangeFlow ? displayChangeFlowTax : (effectivePromoDiscountAmount > 0 ? effectiveTax : tax)) > 0
+                    ? (isChangeFlow ? displayChangeFlowTax : (effectivePromoDiscountAmount > 0 ? effectiveTax : tax))
+                    : 0
+                }
+                taxRate={pricingConfig?.taxRate}
+                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}
+                    {isChangeFlow && lockedPromoCode ? (
+                      <PromoCodeInput
+                        promoCodeInput={promoCodeInput}
+                        appliedPromoCode={appliedPromoCode}
+                        promoCodeError={promoCodeError}
+                        promoCodeValidating={promoCodeValidating}
+                        promoDiscountAmount={effectivePromoDiscountAmount}
+                        currency={currency}
+                        locale={locale}
+                        t={t}
+                        onInputChange={() => {}}
+                        onApply={() => {}}
+                        onRemove={() => {}}
+                        locked
+                      />
+                    ) : !isChangeFlow ? (
                       <PromoCodeInput
                         promoCodeInput={promoCodeInput}
                         appliedPromoCode={appliedPromoCode}
@@ -4313,71 +4756,150 @@ export function BookingFlow({
                           fetchedRangesRef.current = [];
                         }}
                       />
-                    ) : null
-                  )}
-                </>
-              }
-              firstName={firstName}
-              lastName={lastName}
-              email={email}
-              onFirstNameChange={(v) => { setFirstName(v); setError(''); }}
-              onLastNameChange={(v) => { setLastName(v); setError(''); }}
-              onEmailChange={(v) => { setEmail(v); setError(''); }}
-              readOnlyContactFields={isChangeFlow}
-              pickupLocations={
-                selectedDate && product.pickupLocations && product.pickupLocations.length > 0
-                  ? product.pickupLocations
-                  : undefined
-              }
-              destinations={product.destinations}
-              pickupLocationId={pickupLocationId}
-              pickupLocationSkipped={pickupLocationSkipped}
-              selectedPickupLocation={selectedPickupLocation}
-              highlightedPickupLocationIds={highlightedPickupLocationIds}
-              onLocationSelect={(locationId) => {
-                setPickupLocationId(locationId);
-                setError('');
-                if (locationId === null && pickupLocationSkipped) {
-                  setPickupLocationSkipped(false);
-                } else if (locationId !== null) {
+                    ) : 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
+                }
+                firstName={firstName}
+                lastName={lastName}
+                email={email}
+                onFirstNameChange={(v) => { setFirstName(v); setError(''); }}
+                onLastNameChange={(v) => { setLastName(v); setError(''); }}
+                onEmailChange={(v) => { setEmail(v); setError(''); }}
+                readOnlyContactFields={isChangeFlow}
+                pickupLocations={
+                  selectedDate && product.pickupLocations && product.pickupLocations.length > 0
+                    ? product.pickupLocations
+                    : undefined
+                }
+                destinations={product.destinations}
+                pickupLocationId={pickupLocationId}
+                pickupLocationSkipped={pickupLocationSkipped}
+                selectedPickupLocation={selectedPickupLocation}
+                highlightedPickupLocationIds={highlightedPickupLocationIds}
+                onLocationSelect={(locationId) => {
+                  setPickupLocationId(locationId);
+                  setError('');
+                  if (locationId === null && pickupLocationSkipped) {
+                    setPickupLocationSkipped(false);
+                  } else if (locationId !== null) {
+                    setPickupLocationSkipped(false);
+                  }
+                }}
+                onSkip={() => {
+                  setPickupLocationSkipped(true);
+                  setPickupLocationId(null);
+                  setError('');
+                }}
+                onChangePickup={() => {
+                  setPickupLocationId(null);
                   setPickupLocationSkipped(false);
+                }}
+                termsAccepted={termsAccepted}
+                onTermsChange={(checked) => {
+                  setTermsAccepted(checked);
+                  setTermsAcceptedAt(checked ? new Date().toISOString() : null);
+                }}
+                isAdmin={isAdmin}
+                showCommunicationAdminSection={!isChangeFlow}
+                skipConfirmationCommunications={skipConfirmationCommunications}
+                disableAutoCommunications={disableAutoCommunications}
+                onSkipConfirmationChange={setSkipConfirmationCommunications}
+                onDisableCommunicationsChange={setDisableAutoCommunications}
+                error={checkoutFormError}
+                loading={loading}
+                totalQuantity={totalQuantity}
+                onCheckout={handleCheckout}
+                submitLabel={changeCheckoutButtonLabel ?? deferredInvoiceSubmitLabel}
+                hideSubmitButton={
+                  showCheckoutModal ||
+                  showAdminPaymentChoice ||
+                  (isChangeFlow && (!hasEffectiveChangeSelection || isChangeQuoteBlocked))
                 }
-              }}
-              onSkip={() => {
-                setPickupLocationSkipped(true);
-                setPickupLocationId(null);
-                setError('');
-              }}
-              onChangePickup={() => {
-                setPickupLocationId(null);
-                setPickupLocationSkipped(false);
-              }}
-              termsAccepted={termsAccepted}
-              onTermsChange={(checked) => {
-                setTermsAccepted(checked);
-                setTermsAcceptedAt(checked ? new Date().toISOString() : null);
-              }}
-              isAdmin={isAdmin}
-              skipConfirmationCommunications={skipConfirmationCommunications}
-              disableAutoCommunications={disableAutoCommunications}
-              onSkipConfirmationChange={setSkipConfirmationCommunications}
-              onDisableCommunicationsChange={setDisableAutoCommunications}
-              error={checkoutFormError}
-              loading={loading}
-              totalQuantity={totalQuantity}
-              onCheckout={handleCheckout}
-              submitLabel={changeCheckoutButtonLabel ?? deferredInvoiceSubmitLabel}
-              hideSubmitButton={
-                showCheckoutModal ||
-                showAdminPaymentChoice ||
-                (isChangeFlow && (!hasChangeSelection || isChangeQuoteBlocked))
-              }
-              submitDisabled={changeFlowSubmitDisabled}
-              attributionSummary={flowUi?.partnerAttributionSummary}
-              attributionConfirmLabel={flowUi?.partnerAttributionConfirmLabel}
-              attributionConfirmed={partnerAttributionConfirmed}
-              onAttributionConfirmedChange={setPartnerAttributionConfirmed}
-            />
+                submitDisabled={changeFlowSubmitDisabled}
+                attributionSummary={flowUi?.partnerAttributionSummary}
+                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
+                }
+              />
           )}
           </div>
         </>