@ticketboothapp/booking 1.2.161 → 1.2.163

package/package.json

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

package/src/components/booking/AdminChangeBookingContent.tsx

@@ -48,6 +48,7 @@ const dialogPropKeys = [
   'onCheckoutClose',
   'onPaymentSubmitStart',
   'onPaymentSubmitError',
+  'onPaymentConfirmed',
   'getSuccessUrl',
   't',
 ] as const;

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -691,7 +691,9 @@ export function AdminChangeBookingFlow({
     returnAvailabilityId: selectedReturnOption?.returnAvailabilityId ?? null,
     quantities,
     addOnSelections,
+    cancellationPolicyId,
     adminCustomReceiptLines,
+    structuredAdjustments: adminStructuredAdjustments,
     useAdminFeAuthoritativeQuote,
   }), [
     initialValues?.bookingReference,
@@ -702,7 +704,9 @@ export function AdminChangeBookingFlow({
     selectedReturnOption?.returnAvailabilityId,
     quantities,
     addOnSelections,
+    cancellationPolicyId,
     adminCustomReceiptLines,
+    adminStructuredAdjustments,
     useAdminFeAuthoritativeQuote,
   ]);
   const responseRefundDecisionOperations = latestChangeQuote?.refundDecisionOperations ?? [];
@@ -782,7 +786,9 @@ export function AdminChangeBookingFlow({
     pickupLocationId,
     quantities,
     addOnSelections,
+    cancellationPolicyId,
     adminCustomReceiptLines,
+    adminStructuredAdjustments,
     refundDispositionsByOperationId: activeRefundDispositionsByOperationId,
     useAdminFeAuthoritativeQuote,
     latestChangeQuote,
@@ -809,7 +815,6 @@ export function AdminChangeBookingFlow({
     changeFlowNewBookingTotal,
     effectiveSubtotalForCheckout,
     effectiveTax,
-    adminCustomLinesAsAdditionalAdjustments,
     adminFeAuthoritativeReceipt,
     isTaxIncludedInPrice,
     t,
@@ -925,6 +930,7 @@ export function AdminChangeBookingFlow({
     handlePayNow,
     handlePaymentSubmitStart,
     handlePaymentSubmitError,
+    handlePaymentConfirmed,
     handleAdminPaymentChoiceCancel,
   } = useAdminChangeCheckoutController({
     selectedAvailability,
@@ -1017,7 +1023,7 @@ export function AdminChangeBookingFlow({
         onPayNow: handlePayNow,
         onConfirmWithoutPayment: handleConfirmWithoutPayment, onAdminPaymentChoiceCancel: handleAdminPaymentChoiceCancel,
         onCheckoutClose: cancelPendingReservation, onPaymentSubmitStart: handlePaymentSubmitStart,
-        onPaymentSubmitError: handlePaymentSubmitError,
+        onPaymentSubmitError: handlePaymentSubmitError, onPaymentConfirmed: handlePaymentConfirmed,
         isPartialLaunch,
         checkoutVisible: selectedAvailability != null,
         visible: isAdmin && !isInitialPrivateShuttleBooking && availableChangeProducts.length > 1,

package/src/components/booking/AdminChangeCheckoutDialogs.tsx

@@ -28,6 +28,7 @@ export interface AdminChangeCheckoutDialogsProps {
   onCheckoutClose: () => void;
   onPaymentSubmitStart: () => void;
   onPaymentSubmitError: () => void;
+  onPaymentConfirmed: (paymentIntentId: string) => Promise<void>;
 }
 
 export function AdminChangeCheckoutDialogs({
@@ -48,6 +49,7 @@ export function AdminChangeCheckoutDialogs({
   onCheckoutClose,
   onPaymentSubmitStart,
   onPaymentSubmitError,
+  onPaymentConfirmed,
 }: AdminChangeCheckoutDialogsProps) {
   return (
     <>
@@ -61,6 +63,10 @@ export function AdminChangeCheckoutDialogs({
         onPayNow={onPayNow}
         onConfirmWithoutPayment={onConfirmWithoutPayment}
         onCancel={onAdminPaymentChoiceCancel}
+        title={adminChoiceData?.dialogTitle}
+        description={adminChoiceData?.dialogDescription}
+        confirmWithoutPaymentLabel={adminChoiceData?.confirmWithoutPaymentLabel}
+        preferConfirmWithoutPayment={adminChoiceData?.preferConfirmWithoutPayment}
       />
       {checkoutModalData && (
         <CheckoutModal
@@ -68,6 +74,9 @@ export function AdminChangeCheckoutDialogs({
           onClose={onCheckoutClose}
           onPaymentSubmitStart={onPaymentSubmitStart}
           onPaymentSubmitError={onPaymentSubmitError}
+          onPaymentConfirmed={
+            checkoutModalData.finalizeExistingChangeInline ? onPaymentConfirmed : undefined
+          }
           clientSecret={checkoutClientSecret}
           reservationReference={checkoutModalData.reservationReference}
           reservationExpiration={checkoutModalData.reservationExpiration}

package/src/components/booking/AdminPaymentChoiceModal.tsx

@@ -21,6 +21,9 @@ interface AdminPaymentChoiceModalProps {
   onCancel: () => void;
   description?: string;
   payNowLabel?: string;
+  title?: string;
+  confirmWithoutPaymentLabel?: string;
+  preferConfirmWithoutPayment?: boolean;
 }
 
 /**
@@ -40,6 +43,9 @@ export function AdminPaymentChoiceModal({
   onCancel,
   description,
   payNowLabel,
+  title,
+  confirmWithoutPaymentLabel,
+  preferConfirmWithoutPayment = false,
 }: AdminPaymentChoiceModalProps) {
   const [nowMs, setNowMs] = useState(() => Date.now());
 
@@ -69,7 +75,7 @@ export function AdminPaymentChoiceModal({
         <div className="p-6 border-b border-stone-200 flex-shrink-0">
           <div className="flex justify-between items-start gap-3">
             <h3 className="text-lg font-semibold text-stone-900 pr-2">
-              Complete booking
+              {title ?? 'Complete booking'}
             </h3>
             <button
               type="button"
@@ -120,22 +126,38 @@ export function AdminPaymentChoiceModal({
             </p>
           ) : null}
 
+          {preferConfirmWithoutPayment ? (
+            <button
+              type="button"
+              onClick={onConfirmWithoutPayment}
+              disabled={loading || expired}
+              className="w-full py-3 px-4 bg-emerald-600 text-white font-semibold rounded-lg hover:bg-emerald-700 disabled:opacity-50 disabled:cursor-not-allowed"
+            >
+              {loading ? 'Applying...' : (confirmWithoutPaymentLabel ?? 'Confirm without payment')}
+            </button>
+          ) : null}
           <button
             type="button"
             onClick={onPayNow}
             disabled={loading || expired}
-            className="w-full py-3 px-4 bg-emerald-600 text-white font-semibold rounded-lg hover:bg-emerald-700 disabled:opacity-50 disabled:cursor-not-allowed"
+            className={`w-full py-3 px-4 font-semibold rounded-lg disabled:opacity-50 disabled:cursor-not-allowed ${
+              preferConfirmWithoutPayment
+                ? 'border border-stone-300 text-stone-700 hover:bg-stone-50'
+                : 'bg-emerald-600 text-white hover:bg-emerald-700'
+            }`}
           >
             {loading ? 'Loading...' : `${payNowLabel ?? 'Pay now'} (${formatCurrencyAmount(totalAmount, currency)})`}
           </button>
-          <button
-            type="button"
-            onClick={onConfirmWithoutPayment}
-            disabled={loading || expired}
-            className="w-full py-3 px-4 border border-stone-300 text-stone-700 rounded-lg hover:bg-stone-50 font-medium disabled:opacity-50 disabled:cursor-not-allowed"
-          >
-            Confirm without payment
-          </button>
+          {!preferConfirmWithoutPayment ? (
+            <button
+              type="button"
+              onClick={onConfirmWithoutPayment}
+              disabled={loading || expired}
+              className="w-full py-3 px-4 border border-stone-300 text-stone-700 rounded-lg hover:bg-stone-50 font-medium disabled:opacity-50 disabled:cursor-not-allowed"
+            >
+              {confirmWithoutPaymentLabel ?? 'Confirm without payment'}
+            </button>
+          ) : null}
           <button
             type="button"
             onClick={onCancel}

package/src/components/booking/CheckoutModal.tsx

@@ -29,6 +29,8 @@ export interface CheckoutModalProps {
   onClose: () => void;
   onPaymentSubmitStart?: () => void;
   onPaymentSubmitError?: () => void;
+  /** Called after Stripe authorizes/confirms payment without redirecting. May commit a quoted change. */
+  onPaymentConfirmed?: (paymentIntentId: string) => Promise<void>;
   clientSecret: string;
   reservationReference: string;
   reservationExpiration?: string;
@@ -74,6 +76,7 @@ function CheckoutForm({
   onClose,
   onPaymentSubmitStart,
   onPaymentSubmitError,
+  onPaymentConfirmed,
   t,
   total,
   currency,
@@ -83,6 +86,7 @@ function CheckoutForm({
   onClose: () => void;
   onPaymentSubmitStart?: () => void;
   onPaymentSubmitError?: () => void;
+  onPaymentConfirmed?: (paymentIntentId: string) => Promise<void>;
   t: (key: string) => string;
   total: number;
   currency: Currency;
@@ -109,15 +113,38 @@ function CheckoutForm({
     onPaymentSubmitStart?.();
     // Store before redirect so success page can fire purchase event
     analytics.storePendingPurchase(total, currency);
-    const { error: confirmError } = await stripe.confirmPayment({
-      elements,
-      confirmParams: {
-        return_url: successUrl,
-      },
-    });
+    const confirmation = onPaymentConfirmed
+      ? await stripe.confirmPayment({
+          elements,
+          confirmParams: { return_url: successUrl },
+          redirect: 'if_required',
+        })
+      : await stripe.confirmPayment({
+          elements,
+          confirmParams: { return_url: successUrl },
+        });
+    const confirmError = 'error' in confirmation ? confirmation.error : undefined;
+    const paymentIntent = 'paymentIntent' in confirmation ? confirmation.paymentIntent : undefined;
     if (confirmError) {
       setError(confirmError.message ?? 'Payment failed');
       onPaymentSubmitError?.();
+    } else if (onPaymentConfirmed) {
+      const paymentIntentId = paymentIntent?.id;
+      if (!paymentIntentId) {
+        setError('Payment was authorized, but the booking change could not be completed. Please try again.');
+        onPaymentSubmitError?.();
+      } else {
+        try {
+          await onPaymentConfirmed(paymentIntentId);
+        } catch (completionError) {
+          setError(
+            completionError instanceof Error
+              ? completionError.message
+              : 'Payment was authorized, but the booking change could not be completed.',
+          );
+          onPaymentSubmitError?.();
+        }
+      }
     }
     setLoading(false);
   };
@@ -155,6 +182,7 @@ export function CheckoutModal({
   onClose,
   onPaymentSubmitStart,
   onPaymentSubmitError,
+  onPaymentConfirmed,
   clientSecret,
   reservationReference,
   reservationExpiration,
@@ -462,6 +490,7 @@ export function CheckoutModal({
                 onClose={onClose}
                 onPaymentSubmitStart={onPaymentSubmitStart}
                 onPaymentSubmitError={onPaymentSubmitError}
+                onPaymentConfirmed={onPaymentConfirmed}
                 t={t}
                 total={total}
                 currency={currency}

package/src/components/booking/admin-change-payment-choice-runner.ts

@@ -14,7 +14,9 @@ import type { CheckoutModalLineItem } from './CheckoutModal';
 import type { Currency } from './CurrencySwitcher';
 import type { ChangeBookingPaidCheckoutModalData } from './change-booking-payment-modal-builders';
 
-export type AdminChangeCheckoutModalData = ChangeBookingPaidCheckoutModalData;
+export type AdminChangeCheckoutModalData = ChangeBookingPaidCheckoutModalData & {
+  finalizeExistingChangeInline?: boolean;
+};
 
 export interface AdminChangePaymentChoiceData {
   reservationReference: string;
@@ -38,6 +40,13 @@ export interface AdminChangePaymentChoiceData {
   taxRate: number;
   promoDiscountAmount: number;
   discountLabel?: string | null;
+  dialogTitle?: string;
+  dialogDescription?: string;
+  confirmWithoutPaymentLabel?: string;
+  previousTotal?: number;
+  newTotal?: number;
+  finalizeExistingChangeInline?: boolean;
+  preferConfirmWithoutPayment?: boolean;
 }
 
 export interface BuildAdminChangePaymentChoiceDataParams {
@@ -61,6 +70,13 @@ export interface BuildAdminChangePaymentChoiceDataParams {
   taxRate: number;
   promoDiscountAmount: number;
   discountLabel?: string | null;
+  dialogTitle?: string;
+  dialogDescription?: string;
+  confirmWithoutPaymentLabel?: string;
+  previousTotal?: number;
+  newTotal?: number;
+  finalizeExistingChangeInline?: boolean;
+  preferConfirmWithoutPayment?: boolean;
 }
 
 export function buildAdminChangePaymentChoiceData(
@@ -93,6 +109,15 @@ export function buildAdminChangePayNowCheckoutModalData(
     taxRate: adminChoiceData.taxRate,
     promoDiscountAmount: adminChoiceData.promoDiscountAmount,
     discountLabel: adminChoiceData.discountLabel,
+    finalizeExistingChangeInline: adminChoiceData.finalizeExistingChangeInline,
+    changeTotals:
+      adminChoiceData.previousTotal != null && adminChoiceData.newTotal != null
+        ? {
+            previousTotal: adminChoiceData.previousTotal,
+            newTotal: adminChoiceData.newTotal,
+            differenceTotal: adminChoiceData.totalAmount,
+          }
+        : undefined,
   };
 }
 

package/src/components/booking/admin-change-provider-payload.ts

@@ -36,6 +36,8 @@ export interface BuildAdminChangeProviderPayloadParams {
   refundDispositionsByOperationId: NonNullable<
     ProviderDashboardChangeBookingPayload['refundDispositionsByOperationId']
   >;
+  pricingV2QuoteId?: string | null;
+  pricingV2QuotedTotal?: number | null;
   providerApplyAuthoritativeReceipt?: ProviderDashboardChangeBookingPayload['authoritativeReceipt'];
   previousPassengerCount: number;
   previousAvailabilityId?: string | null;
@@ -59,6 +61,8 @@ export function buildAdminChangeProviderPayload({
   mergedProviderAdditionalAdjustments,
   adminStructuredAdjustments,
   refundDispositionsByOperationId,
+  pricingV2QuoteId,
+  pricingV2QuotedTotal,
   providerApplyAuthoritativeReceipt,
   previousPassengerCount,
   previousAvailabilityId,
@@ -73,6 +77,7 @@ export function buildAdminChangeProviderPayload({
   return {
     productId: availabilityProductOptionId,
     parentProductId: product.productId,
+    availabilityId: selectedAvailability.availabilityId ?? null,
     dateTime: selectedAvailability.dateTime,
     bookingItems,
     returnAvailabilityId: selectedReturnOption?.returnAvailabilityId ?? null,
@@ -83,7 +88,8 @@ export function buildAdminChangeProviderPayload({
     passengerCount: null,
     childSafetySeatsCount: null,
     foodRestrictions: null,
-    addOnSelections: addOnSelections.length > 0 ? addOnSelections : null,
+    // The admin editor owns the complete target selection. [] intentionally means clear all.
+    addOnSelections,
     cancellationPolicyId: cancellationPolicyId ?? initialCancellationPolicyId ?? null,
     promoCode: appliedPromoCode ?? null,
     newTotalAmount,
@@ -101,6 +107,8 @@ export function buildAdminChangeProviderPayload({
     authoritativeReceipt: providerApplyAuthoritativeReceipt,
     structuredAdjustments: adminStructuredAdjustments,
     refundDispositionsByOperationId,
+    pricingV2QuoteId: pricingV2QuoteId ?? null,
+    pricingV2QuotedTotal: pricingV2QuotedTotal ?? null,
     capacitySeatCredit: {
       enabled: true,
       previousPassengerCount,

package/src/components/booking/admin-change-quote-request-key.ts

@@ -10,7 +10,9 @@ interface AdminChangeQuoteRequestKeyInput {
   returnAvailabilityId: string | null;
   quantities: Record<string, number>;
   addOnSelections: Array<{ addOnId: string; variantId?: string; quantity?: number }>;
-  adminCustomReceiptLines: Array<{ label: string; amountInput: string; amountSign?: number }>;
+  adminCustomReceiptLines: unknown[];
+  cancellationPolicyId?: string | null;
+  structuredAdjustments?: unknown[];
   refundDispositionsByOperationId?: Record<string, string>;
   useAdminFeAuthoritativeQuote: boolean;
 }
@@ -33,6 +35,8 @@ export function buildAdminChangeQuoteRequestKey(input: AdminChangeQuoteRequestKe
     quantities: input.quantities,
     addOnSelections: input.addOnSelections,
     adminCustomReceiptLines: input.adminCustomReceiptLines,
+    cancellationPolicyId: input.cancellationPolicyId ?? null,
+    structuredAdjustments: input.structuredAdjustments ?? [],
     refundDispositionsByOperationId: Object.fromEntries(
       Object.entries(input.refundDispositionsByOperationId ?? {}).sort(([a], [b]) => a.localeCompare(b)),
     ),

package/src/components/booking/change-booking-checkout-quote-runner.ts

@@ -74,9 +74,7 @@ export async function quoteCustomerChangeForCheckout({
     newPickupLocationId: pickupLocationId || null,
     newReturnAvailabilityId: returnAvailabilityId ?? null,
     newPassengerCounts: bookingItems,
-    ...(addOnSelections && addOnSelections.length > 0
-      ? { newAddOnSelections: addOnSelections }
-      : {}),
+    ...(addOnSelections ? { newAddOnSelections: addOnSelections } : {}),
     clientProposedTotal,
   });
   const { quoteSlice, mergedQuote } = sliceAndMergeChangeQuoteForUi(
@@ -163,9 +161,7 @@ export async function quoteAdminChangeForCheckout({
     newPickupLocationId: pickupLocationId || null,
     newReturnAvailabilityId: returnAvailabilityId ?? null,
     newPassengerCounts: bookingItems,
-    ...(addOnSelections && addOnSelections.length > 0
-      ? { newAddOnSelections: addOnSelections }
-      : {}),
+    ...(addOnSelections ? { newAddOnSelections: addOnSelections } : {}),
     ...(manualLineAdjustments && manualLineAdjustments.length > 0
       ? { manualLineAdjustments }
       : {}),

package/src/components/booking/provider-dashboard-change-booking.ts

@@ -37,6 +37,8 @@ export type ProviderDashboardChangeBookingPayload = {
   parentProductId?: string;
   /** Product option id selected for the new booking. */
   productId: string;
+  /** Exact outbound availability selected and priced by the server. */
+  availabilityId?: string | null;
   dateTime: string;
   bookingItems: Array<{ category: string; count: number }>;
   returnAvailabilityId?: string | null;
@@ -67,6 +69,9 @@ export type ProviderDashboardChangeBookingPayload = {
     string,
     'REFUND_TO_ORIGINAL_PAYMENT' | 'PENDING_REFUND' | 'NO_REFUND'
   >;
+  /** Exact server quote shown to the operator. Apply reuses this quote when it is still valid. */
+  pricingV2QuoteId?: string | null;
+  pricingV2QuotedTotal?: number | null;
   /**
    * Admin/provider change flow: when FE-authoritative quoting is used, apply must persist
    * the exact receipt that was quoted instead of rebuilding from catalog pricing.

package/src/components/booking/useAdminChangeCheckoutController.ts

@@ -2,6 +2,8 @@ import { useCallback, useEffect, useRef, useState, type Dispatch, type SetStateA
 import {
   cancelReservation,
   cancelReservationBestEffort,
+  applyAdminChangeBookingV2,
+  createAdminChangeBookingPaymentIntentV2,
   createChangeBookingPaymentIntent,
   createPaymentIntent,
   describeStandardTourCapacityConflictMessage,
@@ -338,6 +340,8 @@ export function useAdminChangeCheckoutController({
       mergedProviderAdditionalAdjustments,
       adminStructuredAdjustments,
       refundDispositionsByOperationId,
+      pricingV2QuoteId: latestChangeQuote?.quoteId ?? null,
+      pricingV2QuotedTotal: latestChangeQuote?.quotedTotal ?? latestChangeQuote?.serverDisplay?.total ?? null,
       providerApplyAuthoritativeReceipt,
       previousPassengerCount: changeFlowInitialTicketCount,
       previousAvailabilityId: initialValues?.availabilityId ?? null,
@@ -496,7 +500,9 @@ export function useAdminChangeCheckoutController({
       const timePart = selectedAvailability.dateTime.split('T')[1]?.substring(0, 5) || '00:00';
       const itineraryDisplay = computeItineraryDisplayForStorage() ?? computeItineraryDisplay();
       const taxForBreakdown = effectivePromoDiscountAmount > 0 ? effectiveTax : tax;
-      const amountDueForCheckout = isCustomerSelfServeChange
+      const amountDueForCheckout = isProviderDashboardChange && isChangeBookingContext
+        ? Math.max(0, latestChangeQuote?.priceDiff ?? 0)
+        : isCustomerSelfServeChange
         ? confirmedChangeAmountDueForCheckout ??
           Math.max(
             0,
@@ -535,6 +541,63 @@ export function useAdminChangeCheckoutController({
         roundingLabel: t('booking.rounding') || 'Rounding',
       });
 
+      // Provider changes reuse the exact stored admin quote for both settlement choices.
+      // Pay later applies immediately with a pending balance. Pay now first creates a
+      // quote-bound Stripe authorization and applies only after that authorization succeeds.
+      if (isProviderDashboardChange && isChangeBookingContext) {
+        const bookingReference = initialValues?.bookingReference?.trim();
+        const quoteId = latestChangeQuote?.quoteId?.trim();
+        if (!bookingReference) throw new Error('Missing booking reference.');
+        if (!quoteId || latestChangeQuote?.canProceed === false) {
+          throw new Error(latestChangeQuote?.reasonIfBlocked || 'The authoritative change quote is not ready.');
+        }
+        if (amountDueForCheckout <= 0) {
+          if (!onChangeBooking) throw new Error('Provider change handler is unavailable.');
+          const providerPayload = buildProviderChangePayload(availabilityProductOptionId, bookingItems);
+          if (!providerPayload) throw new Error('No availability selected');
+          await onChangeBooking(providerPayload);
+          onSuccess?.({ reservationReference: bookingReference });
+          finishManageFlow(bookingReference);
+          setLoading(false);
+          return;
+        }
+        setAdminChoiceData(buildAdminChangePaymentChoiceData({
+          reservationReference: bookingReference,
+          checkoutBreakdown,
+          totalAmount: amountDueForCheckout,
+          datePart,
+          timePart,
+          availabilityProductOptionId,
+          itineraryDisplay: itineraryDisplay ?? undefined,
+          clientSecret: '',
+          ticketLinesForModal: checkoutModalTicketLinesDisplay,
+          feeLineItems: feeLineItemsWithAddOns,
+          returnPriceAdjustment: checkoutReturnLineAmount,
+          cancellationPolicyFee,
+          cancellationPolicyLabel: effectiveCancellationPolicyLabel,
+          subtotal: effectiveSubtotalForCheckout,
+          tax: effectivePromoDiscountAmount > 0 ? effectiveTax : tax,
+          totalQuantity,
+          isTaxIncludedInPrice,
+          taxRate: pricingConfig?.taxRate ?? 0,
+          promoDiscountAmount: effectivePromoDiscountAmount > 0 ? effectivePromoDiscountAmount : 0,
+          discountLabel: appliedPromoCode
+            ? `Promo: ${appliedPromoCode}`
+            : (originalReceiptPromoAdjustment.label || originalReceipt?.promoLabel || undefined),
+          dialogTitle: 'Complete booking change',
+          dialogDescription:
+            'Pay later to apply the change and add the amount to the booking balance, or collect a new card payment before applying it.',
+          confirmWithoutPaymentLabel: 'Pay later',
+          previousTotal: originalReceipt?.total,
+          newTotal: latestChangeQuote?.quotedTotal ?? latestChangeQuote?.serverDisplay?.total,
+          finalizeExistingChangeInline: true,
+          preferConfirmWithoutPayment: true,
+        }));
+        setShowAdminPaymentChoice(true);
+        setLoading(false);
+        return;
+      }
+
       const paymentIntent = isCustomerSelfServeChange
         ? await createChangeBookingPaymentIntent(
             (() => {
@@ -789,12 +852,38 @@ export function useAdminChangeCheckoutController({
     }
   };
 
-  const handlePayNow = () => {
+  const handlePayNow = async () => {
     if (!adminChoiceData) return;
     if (reservationHoldHasExpired(adminChoiceData.reservationExpiration)) {
       setError(RESERVATION_HOLD_EXPIRED_MESSAGE);
       return;
     }
+    if (isProviderDashboardChange && isChangeBookingContext) {
+      const bookingReference = initialValues?.bookingReference?.trim();
+      const quoteId = latestChangeQuote?.quoteId?.trim();
+      if (!bookingReference || !quoteId) {
+        setError('The authoritative change quote is no longer available.');
+        return;
+      }
+      setLoading(true);
+      setError('');
+      try {
+        const paymentIntent = await createAdminChangeBookingPaymentIntentV2(bookingReference, quoteId);
+        const expectedAmountCents = Math.round(adminChoiceData.totalAmount * 100);
+        if (paymentIntent.amountDueCents !== expectedAmountCents) {
+          throw new Error('The payment amount changed. Close this dialog and review a fresh quote.');
+        }
+        setShowAdminPaymentChoice(false);
+        setCheckoutClientSecret(paymentIntent.clientSecret);
+        setCheckoutModalData(buildAdminChangePayNowCheckoutModalData(adminChoiceData, lastName));
+        setShowCheckoutModal(true);
+      } catch (error) {
+        setError(error instanceof Error ? error.message : 'Failed to prepare payment.');
+      } finally {
+        setLoading(false);
+      }
+      return;
+    }
     setShowAdminPaymentChoice(false);
     setCheckoutClientSecret(adminChoiceData.clientSecret);
     setCheckoutModalData(buildAdminChangePayNowCheckoutModalData(adminChoiceData, lastName));
@@ -802,6 +891,32 @@ export function useAdminChangeCheckoutController({
     setAdminChoiceData(null);
   };
 
+  const handlePaymentConfirmed = useCallback(async (paymentIntentId: string) => {
+    if (!isProviderDashboardChange || !isChangeBookingContext) return;
+    const bookingReference = initialValues?.bookingReference?.trim();
+    const quoteId = latestChangeQuote?.quoteId?.trim();
+    if (!bookingReference || !quoteId) {
+      throw new Error('Payment was authorized, but the booking quote is no longer available.');
+    }
+    await applyAdminChangeBookingV2(bookingReference, quoteId, {
+      paymentMode: 'PAY_NOW',
+      paymentIntentId,
+    });
+    paymentSubmitInFlightRef.current = false;
+    setShowCheckoutModal(false);
+    setCheckoutModalData(null);
+    setCheckoutClientSecret('');
+    setAdminChoiceData(null);
+    onSuccess?.({ reservationReference: bookingReference });
+    finishManageFlow(bookingReference);
+  }, [
+    initialValues?.bookingReference,
+    isChangeBookingContext,
+    isProviderDashboardChange,
+    latestChangeQuote?.quoteId,
+    onSuccess,
+  ]);
+
   const handlePaymentSubmitStart = useCallback(() => {
     paymentSubmitInFlightRef.current = true;
   }, []);
@@ -829,6 +944,7 @@ export function useAdminChangeCheckoutController({
     handlePayNow,
     handlePaymentSubmitStart,
     handlePaymentSubmitError,
+    handlePaymentConfirmed,
     handleAdminPaymentChoiceCancel,
   };
 }

package/src/components/booking/useAdminChangeQuotePreview.ts

@@ -28,10 +28,18 @@ import {
 import type { Currency } from './CurrencySwitcher';
 import type { AdminChangeLatestQuote } from './useAdminChangeCheckoutController';
 import { buildAdminChangeQuoteRequestKey } from './admin-change-quote-request-key';
+import type { ProviderDashboardChangeBookingPayload } from './provider-dashboard-change-booking';
 
 type AddOnSelection = { addOnId: string; variantId?: string; quantity?: number };
-type AdminCustomReceiptLine = { label: string; amountInput: string; amountSign?: number };
-type AdditionalAdjustment = { label: string; amount: number };
+type AdminCustomReceiptLine = {
+  label: string;
+  amountInput: string;
+  amountSign?: number;
+  calculation: 'FIXED_AMOUNT' | 'PERCENTAGE';
+  scope: 'POSITIVE_AMENDMENT_VALUE' | 'CURRENT_ACTIVE_TICKETS' | 'CURRENT_ACTIVE_BOOKING';
+  taxBehavior: 'NON_TAXABLE' | 'TAXABLE' | 'PRE_TAX_DISCOUNT' | 'POST_TAX_DISCOUNT';
+  reasonCode: string;
+};
 
 interface ChangeSelectionDetailsForPreview {
   dateChanged: boolean;
@@ -51,7 +59,9 @@ export interface UseAdminChangeQuotePreviewParams {
   pickupLocationId: string | null;
   quantities: Record<string, number>;
   addOnSelections: AddOnSelection[];
+  cancellationPolicyId: string | null;
   adminCustomReceiptLines: AdminCustomReceiptLine[];
+  adminStructuredAdjustments: NonNullable<ProviderDashboardChangeBookingPayload['structuredAdjustments']>;
   refundDispositionsByOperationId: Record<string, AdminAmendmentRefundDisposition>;
   useAdminFeAuthoritativeQuote: boolean;
   latestChangeQuote: AdminChangeLatestQuote | null;
@@ -78,7 +88,6 @@ export interface UseAdminChangeQuotePreviewParams {
   changeFlowNewBookingTotal: number;
   effectiveSubtotalForCheckout: number;
   effectiveTax: number;
-  adminCustomLinesAsAdditionalAdjustments: AdditionalAdjustment[];
   adminFeAuthoritativeReceipt: AdminFeAuthoritativeReceipt;
   isTaxIncludedInPrice: boolean;
   t: (key: string) => string;
@@ -109,7 +118,9 @@ export function useAdminChangeQuotePreview({
   pickupLocationId,
   quantities,
   addOnSelections,
+  cancellationPolicyId,
   adminCustomReceiptLines,
+  adminStructuredAdjustments,
   refundDispositionsByOperationId,
   useAdminFeAuthoritativeQuote,
   latestChangeQuote,
@@ -136,7 +147,6 @@ export function useAdminChangeQuotePreview({
   changeFlowNewBookingTotal,
   effectiveSubtotalForCheckout,
   effectiveTax,
-  adminCustomLinesAsAdditionalAdjustments,
   adminFeAuthoritativeReceipt,
   isTaxIncludedInPrice,
   t,
@@ -167,6 +177,8 @@ export function useAdminChangeQuotePreview({
     quantities,
     addOnSelections,
     adminCustomReceiptLines,
+    cancellationPolicyId,
+    structuredAdjustments: adminStructuredAdjustments,
     refundDispositionsByOperationId,
     useAdminFeAuthoritativeQuote,
   }), [
@@ -179,6 +191,8 @@ export function useAdminChangeQuotePreview({
     quantities,
     addOnSelections,
     adminCustomReceiptLines,
+    cancellationPolicyId,
+    adminStructuredAdjustments,
     refundDispositionsByOperationId,
     useAdminFeAuthoritativeQuote,
   ]);
@@ -420,11 +434,10 @@ export function useAdminChangeQuotePreview({
             newPickupLocationId: pickupLocationId || null,
             newReturnAvailabilityId: selectedReturnOption?.returnAvailabilityId ?? null,
             newPassengerCounts: bookingItems,
-            // Omit when empty: backend treats [] as "clear all"; missing = preserve stored selections (BookingChangeIntentService).
-            ...(addOnSelections.length > 0 ? { newAddOnSelections: addOnSelections } : {}),
-            ...(adminCustomLinesAsAdditionalAdjustments.length > 0
-              ? { manualLineAdjustments: adminCustomLinesAsAdditionalAdjustments }
-              : {}),
+            // Admin owns the complete target selection. [] intentionally clears all add-ons.
+            newAddOnSelections: addOnSelections,
+            cancellationPolicyId,
+            structuredAdjustments: adminStructuredAdjustments,
             ...(Object.keys(refundDispositionsByOperationId).length > 0
               ? { refundDispositionsByOperationId }
               : {}),

package/src/components/booking/useAdminProviderPricingAdjustments.ts

@@ -1,4 +1,4 @@
-import { useMemo } from 'react';
+import { useMemo, useState } from 'react';
 import { roundMoney } from '../../lib/booking/change-flow-pricing';
 import type {
   ProviderDashboardChangePricingUi,
@@ -55,6 +55,9 @@ export function useAdminProviderPricingAdjustments({
   adminCustomReceiptLines,
   isManualOverrideEligibleLine,
 }: UseAdminProviderPricingAdjustmentsParams) {
+  const [adjustmentIdNamespace] = useState(() =>
+    `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`,
+  );
   const providerTotalsPreview =
     showProviderPricingInlineEditor && providerPricingUi?.totalsPreview
       ? providerPricingUi.totalsPreview
@@ -137,17 +140,18 @@ export function useAdminProviderPricingAdjustments({
   );
 
   const adminStructuredAdjustments = useMemo(
-    (): AdminStructuredAdjustment[] =>
-      adminCustomReceiptLines.flatMap((line) => {
+    (): AdminStructuredAdjustment[] => {
+      const customAdjustments = adminCustomReceiptLines.flatMap((line) => {
         const value = Number(line.amountInput.trim());
         if (!Number.isFinite(value) || value <= 0) return [];
         const discount = (line.amountSign ?? 1) < 0;
         const percentage = line.calculation === 'PERCENTAGE';
+        const mode: AdminStructuredAdjustment['mode'] = percentage
+          ? discount ? 'PERCENTAGE_DISCOUNT' : 'PERCENTAGE_SURCHARGE'
+          : 'FIXED_AMOUNT';
         return [{
           adjustmentId: line.id,
-          mode: percentage
-            ? discount ? 'PERCENTAGE_DISCOUNT' : 'PERCENTAGE_SURCHARGE'
-            : 'FIXED_AMOUNT',
+          mode,
           ...(percentage
             ? { percentageBasisPoints: Math.round(value * 100) }
             : { fixedAmount: roundMoney((discount ? -1 : 1) * value) }),
@@ -156,8 +160,48 @@ export function useAdminProviderPricingAdjustments({
           reasonCode: line.reasonCode.trim() || 'STAFF_ADJUSTMENT',
           reason: line.label.trim() || null,
         }];
-      }),
-    [adminCustomReceiptLines],
+      });
+      const inlineAdjustments = isProviderDashboardChange
+        ? (providerPricingUi?.additionalAdjustments ?? []).flatMap((line) => {
+            const value = Number((line.amountInput ?? '').trim());
+            if (!Number.isFinite(value) || value <= 0) return [];
+            const discount = line.mode === 'DISCOUNT';
+            return [{
+              adjustmentId: line.id,
+              mode: 'FIXED_AMOUNT' as const,
+              fixedAmount: roundMoney((discount ? -1 : 1) * value),
+              scope: 'CURRENT_ACTIVE_BOOKING' as const,
+              taxBehavior: 'TAXABLE' as const,
+              reasonCode: 'PROVIDER_ADJUSTMENT',
+              reason: line.label?.trim() || (discount ? 'Provider discount' : 'Provider charge'),
+            }];
+          })
+        : [];
+      const lineOverrideAdjustments = providerPricingOverrides.flatMap((override, index) => {
+        const original = providerQuotedLines.find((line) => line.lineKey === override.lineKey);
+        if (!original) return [];
+        const delta = roundMoney(override.amount - original.amount);
+        if (Math.abs(delta) < 0.005) return [];
+        return [{
+          adjustmentId: `provider-line-${adjustmentIdNamespace}-${index}`,
+          mode: 'FIXED_AMOUNT' as const,
+          fixedAmount: delta,
+          scope: 'CURRENT_ACTIVE_BOOKING' as const,
+          taxBehavior: 'TAXABLE' as const,
+          reasonCode: 'PROVIDER_LINE_OVERRIDE',
+          reason: `Override ${original.label}`,
+        }];
+      });
+      return [...customAdjustments, ...inlineAdjustments, ...lineOverrideAdjustments];
+    },
+    [
+      adminCustomReceiptLines,
+      isProviderDashboardChange,
+      providerPricingUi?.additionalAdjustments,
+      providerPricingOverrides,
+      providerQuotedLines,
+      adjustmentIdNamespace,
+    ],
   );
 
   const mergedProviderAdditionalAdjustments = useMemo(

package/src/components/booking/useChangeBookingQuotePreview.ts

@@ -372,8 +372,8 @@ export function useChangeBookingQuotePreview({
             newPickupLocationId: pickupLocationId || null,
             newReturnAvailabilityId: selectedReturnOption?.returnAvailabilityId ?? null,
             newPassengerCounts: bookingItems,
-            // Omit when empty: backend treats [] as "clear all"; missing = preserve stored selections (BookingChangeIntentService).
-            ...(addOnSelections.length > 0 ? { newAddOnSelections: addOnSelections } : {}),
+            // The editor owns the complete target selection. [] intentionally clears all add-ons.
+            newAddOnSelections: addOnSelections,
             clientProposedTotal: changeFlowNewBookingTotal,
             capacitySeatCredit: {
               enabled: true,

package/src/lib/booking-api.ts

@@ -1502,6 +1502,21 @@ export interface CreateChangePaymentIntentResponse {
   currency: string;
 }
 
+export interface CreateAdminChangePaymentIntentV2Response extends CreateChangePaymentIntentResponse {
+  quoteId: string;
+  expiresAt: string;
+}
+
+export interface ApplyAdminChangeBookingV2Response {
+  bookingReference: string;
+  reservationReference: string;
+  status: string;
+  quoteId: string;
+  paymentAction: 'NONE' | 'PAID_CHARGE' | 'PENDING_CHARGE' | 'PENDING_REFUND' | string;
+  amountToCharge: number;
+  refundCandidate: number;
+}
+
 export interface ConfirmFreeChangeResponse {
   status?: string;
   booking?: unknown;
@@ -1515,7 +1530,7 @@ export interface ApplyPaidChangeResponse {
 }
 
 export interface BookingChangeIntentStatusResponse {
-  status: 'CREATED' | 'PAYMENT_REQUIRED' | 'PAYMENT_SUCCEEDED' | 'APPLYING' | 'APPLIED' | 'FAILED' | 'EXPIRED';
+  status: 'CREATED' | 'PAYMENT_REQUIRED' | 'PAYMENT_AUTHORIZED' | 'PAYMENT_SUCCEEDED' | 'APPLYING' | 'APPLIED' | 'FAILED' | 'EXPIRED';
   bookingReference?: string;
   booking?: unknown;
   failureCode?: string;
@@ -1763,6 +1778,62 @@ export async function createChangeBookingPaymentIntent(
     data) as CreateChangePaymentIntentResponse;
 }
 
+export async function createAdminChangeBookingPaymentIntentV2(
+  bookingReference: string,
+  quoteId: string,
+): Promise<CreateAdminChangePaymentIntentV2Response> {
+  const res = await fetch(
+    `${API_BASE}/1/admin/bookings/${encodeURIComponent(bookingReference)}/change/payment-intent-v2`,
+    {
+      method: 'POST',
+      headers: getAuthHeaders(),
+      body: JSON.stringify({ quoteId }),
+    },
+  );
+  if (!res.ok) {
+    const err = await parseJsonSafely(res);
+    const message = isApiErrorPayload(err)
+      ? err.errorMessage || err.error || 'Failed to prepare payment for this booking change'
+      : 'Failed to prepare payment for this booking change';
+    throw new Error(message);
+  }
+  const data = await parseJsonSafely(res);
+  return ((data as { data?: CreateAdminChangePaymentIntentV2Response } | null)?.data ??
+    data) as CreateAdminChangePaymentIntentV2Response;
+}
+
+export async function applyAdminChangeBookingV2(
+  bookingReference: string,
+  quoteId: string,
+  options: {
+    paymentMode: 'DEFER_TO_BALANCE' | 'PAY_NOW';
+    paymentIntentId?: string;
+  },
+): Promise<ApplyAdminChangeBookingV2Response> {
+  const res = await fetch(
+    `${API_BASE}/1/admin/bookings/${encodeURIComponent(bookingReference)}/change/apply-v2`,
+    {
+      method: 'POST',
+      headers: getAuthHeaders(),
+      body: JSON.stringify({
+        quoteId,
+        paymentMode: options.paymentMode,
+        ...(options.paymentIntentId ? { paymentIntentId: options.paymentIntentId } : {}),
+      }),
+    },
+  );
+  if (!res.ok) {
+    const err = await parseJsonSafely(res);
+    const message = isApiErrorPayload(err)
+      ? err.errorMessage || err.error || 'Failed to apply this booking change'
+      : 'Failed to apply this booking change';
+    throw new Error(message);
+  }
+  const data = await parseJsonSafely(res);
+  return ((data as { data?: ApplyAdminChangeBookingV2Response } | null)?.data ??
+    data) as ApplyAdminChangeBookingV2Response;
+}
+
 export async function confirmFreeChangeBooking(
   changeIntentId: string
 ): Promise<ConfirmFreeChangeResponse> {

package/test/change-booking-helpers.test.ts

@@ -34,6 +34,10 @@ import {
 } from '../src/components/booking/reservation-hold';
 import { buildAdminChangeProviderPayload } from '../src/components/booking/admin-change-provider-payload';
 import { buildPublicChangeAmountDueSummary } from '../src/components/booking/change-booking-flow-helpers';
+import {
+  buildAdminChangePaymentChoiceData,
+  buildAdminChangePayNowCheckoutModalData,
+} from '../src/components/booking/admin-change-payment-choice-runner';
 
 function quote(overrides: Partial<ChangeBookingQuoteResponse>): ChangeBookingQuoteResponse {
   return {
@@ -73,6 +77,53 @@ test('admin payment choice countdown expires exactly at the reservation deadline
   assert.equal(formatReservationHoldTime(604), '10:04');
 });
 
+test('admin existing-booking pay-now review keeps previous, updated, and exact difference totals', () => {
+  const choice = buildAdminChangePaymentChoiceData({
+    reservationReference: 'KBRCIGCO',
+    checkoutBreakdown: { lineItems: [] },
+    totalAmount: 256.58,
+    datePart: '2026-07-31',
+    timePart: '09:00',
+    availabilityProductOptionId: 'option_1',
+    clientSecret: '',
+    ticketLinesForModal: [],
+    feeLineItems: [],
+    returnPriceAdjustment: 39,
+    cancellationPolicyFee: 0,
+    subtotal: 236.48,
+    tax: 20.1,
+    totalQuantity: 3,
+    isTaxIncludedInPrice: false,
+    taxRate: 0.085,
+    promoDiscountAmount: 0,
+    previousTotal: 513.16,
+    newTotal: 769.74,
+    dialogTitle: 'Complete booking change',
+    dialogDescription: 'Pay later or collect a new card.',
+    confirmWithoutPaymentLabel: 'Pay later',
+    finalizeExistingChangeInline: true,
+    preferConfirmWithoutPayment: true,
+  } as Parameters<typeof buildAdminChangePaymentChoiceData>[0]);
+
+  const checkout = buildAdminChangePayNowCheckoutModalData(choice, 'Tauro');
+  assert.deepEqual(checkout.changeTotals, {
+    previousTotal: 513.16,
+    newTotal: 769.74,
+    differenceTotal: 256.58,
+  });
+  assert.equal(checkout.total, 256.58);
+  assert.equal(checkout.finalizeExistingChangeInline, true);
+  assert.equal(choice.confirmWithoutPaymentLabel, 'Pay later');
+  assert.equal(choice.preferConfirmWithoutPayment, true);
+  assert.equal(
+    buildAdminChangePayNowCheckoutModalData(
+      { ...choice, finalizeExistingChangeInline: undefined },
+      'Tauro',
+    ).finalizeExistingChangeInline,
+    undefined,
+  );
+});
+
 test('malformed reservation expiration fails closed', () => {
   assert.equal(reservationHoldSecondsRemaining('not-a-date', Date.now()), 0);
   assert.equal(reservationHoldHasExpired('not-a-date', Date.now()), true);
@@ -176,6 +227,8 @@ test('admin no-charge provider payload carries the selected pickup itinerary', (
     mergedProviderAdditionalAdjustments: [],
     adminStructuredAdjustments: [],
     refundDispositionsByOperationId: {},
+    pricingV2QuoteId: 'quote_reviewed',
+    pricingV2QuotedTotal: 202.87,
     previousPassengerCount: 1,
     previousAvailabilityId: 'availability_1',
     previousReturnAvailabilityId: 'return_1',
@@ -185,6 +238,10 @@ test('admin no-charge provider payload carries the selected pickup itinerary', (
   assert.deepEqual(payload?.itineraryDisplay, itineraryDisplay);
   assert.equal(payload?.pickupLocationId, 'pickup_new');
   assert.equal(payload?.travelerHotel, 'A Bear and Bison Inn');
+  assert.equal(payload?.availabilityId, 'availability_1');
+  assert.deepEqual(payload?.addOnSelections, []);
+  assert.equal(payload?.pricingV2QuoteId, 'quote_reviewed');
+  assert.equal(payload?.pricingV2QuotedTotal, 202.87);
 });
 
 test('public paid change preview shows amendment-only charges before combined tax', () => {
@@ -349,6 +406,35 @@ test('changing admin refund treatment creates a distinct authoritative quote req
   assert.notEqual(pending, noRefund);
 });
 
+test('admin cancellation policy and structured adjustments are authoritative quote inputs', () => {
+  const base = {
+    bookingReference: 'DE8H04DX',
+    lastName: 'Tauro',
+    productId: 'p_1',
+    selectedAvailability: {
+      availabilityId: 'a_1',
+      productId: 'po_1',
+      dateTime: '2026-07-21T03:00:00-06:00',
+      vacancies: 10,
+    } as Parameters<typeof buildAdminChangeQuoteRequestKey>[0]['selectedAvailability'],
+    pickupLocationId: 'pickup_1',
+    returnAvailabilityId: 'return_1',
+    quantities: { ADULT: 1 },
+    addOnSelections: [],
+    adminCustomReceiptLines: [],
+    useAdminFeAuthoritativeQuote: true,
+  };
+  const original = buildAdminChangeQuoteRequestKey(base);
+  const policyChanged = buildAdminChangeQuoteRequestKey({ ...base, cancellationPolicyId: 'flexible' });
+  const adjustmentChanged = buildAdminChangeQuoteRequestKey({
+    ...base,
+    structuredAdjustments: [{ adjustmentId: 'adj_1', mode: 'FIXED_AMOUNT', fixedAmount: 10 }],
+  });
+
+  assert.notEqual(original, policyChanged);
+  assert.notEqual(original, adjustmentChanged);
+});
+
 test('private shuttle pricing replaces the selected calendar summary with hydrated rate details', () => {
   const selectedSummary = {
     availabilityId: 'a_private',