@ticketboothapp/booking 1.2.161 → 1.2.162

package/package.json

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

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,

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

@@ -338,6 +338,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,
@@ -417,6 +419,31 @@ export function useAdminChangeCheckoutController({
         return;
       }
 
+      // Provider changes are applied by the dashboard through the exact Pricing V2 quote.
+      // Do not create the legacy FE-authoritative change intent or collect a card payment first;
+      // apply-v2 records any positive delta as a quote-linked pending balance.
+      if (isProviderDashboardChange && isChangeBookingContext) {
+        if (!onChangeBooking) {
+          throw new Error('Provider change handler is unavailable.');
+        }
+        if (!latestChangeQuote?.quoteId || latestChangeQuote.canProceed === false) {
+          throw new Error(latestChangeQuote?.reasonIfBlocked || 'The authoritative change quote is not ready.');
+        }
+        const providerPayload = buildProviderChangePayload(availabilityProductOptionId, bookingItems);
+        if (!providerPayload) {
+          throw new Error('No availability selected');
+        }
+        await onChangeBooking(providerPayload);
+        const bookingReference = initialValues?.bookingReference?.trim();
+        if (!bookingReference) {
+          throw new Error('Missing booking reference.');
+        }
+        onSuccess?.({ reservationReference: bookingReference });
+        finishManageFlow(bookingReference);
+        setLoading(false);
+        return;
+      }
+
       const bookingSourceContext = buildBookingSourceContext(bookingSourceAttribution, {
         clientChannelSource: inferClientBookingSourceFromProductIds(
           product.productId,

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

@@ -1515,7 +1515,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;

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

@@ -176,6 +176,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 +187,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 +355,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',