@ticketboothapp/booking 1.2.167 → 1.2.168

package/src/components/booking/PickupLocationSelector.module.css

@@ -3,6 +3,28 @@
  * Uses CSS module to avoid Tailwind purging/override issues in booking-flow.
  */
 
+.searchInputWrapper {
+  position: relative;
+}
+
+.searchIcon {
+  position: absolute;
+  top: 50%;
+  left: 1rem;
+  z-index: 1;
+  width: 1.25rem;
+  height: 1.25rem;
+  color: #a8a29e;
+  pointer-events: none;
+  transform: translateY(-50%);
+}
+
+.searchIcon svg {
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+
 /* Filter pills - horizontal scroll on mobile, scrollbar hidden until scroll (overlay-style) */
 .filterPillsScroll {
   display: flex;

package/src/components/booking/PickupLocationSelector.tsx

@@ -916,9 +916,9 @@ function PickupLocationSelectorWithMap(props: PickupLocationSelectorProps) {
       )}
 
       {/* Input with search icon inside - padding ensures text stays to the right of icon */}
-      <div className="relative">
-        <div className="absolute inset-y-0 left-0 pl-4 flex items-center pointer-events-none text-stone-400">
-          <svg className="h-5 w-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+      <div className={styles.searchInputWrapper}>
+        <div className={styles.searchIcon}>
+          <svg fill="none" stroke="currentColor" viewBox="0 0 24 24" aria-hidden="true">
             <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
           </svg>
         </div>

package/src/components/booking/PriceSummary.tsx

@@ -80,6 +80,8 @@ export interface PriceSummaryProps {
   hideSubtotal?: boolean;
   /** Overrides the final "Total" row label (e.g. change booking: amount due for the change) */
   totalLabel?: string;
+  /** Prefix a positive total with + when the row represents a signed change rather than an absolute total. */
+  showPositiveTotalSign?: boolean;
   /** Render after the total row (e.g. provider price delta + keep-original-price) */
   extraAfterTotal?: ReactNode;
   /** Optional map of editable line input values by line key. */
@@ -182,6 +184,7 @@ export function PriceSummary({
   depositMode,
   hideSubtotal = false,
   totalLabel,
+  showPositiveTotalSign = false,
   extraAfterTotal,
   lineAmountInputs,
   lineLabelInputs,
@@ -382,6 +385,7 @@ export function PriceSummary({
                 (t('common.total') && t('common.total') !== 'common.total' ? t('common.total') : 'Total')}
             </span>
             <span className="flex-shrink-0 whitespace-nowrap font-semibold text-stone-900">
+              {showPositiveTotalSign && total > 0.005 ? '+' : ''}
               {formatCurrencyAmount(total, currency, locale)}
             </span>
           </div>

package/src/components/booking/PrivateShuttleBookingFlow.tsx

@@ -32,6 +32,7 @@ import { PrivateShuttleStartTimeSection } from './PrivateShuttleStartTimeSection
 import {
   getPrivateShuttleAvailabilityOptionId,
   privateShuttleBookingCutoffMessage,
+  privateShuttleInitialDateKey,
   privateShuttleStartDateTime,
   privateShuttleStartTimeAllowed,
   resolveHydratedPrivateShuttleAvailability,
@@ -51,6 +52,7 @@ import {
 } from './usePrivateShuttlePriceSummary';
 import { usePrivateShuttlePromoController } from './usePrivateShuttlePromoController';
 import { useBookingViewItemAnalytics } from './useBookingViewItemAnalytics';
+import { resolvePrivateShuttleCancellationPolicyId } from './private-shuttle-cancellation-policy';
 
 interface PrivateShuttleBookingFlowProps {
   product: Product;
@@ -131,7 +133,12 @@ export function PrivateShuttleBookingFlow({
   const isAdmin = permissions.viewerRole === 'admin';
   const isProviderChangeMode = Boolean(initialBooking && onChangeBooking);
 
-  const [selectedDate, setSelectedDate] = useState<string>('');
+  const [selectedDate, setSelectedDate] = useState<string>(() =>
+    privateShuttleInitialDateKey(
+      initialBooking?.dateTime ?? initialValues?.dateTime,
+      companyTimezone,
+    )
+  );
   const [selectedAvailability, setSelectedAvailability] = useState<Availability | null>(null);
   const [selectedOption, setSelectedOption] = useState<string>('');
   const [selectedStartTime, setSelectedStartTime] = useState<string>('');
@@ -139,10 +146,16 @@ export function PrivateShuttleBookingFlow({
   const [passengerCount, setPassengerCount] = useState<number>(
     () => initialBooking?.privateShuttleDetails?.passengerCount ?? initialValues?.passengers ?? 1
   );
-  const [email, setEmail] = useState('');
-  const [firstName, setFirstName] = useState('');
-  const [lastName, setLastName] = useState('');
-  const [phoneNumber, setPhoneNumber] = useState('');
+  const [email, setEmail] = useState(() => initialBooking?.customer?.email?.trim() ?? '');
+  const [firstName, setFirstName] = useState(
+    () => initialBooking?.customer?.firstName?.trim() ?? ''
+  );
+  const [lastName, setLastName] = useState(
+    () => initialBooking?.customer?.lastName?.trim() ?? ''
+  );
+  const [phoneNumber, setPhoneNumber] = useState(
+    () => initialBooking?.customer?.phoneNumber?.trim() ?? ''
+  );
   const [pickupLocationId, setPickupLocationId] = useState<string | null>(
     () => initialBooking?.pickupLocationId ?? initialValues?.pickupLocationId ?? null
   );
@@ -544,14 +557,14 @@ export function PrivateShuttleBookingFlow({
   }, [isAdmin, isCustomTimeMode, selectedStartTime, suggestedStartTimes]);
 
   useEffect(() => {
-    if (
-      pricingConfig?.cancellationPolicies &&
-      pricingConfig.cancellationPolicies.length > 0 &&
-      !cancellationPolicyId
-    ) {
-      setCancellationPolicyId(pricingConfig.cancellationPolicies[0].id);
-    }
-  }, [pricingConfig?.cancellationPolicies, cancellationPolicyId]);
+    const policies = pricingConfig?.cancellationPolicies;
+    if (!policies?.length || forcedCancellationPolicy) return;
+    const resolved = resolvePrivateShuttleCancellationPolicyId(
+      cancellationPolicyId,
+      policies.map((policy) => policy.id),
+    );
+    if (resolved !== cancellationPolicyId) setCancellationPolicyId(resolved);
+  }, [pricingConfig?.cancellationPolicies, cancellationPolicyId, forcedCancellationPolicy]);
 
   const handleOptionSelect = (optionId: string) => {
     setSelectedOption(optionId);
@@ -808,6 +821,7 @@ export function PrivateShuttleBookingFlow({
               isLoading={loadingAvailabilities || isFetchingMoreAvailabilities}
               onDateSelect={handleDateSelect}
               timezone={companyTimezone}
+              syncVisibleWeekToSelectedDate={isProviderChangeMode || Boolean(initialValues?.dateTime)}
               displayMode="status"
               earliestDate={earliestAvailabilityDate}
               onVisibleRangeChange={handleVisibleRangeChange}

package/src/components/booking/PrivateShuttleCheckoutSection.tsx

@@ -123,7 +123,8 @@ export function PrivateShuttleCheckoutSection({
   partnerDeferredInvoiceSubmitLabel,
 }: PrivateShuttleCheckoutSectionProps) {
   const amountDueToday = depositInfo ? depositInfo.depositAmount : totalPrice;
-  const formattedAmountDueToday = formatCurrencyAmount(amountDueToday, currency, locale);
+  const displayedTotal = isProviderChangeMode ? totalPrice : amountDueToday;
+  const formattedDisplayedTotal = formatCurrencyAmount(displayedTotal, currency, locale);
   const hasCancellationPolicies = Boolean(cancellationPolicies?.length || forcedCancellationPolicy);
 
   return (
@@ -131,7 +132,7 @@ export function PrivateShuttleCheckoutSection({
       <div className={`${styles.section} mt-6`}>
         <PriceSummary
           lines={priceSummaryLines}
-          total={amountDueToday}
+          total={displayedTotal}
           currency={currency}
           locale={locale}
           taxAmount={effectiveTaxAmount}
@@ -158,7 +159,7 @@ export function PrivateShuttleCheckoutSection({
           size="sm"
           t={t}
           depositMode={
-            depositInfo
+            !isProviderChangeMode && depositInfo
               ? {
                   totalLabel: t('booking.deposit') || 'Deposit',
                   balanceAmount: depositInfo.balanceAmount,
@@ -166,9 +167,15 @@ export function PrivateShuttleCheckoutSection({
                 }
               : undefined
           }
-          hideSubtotal={!!depositInfo}
+          hideSubtotal={!isProviderChangeMode && !!depositInfo}
         />
-        {depositInfo && (
+        {isProviderChangeMode ? (
+          <div className="mt-3 rounded-lg border border-sky-200 bg-sky-50 p-3 text-xs text-sky-900">
+            This is the updated booking total. Payments already made stay with this booking and are
+            applied first; only the remaining balance will be recorded as owing.
+          </div>
+        ) : null}
+        {!isProviderChangeMode && depositInfo && (
           <div className="deposit-notice mt-3 p-3 bg-amber-50 border border-amber-200 rounded-lg text-amber-800">
             <p className="text-xs font-medium">
               {(t('booking.depositPaymentNotice') !== 'booking.depositPaymentNotice'
@@ -190,51 +197,78 @@ export function PrivateShuttleCheckoutSection({
 
       <div className="border-t border-stone-200 pt-6 space-y-4">
         <div className="space-y-4">
-          <div className={styles.contactGrid}>
-            <div>
-              <label className={styles.sectionLabel}>
-                {t('booking.firstName')} <span className={styles.required}>*</span>
-              </label>
-              <input
-                type="text"
-                value={firstName}
-                onChange={(e) => onFirstNameChange(e.target.value)}
-                placeholder={t('booking.firstNamePlaceholder')}
-                className={styles.input}
-              />
+          {isProviderChangeMode ? (
+            <div className="rounded-lg border border-stone-200 bg-stone-50 p-4">
+              <p className="m-0 text-sm font-semibold text-stone-900">Existing booking contact</p>
+              <div className="mt-3 grid gap-3 text-sm sm:grid-cols-2">
+                <div>
+                  <span className="block text-xs font-medium text-stone-500">Name</span>
+                  <span className="text-stone-900">
+                    {[firstName, lastName].filter(Boolean).join(' ') || 'Not provided'}
+                  </span>
+                </div>
+                <div>
+                  <span className="block text-xs font-medium text-stone-500">Email</span>
+                  <span className="text-stone-900">{email || 'Not provided'}</span>
+                </div>
+                <div>
+                  <span className="block text-xs font-medium text-stone-500">Phone</span>
+                  <span className="text-stone-900">{phoneNumber || 'Not provided'}</span>
+                </div>
+              </div>
+              <p className="mb-0 mt-3 text-xs text-stone-600">
+                These customer details stay unchanged on the existing booking.
+              </p>
             </div>
-            <div>
-              <label className={styles.sectionLabel}>
-                {t('booking.lastName')} <span className={styles.required}>*</span>
-              </label>
-              <input
-                type="text"
-                value={lastName}
-                onChange={(e) => onLastNameChange(e.target.value)}
-                placeholder={t('booking.lastNamePlaceholder')}
-                className={styles.input}
+          ) : (
+            <>
+              <div className={styles.contactGrid}>
+                <div>
+                  <label className={styles.sectionLabel}>
+                    {t('booking.firstName')} <span className={styles.required}>*</span>
+                  </label>
+                  <input
+                    type="text"
+                    value={firstName}
+                    onChange={(e) => onFirstNameChange(e.target.value)}
+                    placeholder={t('booking.firstNamePlaceholder')}
+                    className={styles.input}
+                  />
+                </div>
+                <div>
+                  <label className={styles.sectionLabel}>
+                    {t('booking.lastName')} <span className={styles.required}>*</span>
+                  </label>
+                  <input
+                    type="text"
+                    value={lastName}
+                    onChange={(e) => onLastNameChange(e.target.value)}
+                    placeholder={t('booking.lastNamePlaceholder')}
+                    className={styles.input}
+                  />
+                </div>
+              </div>
+              <div>
+                <label className={styles.sectionLabel}>
+                  {t('common.emailForConfirmation')} <span className={styles.required}>*</span>
+                </label>
+                <input
+                  type="email"
+                  value={email}
+                  onChange={(e) => onEmailChange(e.target.value)}
+                  placeholder={t('common.emailPlaceholder')}
+                  className={styles.input}
+                />
+              </div>
+              <CheckoutOptionalPhoneFields
+                idPrefix="shuttle"
+                labelClassName={styles.sectionLabel}
+                phoneNumber={phoneNumber}
+                onPhoneNumberChange={onPhoneNumberChange}
+                t={t}
               />
-            </div>
-          </div>
-          <div>
-            <label className={styles.sectionLabel}>
-              {t('common.emailForConfirmation')} <span className={styles.required}>*</span>
-            </label>
-            <input
-              type="email"
-              value={email}
-              onChange={(e) => onEmailChange(e.target.value)}
-              placeholder={t('common.emailPlaceholder')}
-              className={styles.input}
-            />
-          </div>
-          <CheckoutOptionalPhoneFields
-            idPrefix="shuttle"
-            labelClassName={styles.sectionLabel}
-            phoneNumber={phoneNumber}
-            onPhoneNumberChange={onPhoneNumberChange}
-            t={t}
-          />
+            </>
+          )}
           {hasCancellationPolicies && (
             <div>
               <CancellationPolicySelector
@@ -250,10 +284,17 @@ export function PrivateShuttleCheckoutSection({
                 onPolicySelect={onCancellationPolicySelect}
                 forcedPolicy={forcedCancellationPolicy}
                 rowSubtitle={
-                  <>
-                    <b>Your deposit today is 100% refundable</b> - only once we align on an itinerary
-                    that you approve, will your deposit be locked in.
-                  </>
+                  isProviderChangeMode ? (
+                    <>
+                      This policy applies to the updated private booking. Payments already made stay
+                      on the existing booking.
+                    </>
+                  ) : (
+                    <>
+                      <b>Your deposit today is 100% refundable</b> - only once we align on an itinerary
+                      that you approve, will your deposit be locked in.
+                    </>
+                  )
                 }
               />
             </div>
@@ -327,8 +368,8 @@ export function PrivateShuttleCheckoutSection({
                   ? 'Processing...'
                   : (t('booking.creatingReservation') || 'Creating reservation...')
                 : isProviderChangeMode
-                  ? `Change booking (${formattedAmountDueToday})`
-                  : `${partnerDeferredInvoiceSubmitLabel || t('booking.continueToPayment') || 'Continue to Payment'} (${formattedAmountDueToday})`}
+                  ? `Change booking (updated total ${formattedDisplayedTotal})`
+                  : `${partnerDeferredInvoiceSubmitLabel || t('booking.continueToPayment') || 'Continue to Payment'} (${formattedDisplayedTotal})`}
             </button>
             <p className={styles.secureNote}>
               {t('booking.securePayment') || 'Secure payment powered by Stripe'}

package/src/components/booking/admin-adjustment-components.ts

@@ -0,0 +1,44 @@
+import type { ChangeBookingQuoteResponse } from '../../lib/booking-api';
+
+export type AdminAdjustmentComponentOption = {
+  componentId: string;
+  label: string;
+  amount: number;
+  type: string;
+};
+
+const NON_SELECTABLE_TYPES = new Set([
+  'TAX',
+  'ROUNDING',
+  'SYSTEM',
+  'PROMO_CODE',
+  'GIFT_CARD',
+  'DEAL',
+  'DISCOUNT',
+  'BOOKING_CHANGE',
+]);
+
+export function selectableAdminAdjustmentComponentsFromQuote(
+  quote: ChangeBookingQuoteResponse,
+): AdminAdjustmentComponentOption[] {
+  const pricingQuote = quote.pricingQuote ?? quote.quote;
+  const lines = pricingQuote?.amendment?.updatedReceipt?.lineItems ?? [];
+  const byId = new Map<string, AdminAdjustmentComponentOption>();
+
+  lines.forEach((line) => {
+    const componentId = line.identity?.componentId?.trim() || line.reference?.trim();
+    const type = line.type?.trim().toUpperCase() || 'ITEM';
+    const amount = Number(line.amount ?? 0);
+    if (!componentId || !Number.isFinite(amount) || amount <= 0 || NON_SELECTABLE_TYPES.has(type)) {
+      return;
+    }
+    byId.set(componentId, {
+      componentId,
+      label: line.label?.trim() || type,
+      amount,
+      type,
+    });
+  });
+
+  return [...byId.values()];
+}

package/src/components/booking/admin-adjustment-tax-behavior.ts

@@ -0,0 +1,50 @@
+import type { AdminCustomReceiptLine } from './useAdminCustomReceiptLines';
+
+export type AdminAdjustmentTaxBehavior = AdminCustomReceiptLine['taxBehavior'];
+
+export type AdminAdjustmentTaxBehaviorOption = {
+  value: AdminAdjustmentTaxBehavior;
+  label: string;
+};
+
+const CHARGE_OPTIONS: readonly AdminAdjustmentTaxBehaviorOption[] = [
+  { value: 'TAXABLE', label: 'Taxable' },
+  { value: 'NON_TAXABLE', label: 'Non-taxable' },
+];
+
+const CREDIT_OPTIONS: readonly AdminAdjustmentTaxBehaviorOption[] = [
+  { value: 'PRE_TAX_DISCOUNT', label: 'Pre-tax discount' },
+  { value: 'POST_TAX_DISCOUNT', label: 'Post-tax discount' },
+];
+
+export function adminAdjustmentTaxBehaviorOptions(
+  amountSign: AdminCustomReceiptLine['amountSign'],
+): readonly AdminAdjustmentTaxBehaviorOption[] {
+  return amountSign === -1 ? CREDIT_OPTIONS : CHARGE_OPTIONS;
+}
+
+export function normalizeAdminAdjustmentTaxBehavior(
+  amountSign: AdminCustomReceiptLine['amountSign'],
+  current: AdminAdjustmentTaxBehavior,
+): AdminAdjustmentTaxBehavior {
+  const options = adminAdjustmentTaxBehaviorOptions(amountSign);
+  return options.some((option) => option.value === current)
+    ? current
+    : options[0].value;
+}
+
+export type AdminAdjustmentScope = AdminCustomReceiptLine['scope'];
+
+/**
+ * New custom lines start as charges against added value. A credit against that
+ * scope has no basis until the amendment also adds priced value, so switching
+ * direction defaults to the existing active tickets instead.
+ */
+export function normalizeAdminAdjustmentScopeForSign(
+  amountSign: AdminCustomReceiptLine['amountSign'],
+  current: AdminAdjustmentScope,
+): AdminAdjustmentScope {
+  return amountSign === -1 && current === 'POSITIVE_AMENDMENT_VALUE'
+    ? 'CURRENT_ACTIVE_TICKETS'
+    : current;
+}

package/src/components/booking/admin-change-flow-state-helpers.ts

@@ -66,6 +66,16 @@ export function buildChangeBookingMinimumQuantities({
   return minimums;
 }
 
+export function shouldLockExistingAddOnQuantities({
+  isCustomerSelfServeChange,
+  isAdmin,
+}: {
+  isCustomerSelfServeChange: boolean;
+  isAdmin: boolean;
+}): boolean {
+  return isCustomerSelfServeChange && !isAdmin;
+}
+
 export function resolveInitialChangeProductOptionId({
   initialProductId,
   initialProductOptionId,

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

@@ -39,6 +39,7 @@ export interface BuildAdminChangeProviderPayloadParams {
   providerPricingOverrides: AdminChangeProviderLineOverride[];
   mergedProviderAdditionalAdjustments: AdminChangeProviderAdditionalAdjustment[];
   adminStructuredAdjustments: NonNullable<ProviderDashboardChangeBookingPayload['structuredAdjustments']>;
+  adminReverseAdjustmentIds?: string[];
   refundDispositionsByOperationId: NonNullable<
     ProviderDashboardChangeBookingPayload['refundDispositionsByOperationId']
   >;
@@ -67,6 +68,7 @@ export function buildAdminChangeProviderPayload({
   providerPricingOverrides,
   mergedProviderAdditionalAdjustments,
   adminStructuredAdjustments,
+  adminReverseAdjustmentIds = [],
   refundDispositionsByOperationId,
   pricingV2QuoteId,
   pricingV2QuotedTotal,
@@ -114,6 +116,7 @@ export function buildAdminChangeProviderPayload({
         : undefined,
     authoritativeReceipt: providerApplyAuthoritativeReceipt,
     structuredAdjustments: adminStructuredAdjustments,
+    reverseAdjustmentIds: adminReverseAdjustmentIds,
     refundDispositionsByOperationId,
     pricingV2QuoteId: pricingV2QuoteId ?? null,
     pricingV2QuotedTotal: pricingV2QuotedTotal ?? null,

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

@@ -15,10 +15,36 @@ interface AdminChangeQuoteRequestKeyInput {
   promoCode?: string | null;
   promoApplicationScope?: AdminPromoApplicationScope | null;
   structuredAdjustments?: unknown[];
+  reverseAdjustmentIds?: string[];
   refundDispositionsByOperationId?: Record<string, string>;
   useAdminFeAuthoritativeQuote: boolean;
 }
 
+interface AdminChangeQuoteRequestGateInput {
+  isCustomerSelfServeChange: boolean;
+  hasEffectiveChangeSelection: boolean;
+  hasSelectedAvailability: boolean;
+  bookingReference?: string | null;
+  lastName: string;
+  missingRequiredReturnSelection: boolean;
+}
+
+/**
+ * Whether the current admin inputs are complete enough to request an authoritative quote.
+ * `hasEffectiveChangeSelection` deliberately includes adjustment-only changes, even when
+ * product, tickets, return, pickup, and itinerary are otherwise unchanged.
+ */
+export function canRequestAdminChangeQuote(input: AdminChangeQuoteRequestGateInput): boolean {
+  return Boolean(
+    input.isCustomerSelfServeChange &&
+      input.hasEffectiveChangeSelection &&
+      input.hasSelectedAvailability &&
+      input.bookingReference?.trim() &&
+      input.lastName.trim() &&
+      !input.missingRequiredReturnSelection,
+  );
+}
+
 /**
  * Identity of a price request. This must contain user-controlled quote inputs only.
  * Server/display-derived receipt state must never invalidate the response that produced it.
@@ -41,6 +67,7 @@ export function buildAdminChangeQuoteRequestKey(input: AdminChangeQuoteRequestKe
     promoCode: input.promoCode?.trim().toUpperCase() ?? null,
     promoApplicationScope: input.promoCode ? (input.promoApplicationScope ?? 'CHANGE_ONLY') : null,
     structuredAdjustments: input.structuredAdjustments ?? [],
+    reverseAdjustmentIds: [...(input.reverseAdjustmentIds ?? [])].sort(),
     refundDispositionsByOperationId: Object.fromEntries(
       Object.entries(input.refundDispositionsByOperationId ?? {}).sort(([a], [b]) => a.localeCompare(b)),
     ),

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

@@ -14,7 +14,7 @@ import {
 
 export type AdminChangeV2QuoteRequest = ChangeBookingQuoteRequest & {
   cancellationPolicyId?: string | null;
-  structuredAdjustments?: unknown[];
+  includeSelectableAdjustmentComponents?: boolean;
 };
 
 export interface BuildAdminChangeV2QuoteRequestParams {
@@ -30,7 +30,9 @@ export interface BuildAdminChangeV2QuoteRequestParams {
   cancellationPolicyId: string | null;
   promoCode?: string | null;
   promoApplicationScope?: AdminPromoApplicationScope;
-  structuredAdjustments: unknown[];
+  structuredAdjustments: NonNullable<ChangeBookingQuoteRequest['structuredAdjustments']>;
+  reverseAdjustmentIds?: string[];
+  includeSelectableAdjustmentComponents?: boolean;
   refundDispositionsByOperationId: Record<string, AdminAmendmentRefundDisposition>;
   previousPassengerCount: number;
   previousAvailabilityId: string | null;
@@ -56,6 +58,8 @@ export function buildAdminChangeV2QuoteRequest({
   promoCode,
   promoApplicationScope = 'CHANGE_ONLY',
   structuredAdjustments,
+  reverseAdjustmentIds = [],
+  includeSelectableAdjustmentComponents = false,
   refundDispositionsByOperationId,
   previousPassengerCount,
   previousAvailabilityId,
@@ -77,6 +81,10 @@ export function buildAdminChangeV2QuoteRequest({
     promoCode: promoCode?.trim() || null,
     promoApplicationScope: promoCode?.trim() ? promoApplicationScope : null,
     structuredAdjustments,
+    reverseAdjustmentIds,
+    ...(includeSelectableAdjustmentComponents
+      ? { includeSelectableAdjustmentComponents: true }
+      : {}),
     ...(Object.keys(refundDispositionsByOperationId).length > 0
       ? { refundDispositionsByOperationId }
       : {}),

package/src/components/booking/admin-refund-decision-context.ts

@@ -83,3 +83,40 @@ export function selectRefundDispositionsForOperations(
     ),
   );
 }
+
+/**
+ * Staff removals default to a pending refund. The refund remains a separate,
+ * reviewed action; this only removes the required choice from the change form.
+ */
+export function defaultPendingRefundDispositions(
+  operations: readonly AdminAmendmentOperationSnapshot[],
+  dispositionsByOperationId: Record<string, AdminAmendmentRefundDisposition>,
+): Record<string, AdminAmendmentRefundDisposition> {
+  if (operations.length === 0) return dispositionsByOperationId;
+
+  return operations.reduce<Record<string, AdminAmendmentRefundDisposition>>(
+    (next, operation) => {
+      next[operation.operationId] = 'PENDING_REFUND';
+      return next;
+    },
+    { ...dispositionsByOperationId },
+  );
+}
+
+/**
+ * Omitting a disposition for a return-price treatment operation tells the server
+ * to retain the original paid return-price floor.
+ */
+export function defaultKeepOriginalReturnPriceDispositions(
+  operations: readonly AdminAmendmentOperationSnapshot[],
+  dispositionsByOperationId: Record<string, AdminAmendmentRefundDisposition>,
+): Record<string, AdminAmendmentRefundDisposition> {
+  if (operations.length === 0) return dispositionsByOperationId;
+
+  const returnOperationIds = new Set(operations.map((operation) => operation.operationId));
+  return Object.fromEntries(
+    Object.entries(dispositionsByOperationId).filter(
+      ([operationId]) => !returnOperationIds.has(operationId),
+    ),
+  );
+}