@ticketboothapp/booking 1.2.166 → 1.2.168

package/src/components/booking/private-shuttle-provider-change-runner.ts

@@ -3,10 +3,16 @@ import type {
   ProviderDashboardInitialBooking,
 } from './provider-dashboard-change-booking';
 import type { PrivateShuttleAddOnSelection } from './private-shuttle-reservation-runner';
+import {
+  buildPrivateShuttleItineraryDisplayForStorage,
+  type PrivateShuttleCheckoutItineraryItem,
+} from './private-shuttle-reservation-runner';
 
 export interface ApplyPrivateShuttleProviderChangeParams {
   onChangeBooking: (data: ProviderDashboardChangeBookingPayload) => Promise<void>;
+  parentProductId: string;
   selectedOption: string;
+  selectedAvailabilityId?: string | null;
   selectedDate: string;
   selectedStartTime: string;
   billableResourceCount: number;
@@ -22,13 +28,18 @@ export interface ApplyPrivateShuttleProviderChangeParams {
   activePromoCode: string | null;
   totalPrice: number;
   additionalHoursCount: number;
+  draftItineraryDestinations: string[];
+  draftItineraryPlanningNotes: string;
+  itineraryDisplayItems: PrivateShuttleCheckoutItineraryItem[];
   isAdmin: boolean;
   providerChangeAuthoritativeReceipt?: ProviderDashboardChangeBookingPayload['authoritativeReceipt'];
 }
 
 export async function applyPrivateShuttleProviderChange({
   onChangeBooking,
+  parentProductId,
   selectedOption,
+  selectedAvailabilityId,
   selectedDate,
   selectedStartTime,
   billableResourceCount,
@@ -44,6 +55,9 @@ export async function applyPrivateShuttleProviderChange({
   activePromoCode,
   totalPrice,
   additionalHoursCount,
+  draftItineraryDestinations,
+  draftItineraryPlanningNotes,
+  itineraryDisplayItems,
   isAdmin,
   providerChangeAuthoritativeReceipt,
 }: ApplyPrivateShuttleProviderChangeParams): Promise<void> {
@@ -52,7 +66,9 @@ export async function applyPrivateShuttleProviderChange({
   const startTimeISO = `${selectedDate}T${String(hours).padStart(2, '0')}:${String(minutes).padStart(2, '0')}:00-06:00`;
 
   await onChangeBooking({
+    parentProductId,
     productId: selectedOption,
+    availabilityId: selectedAvailabilityId ?? null,
     dateTime: selectedDate,
     bookingItems,
     returnAvailabilityId: null,
@@ -60,6 +76,11 @@ export async function applyPrivateShuttleProviderChange({
     travelerHotel:
       selectedPickupLocationName ?? customPickupAddress ?? initialBooking?.travelerHotel ?? null,
     startTime: startTimeISO,
+    draftItinerary: {
+      destinations: draftItineraryDestinations,
+      planningNotes: draftItineraryPlanningNotes.trim(),
+    },
+    itineraryDisplay: buildPrivateShuttleItineraryDisplayForStorage(itineraryDisplayItems),
     passengerCount,
     childSafetySeatsCount: childSafetySeatsCount > 0 ? childSafetySeatsCount : null,
     foodRestrictions: foodRestrictions.trim() || null,

package/src/components/booking/private-shuttle-reservation-runner.ts

@@ -84,10 +84,11 @@ export interface ReservePrivateShuttleForCheckoutParams {
   pricingProfileIdForAvailabilities: string | null;
 }
 
-function buildPrivateShuttleItineraryDisplayForStorage(
+export function buildPrivateShuttleItineraryDisplayForStorage(
   itineraryDisplayItems: PrivateShuttleCheckoutItineraryItem[]
 ): ItineraryDisplayStep[] {
-  return itineraryDisplayItems.map((item, i) => {
+  let hasPickup = false;
+  return itineraryDisplayItems.map((item) => {
     if (item.isProposedStops) {
       return {
         stepType: ItineraryStepType.draft,
@@ -95,7 +96,8 @@ function buildPrivateShuttleItineraryDisplayForStorage(
         place: item.label,
       };
     }
-    const isPickup = i === 0;
+    const isPickup = !hasPickup;
+    hasPickup = true;
     return {
       stepType: isPickup ? ItineraryStepType.pickup : ItineraryStepType.drop_off,
       time: item.time ?? 'TBD',

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

@@ -1,5 +1,5 @@
 import type { Currency } from './CurrencySwitcher';
-import type { ItineraryDisplayStep } from '../../lib/booking-api';
+import type { AdminPromoApplicationScope, ItineraryDisplayStep } from '../../lib/booking-api';
 
 export type AdminAmendmentAdjustmentMode =
   | 'FIXED_AMOUNT'
@@ -45,6 +45,10 @@ export type ProviderDashboardChangeBookingPayload = {
   pickupLocationId?: string | null;
   travelerHotel?: string | null;
   startTime?: string | null;
+  draftItinerary?: {
+    destinations?: string[];
+    planningNotes?: string;
+  } | null;
   itineraryDisplay?: ItineraryDisplayStep[] | null;
   passengerCount?: number | null;
   childSafetySeatsCount?: number | null;
@@ -52,6 +56,7 @@ export type ProviderDashboardChangeBookingPayload = {
   addOnSelections?: Array<{ addOnId: string; variantId?: string; quantity?: number }> | null;
   cancellationPolicyId?: string | null;
   promoCode?: string | null;
+  promoApplicationScope?: AdminPromoApplicationScope | null;
   newTotalAmount?: number;
   additionalHoursCount?: number | null;
   pricingAdjustment?: {
@@ -99,6 +104,8 @@ export type ProviderDashboardChangeBookingPayload = {
 /** Seeds the flow when opening provider change-booking (matches TicketBooth `BookingWidget` `initialBooking`). */
 export type ProviderDashboardInitialBooking = {
   bookingReference: string;
+  /** Original parent catalog product id; required when the editor is mounted on a different target family. */
+  parentProductId?: string | null;
   productId: string;
   availabilityId?: string;
   dateTime: string;
@@ -111,9 +118,18 @@ export type ProviderDashboardInitialBooking = {
   pickupLocationId?: string | null;
   travelerHotel?: string | null;
   startTime?: string | null;
-  privateShuttleDetails?: { passengerCount?: number };
+  privateShuttleDetails?: {
+    passengerCount?: number;
+    requestedPassengerCount?: number | null;
+  };
   cancellationPolicyId?: string | null;
   promoCode?: string | null;
   additionalHoursCount?: number | null;
   addOnSelections?: Array<{ addOnId: string; variantId?: string; quantity?: number }> | null;
+  customer?: {
+    firstName?: string | null;
+    lastName?: string | null;
+    email?: string | null;
+    phoneNumber?: string | null;
+  } | null;
 };

package/src/components/booking/use-standard-booking-availability.ts

@@ -18,7 +18,10 @@ import {
   type Product,
   type ReturnOption,
 } from '../../lib/booking-api';
-import { filterAvailabilitiesAfterPublicBookingCutoff } from '../../lib/booking/booking-cutoffs';
+import {
+  filterAvailabilitiesAfterCurrentTime,
+  filterAvailabilitiesAfterPublicBookingCutoff,
+} from '../../lib/booking/booking-cutoffs';
 import { shouldReplacePricingConfig } from '../../lib/booking/pricing-config';
 import { useAvailabilitiesCache, buildAvailabilitiesCacheKey } from '../../contexts/AvailabilitiesCacheContext';
 import {
@@ -628,7 +631,7 @@ export function useStandardBookingAvailability({
       });
 
       return isAdmin
-        ? currentOrFutureAvailabilities
+        ? filterAvailabilitiesAfterCurrentTime(currentOrFutureAvailabilities, bookingCutoffNow)
         : filterAvailabilitiesAfterPublicBookingCutoff(
           currentOrFutureAvailabilities,
           bookingCutoffNow,

package/src/components/booking/useAdminChangeCheckoutController.ts

@@ -12,7 +12,9 @@ import {
   type AddOn,
   type AdminAmendmentOperationSnapshot,
   type AdminAmendmentRefundDisposition,
+  type AdminAmendmentActiveAdjustmentSnapshot,
   type AdminFeAuthoritativeReceipt,
+  type AdminPromoApplicationScope,
   type Availability,
   type ChangeBookingQuotePricingDriftDetail,
   type ChangeBookingQuoteTicketPricingTrace,
@@ -41,6 +43,7 @@ import {
 import type { ChangeBookingFlowProps } from './booking-flow-types';
 import type { CheckoutModalLineItem } from './CheckoutModal';
 import type { Currency } from './CurrencySwitcher';
+import type { AdminAdjustmentComponentOption } from './admin-adjustment-components';
 import {
   findMergedAvailabilityForSelection,
   findMergedReturnVacancies,
@@ -67,6 +70,10 @@ import {
   confirmFreeAdminCustomerChange,
   quoteAdminCustomerChangeForCheckout,
 } from './admin-change-customer-quote-runner';
+import {
+  buildAdminChangeV2QuoteRequest,
+  quoteAdminChangeV2ForUi,
+} from './admin-change-v2-quote-request';
 import {
   reservationHoldHasExpired,
   RESERVATION_HOLD_EXPIRED_MESSAGE,
@@ -86,6 +93,10 @@ export interface AdminChangeLatestQuote {
   quoteExpiresAt?: string;
   pricingVersion?: string;
   quotedTotal?: number;
+  amountPreviouslyPaid?: number;
+  currentPaymentCreditTotal?: number;
+  projectedPaymentCreditTotal?: number;
+  refundCandidate?: number;
   paymentCreditTotal?: number;
   refundDecisionOperations?: AdminAmendmentOperationSnapshot[];
   returnPriceTreatmentOperations?: AdminAmendmentOperationSnapshot[];
@@ -95,8 +106,11 @@ export interface AdminChangeLatestQuote {
   quotePreviousTotalCents?: number;
   quoteNewTotalCents?: number;
   serverPreview: ChangeBookingServerPreview;
+  authoritativeItineraryDisplay?: ItineraryDisplayStep[] | null;
   pricingDriftDetail?: ChangeBookingQuotePricingDriftDetail;
   ticketPricingTrace?: ChangeBookingQuoteTicketPricingTrace | null;
+  selectableAdjustmentComponents?: AdminAdjustmentComponentOption[];
+  reversibleAdjustments?: AdminAmendmentActiveAdjustmentSnapshot[];
 }
 
 export interface UseAdminChangeCheckoutControllerParams {
@@ -136,10 +150,12 @@ export interface UseAdminChangeCheckoutControllerParams {
   onChangeBooking?: ChangeBookingFlowProps['onChangeBooking'];
   cancellationPolicyId: string | null;
   appliedPromoCode: string | null;
+  promoApplicationScope: AdminPromoApplicationScope;
   displayChangeFlowProposedTotalWithEditableLines: number;
   providerPricingOverrides: AdminChangeProviderLineOverride[];
   mergedProviderAdditionalAdjustments: AdminChangeProviderAdditionalAdjustment[];
   adminStructuredAdjustments: NonNullable<ProviderDashboardChangeBookingPayload['structuredAdjustments']>;
+  adminReverseAdjustmentIds: string[];
   refundDispositionsByOperationId: NonNullable<
     ProviderDashboardChangeBookingPayload['refundDispositionsByOperationId']
   >;
@@ -237,10 +253,12 @@ export function useAdminChangeCheckoutController({
   onChangeBooking,
   cancellationPolicyId,
   appliedPromoCode,
+  promoApplicationScope,
   displayChangeFlowProposedTotalWithEditableLines,
   providerPricingOverrides,
   mergedProviderAdditionalAdjustments,
   adminStructuredAdjustments,
+  adminReverseAdjustmentIds,
   refundDispositionsByOperationId,
   providerApplyAuthoritativeReceipt,
   onSuccess,
@@ -358,10 +376,12 @@ export function useAdminChangeCheckoutController({
       cancellationPolicyId,
       initialCancellationPolicyId: initialValues?.cancellationPolicyId ?? null,
       appliedPromoCode,
+      promoApplicationScope,
       newTotalAmount: displayChangeFlowProposedTotalWithEditableLines,
       providerPricingOverrides,
       mergedProviderAdditionalAdjustments,
       adminStructuredAdjustments,
+      adminReverseAdjustmentIds,
       refundDispositionsByOperationId,
       pricingV2QuoteId: authoritativeQuote?.quoteId ?? null,
       pricingV2QuotedTotal: authoritativeQuote?.quotedTotal ?? authoritativeQuote?.serverDisplay?.total ?? null,
@@ -461,7 +481,42 @@ export function useAdminChangeCheckoutController({
       let confirmedChangeAmountDueForCheckout: number | null = null;
       let authoritativeChangeQuoteForCheckout = latestChangeQuote;
 
-      if (isCustomerSelfServeChange) {
+      if (isProviderDashboardChange && isChangeBookingContext) {
+        const bookingReference = initialValues?.bookingReference?.trim();
+        if (!bookingReference) throw new Error('Missing booking reference.');
+        authoritativeChangeQuoteForCheckout = await quoteAdminChangeV2ForUi(
+          buildAdminChangeV2QuoteRequest({
+            bookingReference,
+            lastName,
+            parentProductId: product.productId,
+            optionId: availabilityProductOptionId,
+            selectedAvailability,
+            pickupLocationId,
+            returnAvailabilityId: selectedReturnOption?.returnAvailabilityId ?? null,
+            bookingItems,
+            addOnSelections,
+            cancellationPolicyId,
+            promoCode: appliedPromoCode,
+            promoApplicationScope,
+            structuredAdjustments: adminStructuredAdjustments,
+            reverseAdjustmentIds: adminReverseAdjustmentIds,
+            includeSelectableAdjustmentComponents: adminStructuredAdjustments.some(
+              (adjustment) => adjustment.scope === 'SELECTED_COMPONENTS',
+            ),
+            refundDispositionsByOperationId,
+            previousPassengerCount: changeFlowInitialTicketCount,
+            previousAvailabilityId: initialValues?.availabilityId ?? null,
+            previousReturnAvailabilityId: initialValues?.returnAvailabilityId ?? null,
+          }),
+          {
+            total: changeFlowNewBookingTotal,
+            subtotal: effectiveSubtotalForCheckout,
+            tax: effectiveTax,
+          },
+          currency,
+        );
+        setLatestChangeQuote(authoritativeChangeQuoteForCheckout);
+      } else if (isCustomerSelfServeChange) {
         const quoteResult = await quoteAdminCustomerChangeForCheckout({
           bookingReference: initialValues?.bookingReference,
           lastName,

package/src/components/booking/useAdminChangeProductReset.ts

@@ -8,6 +8,7 @@ interface ResetRef {
 
 export interface UseAdminChangeProductResetParams {
   selectedChangeProductId: string;
+  setQuantities: Dispatch<SetStateAction<Record<string, number>>>;
   setSelectedAvailability: Dispatch<SetStateAction<Availability | null>>;
   setSelectedReturnOption: Dispatch<SetStateAction<ReturnOption | null>>;
   setAddOns: Dispatch<SetStateAction<AddOn[]>>;
@@ -21,6 +22,7 @@ export interface UseAdminChangeProductResetParams {
 
 export function useAdminChangeProductReset({
   selectedChangeProductId,
+  setQuantities,
   setSelectedAvailability,
   setSelectedReturnOption,
   setAddOns,
@@ -36,6 +38,9 @@ export function useAdminChangeProductReset({
   useEffect(() => {
     if (previousSelectedChangeProductIdRef.current === selectedChangeProductId) return;
     previousSelectedChangeProductIdRef.current = selectedChangeProductId;
+    // Ticket categories belong to the selected product family. In particular, a private
+    // RESOURCE quantity must not survive a switch to a regular ADULT/CHILD/INFANT product.
+    setQuantities({});
     setSelectedAvailability(null);
     setSelectedReturnOption(null);
     setAddOns([]);
@@ -47,6 +52,7 @@ export function useAdminChangeProductReset({
     setError('');
   }, [
     selectedChangeProductId,
+    setQuantities,
     setSelectedAvailability,
     setSelectedReturnOption,
     setAddOns,

package/src/components/booking/useAdminChangeProtectedPricing.ts

@@ -20,6 +20,7 @@ type AdminCustomReceiptLine = {
   amountInput: string;
   amountSign?: number;
   calculation: 'FIXED_AMOUNT' | 'PERCENTAGE';
+  sourceAdjustmentId?: string;
 };
 
 function addOnSelectionTotal(selections: AddOnSelection[] | null | undefined, addOns: AddOn[]): number {
@@ -220,6 +221,9 @@ export function useAdminChangeProtectedPricing({
     () =>
       roundMoney(
         adminCustomReceiptLines.reduce((sum, line) => {
+          // Existing ledger adjustments are already included in the persisted receipt. Their
+          // edit delta is server-priced as reverse + replace and must not be added again here.
+          if (line.sourceAdjustmentId) return sum;
           if (line.calculation !== 'FIXED_AMOUNT') return sum;
           const raw = line.amountInput.trim();
           if (raw === '' || raw === '+' || raw === '-') return sum;

package/src/components/booking/useAdminChangeQuoteDisplayState.tsx

@@ -55,7 +55,7 @@ export interface UseAdminChangeQuoteDisplayStateParams {
   pickupLocationId: string | null;
   quantities: Record<string, number>;
   addOnSelections: AddOnSelection[];
-  initialAddOnMinQtyByKey: Map<string, number>;
+  initialAddOnQtyByKey: Map<string, number>;
   changeFlowResolvedInitialProductOptionId: string | null;
   selectedParentProductChanged: boolean;
   isProviderDashboardChange: boolean;
@@ -65,6 +65,7 @@ export interface UseAdminChangeQuoteDisplayStateParams {
   editableSummaryPreSubtotalDelta: number;
   adminCustomAdjustmentTotal: number;
   adminCustomReceiptLines: AdminCustomReceiptLine[];
+  adminReverseAdjustmentIds: string[];
   isManualOverrideEligibleLine: (line: ProviderDashboardPricingLine) => boolean;
   isAdmin: boolean;
   useAdminFeAuthoritativeQuote: boolean;
@@ -99,7 +100,7 @@ export function useAdminChangeQuoteDisplayState({
   pickupLocationId,
   quantities,
   addOnSelections,
-  initialAddOnMinQtyByKey,
+  initialAddOnQtyByKey,
   changeFlowResolvedInitialProductOptionId,
   selectedParentProductChanged,
   isProviderDashboardChange,
@@ -109,6 +110,7 @@ export function useAdminChangeQuoteDisplayState({
   editableSummaryPreSubtotalDelta,
   adminCustomAdjustmentTotal,
   adminCustomReceiptLines,
+  adminReverseAdjustmentIds,
   isManualOverrideEligibleLine,
   isAdmin,
   useAdminFeAuthoritativeQuote,
@@ -321,14 +323,14 @@ export function useAdminChangeQuoteDisplayState({
     pickupLocationId,
     quantities,
     addOnSelections,
-    initialAddOnMinQtyByKey,
+    initialAddOnQtyByKey,
     changeFlowResolvedInitialProductOptionId,
     productChanged: selectedParentProductChanged,
   });
   const hasChangeSelection =
-    isProviderDashboardChange
+    (isProviderDashboardChange
       ? changeSelectionDetails.hasOperationalChangesFromInitial
-      : changeSelectionDetails.hasChangesFromInitial;
+      : changeSelectionDetails.hasChangesFromInitial) || Boolean(appliedPromoCode);
 
   const {
     providerTotalsPreview,
@@ -344,8 +346,8 @@ export function useAdminChangeQuoteDisplayState({
     providerQuotedLines,
     hasChangeSelection,
     editableSummaryPreSubtotalDelta,
-    adminCustomAdjustmentTotal,
     adminCustomReceiptLines,
+    adminReverseAdjustmentIds,
     isManualOverrideEligibleLine,
   });