@ticketboothapp/booking 1.2.155 → 1.2.158

package/package.json

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

package/src/components/booking/AdminChangeBookingContent.tsx

@@ -160,6 +160,7 @@ const checkoutPanelPropKeys = [
   'serverUpdatedTotal',
   'serverQuoteError',
   'refundDecisionOperations',
+  'returnPriceTreatmentOperations',
   'allowedRefundDispositionsByOperationId',
   'removedValueByOperationId',
   'refundDispositionsByOperationId',

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -56,10 +56,7 @@ import { useAdminChangeProductReset } from './useAdminChangeProductReset';
 import { useBookingQuantityCapTrim } from './useBookingQuantityCapTrim';
 import { useBookingViewItemAnalytics } from './useBookingViewItemAnalytics';
 import { buildAdminChangeQuoteRequestKey } from './admin-change-quote-request-key';
-import {
-  buildDefaultRefundDispositionsByOperationId,
-  type AdminReleaseRefundDisposition,
-} from './admin-refund-disposition';
+import type { AdminReleaseRefundDisposition } from './admin-refund-disposition';
 
 type AdminRefundDecisionContext = {
   selectionKey: string;
@@ -709,6 +706,8 @@ export function AdminChangeBookingFlow({
     useAdminFeAuthoritativeQuote,
   ]);
   const responseRefundDecisionOperations = latestChangeQuote?.refundDecisionOperations ?? [];
+  const responseReturnPriceTreatmentOperations =
+    latestChangeQuote?.returnPriceTreatmentOperations ?? [];
   useEffect(() => {
     if (responseRefundDecisionOperations.length === 0) return;
     setRefundDecisionContext({
@@ -733,45 +732,25 @@ export function AdminChangeBookingFlow({
     : refundDecisionContext?.selectionKey === refundDecisionSelectionKey
       ? refundDecisionContext
       : null;
-  /** Seed a disposition once per booking-selection key; operator can still override the dropdown. */
-  const refundDispositionAutoDefaultKeyRef = useRef<string | null>(null);
-  useEffect(() => {
-    if (!activeRefundDecisionContext || activeRefundDecisionContext.operations.length === 0) return;
-    if (refundDispositionAutoDefaultKeyRef.current === activeRefundDecisionContext.selectionKey) {
-      return;
-    }
-    refundDispositionAutoDefaultKeyRef.current = activeRefundDecisionContext.selectionKey;
-
-    const sameProductAndOutboundSelection =
-      !changeSelectionDetails.dateChanged &&
-      !changeSelectionDetails.productChanged &&
-      !changeSelectionDetails.optionChanged &&
-      !changeSelectionDetails.countsChanged &&
-      !changeSelectionDetails.addOnsChanged;
-    const defaults = buildDefaultRefundDispositionsByOperationId({
-      operations: activeRefundDecisionContext.operations,
-      allowedByOperationId: activeRefundDecisionContext.allowedByOperationId,
-      sameProductAndOutboundSelection,
-    });
-    if (Object.keys(defaults).length === 0) return;
-
-    setRefundDispositionsByOperationId((current) => {
-      let changed = false;
-      const next = { ...current };
-      for (const [operationId, disposition] of Object.entries(defaults)) {
-        if (next[operationId] != null) continue;
-        next[operationId] = disposition;
-        changed = true;
-      }
-      return changed ? next : current;
-    });
-  }, [activeRefundDecisionContext, changeSelectionDetails]);
-  const activeRefundDispositionsByOperationId = useMemo(() => Object.fromEntries(
-    (activeRefundDecisionContext?.operations ?? []).flatMap((operation) => {
-      const disposition = refundDispositionsByOperationId[operation.operationId];
-      return disposition ? [[operation.operationId, disposition] as const] : [];
-    }),
-  ), [activeRefundDecisionContext?.operations, refundDispositionsByOperationId]);
+  const activeReturnPriceTreatmentOperations =
+    responseReturnPriceTreatmentOperations.length > 0
+      ? responseReturnPriceTreatmentOperations
+      : [];
+  const activeRefundDispositionsByOperationId = useMemo(() => {
+    const relevantOperationIds = new Set([
+      ...(activeRefundDecisionContext?.operations ?? []).map((operation) => operation.operationId),
+      ...activeReturnPriceTreatmentOperations.map((operation) => operation.operationId),
+    ]);
+    return Object.fromEntries(
+      Object.entries(refundDispositionsByOperationId).filter(([operationId]) =>
+        relevantOperationIds.has(operationId),
+      ),
+    );
+  }, [
+    activeRefundDecisionContext?.operations,
+    activeReturnPriceTreatmentOperations,
+    refundDispositionsByOperationId,
+  ]);
   const handleRefundDispositionChange = useCallback((
     operationId: string,
     disposition: AdminReleaseRefundDisposition | null,
@@ -1100,8 +1079,11 @@ export function AdminChangeBookingFlow({
             ? (latestChangeQuote?.reasonIfBlocked ?? 'This change cannot be priced right now.')
             : null),
         refundDecisionOperations: activeRefundDecisionContext?.operations ?? [],
-        allowedRefundDispositionsByOperationId:
-          activeRefundDecisionContext?.allowedByOperationId ?? {},
+        returnPriceTreatmentOperations: activeReturnPriceTreatmentOperations,
+        allowedRefundDispositionsByOperationId: {
+          ...(activeRefundDecisionContext?.allowedByOperationId ?? {}),
+          ...(latestChangeQuote?.allowedRefundDispositionsByOperationId ?? {}),
+        },
         removedValueByOperationId:
           activeRefundDecisionContext?.removedValueByOperationId ?? {},
         refundDispositionsByOperationId: activeRefundDispositionsByOperationId,

package/src/components/booking/AdminChangeCheckoutPanel.tsx

@@ -41,6 +41,7 @@ export interface AdminChangeCheckoutPanelProps {
   serverUpdatedTotal: number | null;
   serverQuoteError?: string | null;
   refundDecisionOperations?: AdminAmendmentOperationSnapshot[];
+  returnPriceTreatmentOperations?: AdminAmendmentOperationSnapshot[];
   allowedRefundDispositionsByOperationId?: Record<string, AdminAmendmentRefundDisposition[]>;
   removedValueByOperationId?: Record<string, number>;
   refundDispositionsByOperationId?: Record<string, AdminAmendmentRefundDisposition>;
@@ -123,6 +124,7 @@ export function AdminChangeCheckoutPanel({
   serverUpdatedTotal,
   serverQuoteError,
   refundDecisionOperations,
+  returnPriceTreatmentOperations,
   allowedRefundDispositionsByOperationId,
   removedValueByOperationId,
   refundDispositionsByOperationId,
@@ -216,6 +218,7 @@ export function AdminChangeCheckoutPanel({
         selectionChanged={hasEffectiveChangeSelection}
         quoteError={serverQuoteError}
         refundDecisionOperations={refundDecisionOperations}
+        returnPriceTreatmentOperations={returnPriceTreatmentOperations}
         allowedRefundDispositionsByOperationId={allowedRefundDispositionsByOperationId}
         removedValueByOperationId={removedValueByOperationId}
         refundDispositionsByOperationId={refundDispositionsByOperationId}

package/src/components/booking/AdminChangeReceiptComparison.tsx

@@ -12,9 +12,12 @@ import { PriceSummary, type PriceSummaryLine } from './PriceSummary';
 import {
   adminRemovalOperationLabel,
   noRefundRemovedValue,
+  normalizeReturnPriceTreatment,
   refundDecisionsComplete,
   releaseRefundDispositionOptions,
+  returnPriceTreatmentOptions,
   type AdminReleaseRefundDisposition,
+  type AdminReturnPriceTreatment,
 } from './admin-refund-disposition';
 
 type TranslationFn = (key: string, params?: Record<string, string>) => string;
@@ -37,6 +40,7 @@ export interface AdminChangeReceiptComparisonProps {
   taxRate?: number;
   adjustments?: ReactNode;
   refundDecisionOperations?: AdminAmendmentOperationSnapshot[];
+  returnPriceTreatmentOperations?: AdminAmendmentOperationSnapshot[];
   allowedRefundDispositionsByOperationId?: Record<string, AdminAmendmentRefundDisposition[]>;
   removedValueByOperationId?: Record<string, number>;
   refundDispositionsByOperationId?: Record<string, AdminAmendmentRefundDisposition>;
@@ -86,6 +90,7 @@ export function AdminChangeReceiptComparison({
   taxRate,
   adjustments,
   refundDecisionOperations = [],
+  returnPriceTreatmentOperations = [],
   allowedRefundDispositionsByOperationId = {},
   removedValueByOperationId = {},
   refundDispositionsByOperationId = {},
@@ -97,11 +102,17 @@ export function AdminChangeReceiptComparison({
   const originalCurrency = originalReceipt.currency ?? currency;
   const quoteReady = amendmentLines != null && amountDue != null && updatedTotal != null;
   const hasRefundDecisions = refundDecisionOperations.length > 0;
+  const hasReturnPriceTreatments = returnPriceTreatmentOperations.length > 0;
   const refundSelectionsComplete = refundDecisionsComplete(
     refundDecisionOperations,
     refundDispositionsByOperationId,
   );
   const settlementPending = hasRefundDecisions && (!refundSelectionsComplete || refundQuoteLoading);
+  const returnRepricePending = hasReturnPriceTreatments &&
+    returnPriceTreatmentOperations.some(
+      (operation) => refundDispositionsByOperationId[operation.operationId] != null,
+    ) &&
+    refundQuoteLoading;
   const displayedAmountDue = settlementPending ? null : amountDue;
   const removedWithoutRefund = noRefundRemovedValue(
     refundDecisionOperations,
@@ -150,12 +161,61 @@ export function AdminChangeReceiptComparison({
 
   return (
     <div className="min-w-0 space-y-3 overflow-visible">
+      {hasReturnPriceTreatments ? (
+        <section className="rounded-lg border border-sky-300 bg-sky-50 p-3" aria-label="Return price treatment">
+          <div className="mb-3">
+            <h3 className="text-sm font-semibold text-stone-900">Return price</h3>
+            <p className="mt-1 text-xs text-stone-600">
+              By default the original paid return price stays on the booking. You can optionally reduce it and choose refund treatment.
+            </p>
+          </div>
+          <div className="space-y-3">
+            {returnPriceTreatmentOperations.map((operation) => {
+              const options = returnPriceTreatmentOptions(
+                allowedRefundDispositionsByOperationId[operation.operationId],
+              );
+              const selectedValue: AdminReturnPriceTreatment = normalizeReturnPriceTreatment(
+                refundDispositionsByOperationId[operation.operationId],
+              );
+              const selected = options.find((option) => option.value === selectedValue);
+              return (
+                <div key={operation.operationId} className="rounded-md border border-sky-200 bg-white p-3">
+                  <div className="mb-2 text-sm font-medium capitalize text-stone-900">
+                    {adminRemovalOperationLabel(operation)}
+                  </div>
+                  <select
+                    className="w-full rounded-md border border-stone-300 bg-white px-3 py-2 text-sm text-stone-900"
+                    value={selectedValue}
+                    onChange={(event) => {
+                      const value = event.target.value as AdminReturnPriceTreatment;
+                      onRefundDispositionChange?.(
+                        operation.operationId,
+                        value === 'KEEP_FLOOR' ? null : value,
+                      );
+                    }}
+                    aria-label={`Return price treatment for ${adminRemovalOperationLabel(operation)}`}
+                  >
+                    {options.map((option) => (
+                      <option key={option.value} value={option.value}>{option.label}</option>
+                    ))}
+                  </select>
+                  {selected ? <p className="mt-2 text-xs text-stone-600">{selected.description}</p> : null}
+                </div>
+              );
+            })}
+          </div>
+          {returnRepricePending ? (
+            <p className="mt-3 text-xs font-medium text-sky-800">Recalculating settlement…</p>
+          ) : null}
+        </section>
+      ) : null}
+
       {hasRefundDecisions ? (
         <section className="rounded-lg border border-amber-300 bg-amber-50 p-3" aria-label="Refund treatment">
           <div className="mb-3">
             <h3 className="text-sm font-semibold text-stone-900">Choose refund treatment</h3>
             <p className="mt-1 text-xs text-stone-600">
-              Removed paid value is never refunded automatically. Choose an explicit treatment (return-only changes default to no refund), then the server will recalculate the settlement.
+              Removed paid value is never refunded automatically. Choose an explicit treatment, then the server will recalculate the settlement.
             </p>
           </div>
           <div className="space-y-3">

package/src/components/booking/CheckoutModal.tsx

@@ -411,7 +411,7 @@ export function CheckoutModal({
                 {balanceChargeDaysBefore > 0
                   ? (t('booking.balanceChargeNotice', { days: balanceChargeDaysBefore }) !== 'booking.balanceChargeNotice'
                       ? t('booking.balanceChargeNotice', { days: balanceChargeDaysBefore })
-                      : `The remaining balance will be charged ${balanceChargeDaysBefore} days before your booking. You can also pay it earlier from your Manage Booking page.`)
+                      : `The remaining balance is due ${balanceChargeDaysBefore} days before your booking. You can pay it from your Manage Booking page.`)
                   : (t('booking.balancePayEarlier') !== 'booking.balancePayEarlier'
                       ? t('booking.balancePayEarlier')
                       : 'You can pay the remaining balance anytime from your Manage Booking page.')}

package/src/components/booking/PrivateShuttleCheckoutSection.tsx

@@ -179,7 +179,7 @@ export function PrivateShuttleCheckoutSection({
               {balanceChargeDaysBefore && balanceChargeDaysBefore > 0
                 ? (t('booking.balanceChargeNotice', { days: balanceChargeDaysBefore }) !== 'booking.balanceChargeNotice'
                     ? t('booking.balanceChargeNotice', { days: balanceChargeDaysBefore })
-                    : `The remaining balance will be charged ${balanceChargeDaysBefore} days before your booking. You can also pay it earlier from your Manage Booking page.`)
+                    : `The remaining balance is due ${balanceChargeDaysBefore} days before your booking. You can pay it from your Manage Booking page.`)
                 : (t('booking.balancePayEarlier') !== 'booking.balancePayEarlier'
                     ? t('booking.balancePayEarlier')
                     : 'You can pay the remaining balance anytime from your Manage Booking page.')}

package/src/components/booking/admin-refund-disposition.ts

@@ -8,12 +8,21 @@ export type AdminReleaseRefundDisposition = Exclude<
   'REFUND_TO_ORIGINAL_PAYMENT'
 >;
 
+/** Local UI value: omit disposition on the quote request to keep the paid-return floor. */
+export type AdminReturnPriceTreatment = 'KEEP_FLOOR' | AdminReleaseRefundDisposition;
+
 export type AdminRefundDispositionOption = {
   value: AdminReleaseRefundDisposition;
   label: string;
   description: string;
 };
 
+export type AdminReturnPriceTreatmentOption = {
+  value: AdminReturnPriceTreatment;
+  label: string;
+  description: string;
+};
+
 const RELEASE_OPTIONS: AdminRefundDispositionOption[] = [
   {
     value: 'PENDING_REFUND',
@@ -27,8 +36,11 @@ const RELEASE_OPTIONS: AdminRefundDispositionOption[] = [
   },
 ];
 
-/** Server ops whose removed value is only a return-time substitution. */
-const RETURN_ONLY_REFUND_OPERATION_TYPES = new Set(['CHANGE_RETURN']);
+const KEEP_FLOOR_OPTION: AdminReturnPriceTreatmentOption = {
+  value: 'KEEP_FLOOR',
+  label: 'Keep original return price',
+  description: 'Change the return time but keep what was already paid for the return on the booking total.',
+};
 
 export function releaseRefundDispositionOptions(
   allowed: readonly AdminAmendmentRefundDisposition[] | undefined,
@@ -37,57 +49,29 @@ export function releaseRefundDispositionOptions(
   return RELEASE_OPTIONS.filter((option) => allowed.includes(option.value));
 }
 
-/**
- * True when every refund-decision operation is a return substitution.
- * Combined with an unchanged product/outbound selection, this is the common
- * "cheaper/later return" admin case that should default to no refund.
- */
-export function isReturnOnlyRefundDecision(
-  operations: readonly AdminAmendmentOperationSnapshot[],
-): boolean {
-  return (
-    operations.length > 0 &&
-    operations.every((operation) => RETURN_ONLY_REFUND_OPERATION_TYPES.has(operation.type))
-  );
-}
-
-/**
- * Only auto-default the low-stakes return-only case (same product/outbound → NO_REFUND).
- * Other removals stay undecided so the operator must choose explicitly.
- */
-export function preferredAdminRefundDisposition(args: {
-  operations: readonly AdminAmendmentOperationSnapshot[];
-  /** Same parent product, option, date/time, passengers, and add-ons — only return differs. */
-  sameProductAndOutboundSelection: boolean;
-  allowed?: readonly AdminAmendmentRefundDisposition[];
-}): AdminReleaseRefundDisposition | null {
-  if (
-    !args.sameProductAndOutboundSelection ||
-    !isReturnOnlyRefundDecision(args.operations)
-  ) {
-    return null;
-  }
-  const options = releaseRefundDispositionOptions(args.allowed);
-  return options.some((option) => option.value === 'NO_REFUND') ? 'NO_REFUND' : null;
+export function returnPriceTreatmentOptions(
+  allowed: readonly AdminAmendmentRefundDisposition[] | undefined,
+): AdminReturnPriceTreatmentOption[] {
+  return [
+    KEEP_FLOOR_OPTION,
+    ...releaseRefundDispositionOptions(allowed).map((option) => ({
+      value: option.value,
+      label: option.value === 'NO_REFUND'
+        ? 'Reduce return price — no refund'
+        : 'Reduce return price — pending refund',
+      description: option.value === 'NO_REFUND'
+        ? 'Lower the booking total to the cheaper return price without creating a customer credit.'
+        : 'Lower the booking total and record a pending refund for the removed return value.',
+    })),
+  ];
 }
 
-export function buildDefaultRefundDispositionsByOperationId(args: {
-  operations: readonly AdminAmendmentOperationSnapshot[];
-  allowedByOperationId?: Readonly<
-    Record<string, readonly AdminAmendmentRefundDisposition[] | undefined>
-  >;
-  sameProductAndOutboundSelection: boolean;
-}): Record<string, AdminReleaseRefundDisposition> {
-  return Object.fromEntries(
-    args.operations.flatMap((operation) => {
-      const disposition = preferredAdminRefundDisposition({
-        operations: args.operations,
-        sameProductAndOutboundSelection: args.sameProductAndOutboundSelection,
-        allowed: args.allowedByOperationId?.[operation.operationId],
-      });
-      return disposition ? [[operation.operationId, disposition] as const] : [];
-    }),
-  );
+export function normalizeReturnPriceTreatment(
+  disposition: AdminAmendmentRefundDisposition | undefined,
+): AdminReturnPriceTreatment {
+  return disposition === 'PENDING_REFUND' || disposition === 'NO_REFUND'
+    ? disposition
+    : 'KEEP_FLOOR';
 }
 
 export function adminRemovalOperationLabel(operation: AdminAmendmentOperationSnapshot): string {

package/src/components/booking/useAdminChangeCheckoutController.ts

@@ -85,6 +85,7 @@ export interface AdminChangeLatestQuote {
   quotedTotal?: number;
   paymentCreditTotal?: number;
   refundDecisionOperations?: AdminAmendmentOperationSnapshot[];
+  returnPriceTreatmentOperations?: AdminAmendmentOperationSnapshot[];
   allowedRefundDispositionsByOperationId?: Record<string, AdminAmendmentRefundDisposition[]>;
   removedValueByOperationId?: Record<string, number>;
   serverDisplay?: { total: number; subtotal: number; tax: number };

package/src/lib/booking/change-flow-pricing.ts

@@ -257,6 +257,7 @@ export interface ChangeQuoteUiSlice {
   quotedTotal?: number;
   paymentCreditTotal?: number;
   refundDecisionOperations?: ChangeBookingQuoteResponse['refundDecisionOperations'];
+  returnPriceTreatmentOperations?: ChangeBookingQuoteResponse['returnPriceTreatmentOperations'];
   allowedRefundDispositionsByOperationId?: ChangeBookingQuoteResponse['allowedRefundDispositionsByOperationId'];
   removedValueByOperationId?: ChangeBookingQuoteResponse['removedValueByOperationId'];
   serverDisplay?: { total: number; subtotal: number; tax: number };
@@ -297,6 +298,7 @@ export function sliceChangeQuoteForUi(
     quotedTotal: pricingQuote?.payableTotal ?? pricingQuote?.totalAmount ?? quote.proposed?.total ?? quote.newReceipt?.total,
     paymentCreditTotal: pricingQuote?.paymentCreditTotal ?? quote.paymentCreditTotal,
     refundDecisionOperations: quote.refundDecisionOperations,
+    returnPriceTreatmentOperations: quote.returnPriceTreatmentOperations,
     allowedRefundDispositionsByOperationId: quote.allowedRefundDispositionsByOperationId,
     removedValueByOperationId: quote.removedValueByOperationId,
     ...(serverDisplay ? { serverDisplay } : {}),

package/src/lib/booking/i18n/messages/en.json

@@ -153,7 +153,7 @@
     "included": "Included",
     "flexibleCancellation": "Flexible cancellation",
     "depositPaymentNotice": "You're paying the deposit today.",
-    "balanceChargeNotice": "The remaining balance will be charged {days} days before your booking. You can also pay it earlier from your Manage Booking page.",
+    "balanceChargeNotice": "The remaining balance is due {days} days before your booking. You can pay it from your Manage Booking page.",
     "balancePayEarlier": "You can pay the remaining balance anytime from your Manage Booking page.",
     "remainingBalance": "Remaining Balance"
   },

package/src/lib/booking-api.ts

@@ -1291,11 +1291,7 @@ export interface ChangeBookingQuoteRequest {
     previousAvailabilityId?: string | null;
     previousReturnAvailabilityId?: string | null;
   } | null;
-  /**
-   * Explicit admin treatment for server-classified removed paid value.
-   * The dashboard may pre-select NO_REFUND for return-only changes (still overridable);
-   * other removals stay undecided until chosen. The value is always sent explicitly on quote/apply.
-   */
+  /** Explicit admin treatment for server-classified removed paid value. Never defaulted by the client. */
   refundDispositionsByOperationId?: Record<string, AdminAmendmentRefundDisposition>;
 }
 
@@ -1339,6 +1335,11 @@ export interface AdminChangeBookingQuoteV2Data {
   reasonIfBlocked?: string | null;
   unsupportedFeatures?: string[];
   refundDecisionOperations?: AdminAmendmentOperationSnapshot[];
+  /**
+   * CHANGE_RETURN ops. Omit disposition to keep the paid-return floor; send
+   * PENDING_REFUND / NO_REFUND to reprice and settle removed value.
+   */
+  returnPriceTreatmentOperations?: AdminAmendmentOperationSnapshot[];
   allowedRefundDispositionsByOperationId?: Record<string, AdminAmendmentRefundDisposition[]>;
   removedValueByOperationId?: Record<string, number>;
 }
@@ -1479,6 +1480,11 @@ export interface ChangeBookingQuoteResponse {
   reasonIfBlocked?: string;
   /** Admin-only removal decisions required before this quote can be applied. */
   refundDecisionOperations?: AdminAmendmentOperationSnapshot[];
+  /**
+   * Admin CHANGE_RETURN ops. Default (no disposition) keeps the paid return floor;
+   * PENDING_REFUND / NO_REFUND reprices the return component.
+   */
+  returnPriceTreatmentOperations?: AdminAmendmentOperationSnapshot[];
   /** Server-authorized choices. Release UI intentionally filters out immediate refund. */
   allowedRefundDispositionsByOperationId?: Record<string, AdminAmendmentRefundDisposition[]>;
   /** Original paid basis plus allocated refundable tax for each removal operation. */
@@ -1669,6 +1675,7 @@ export function mapAdminChangeBookingQuoteV2Data(
     canProceed: data.canApply,
     reasonIfBlocked: data.reasonIfBlocked ?? undefined,
     refundDecisionOperations: data.refundDecisionOperations ?? [],
+    returnPriceTreatmentOperations: data.returnPriceTreatmentOperations ?? [],
     allowedRefundDispositionsByOperationId:
       data.allowedRefundDispositionsByOperationId ?? {},
     removedValueByOperationId: data.removedValueByOperationId ?? {},

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

@@ -15,12 +15,11 @@ import {
 } from '../src/lib/booking-api';
 import { buildAdminChangeQuoteRequestKey } from '../src/components/booking/admin-change-quote-request-key';
 import {
-  buildDefaultRefundDispositionsByOperationId,
-  isReturnOnlyRefundDecision,
   noRefundRemovedValue,
-  preferredAdminRefundDisposition,
+  normalizeReturnPriceTreatment,
   refundDecisionsComplete,
   releaseRefundDispositionOptions,
+  returnPriceTreatmentOptions,
 } from '../src/components/booking/admin-refund-disposition';
 import {
   applyResourceAdjustments,
@@ -189,64 +188,43 @@ test('admin removal quote preserves explicit release refund decisions for the pr
   );
 });
 
-test('admin refund disposition defaults only for return-only → no refund', () => {
-  const changeReturn = {
+test('admin return price treatment defaults to keep floor and maps optional reprice choices', () => {
+  const operation = {
     operationId: 'op_change_return',
     type: 'CHANGE_RETURN',
     componentKey: 'return',
   };
-  const removeAdult = {
-    operationId: 'op_remove_adult',
-    type: 'REMOVE_QUANTITY',
-    componentKey: 'ticket:ADULT',
-    quantityDelta: -1,
-  };
-
-  assert.equal(isReturnOnlyRefundDecision([changeReturn]), true);
-  assert.equal(isReturnOnlyRefundDecision([changeReturn, removeAdult]), false);
-  assert.equal(
-    preferredAdminRefundDisposition({
-      operations: [changeReturn],
-      sameProductAndOutboundSelection: true,
-    }),
-    'NO_REFUND',
-  );
-  assert.equal(
-    preferredAdminRefundDisposition({
-      operations: [changeReturn],
-      sameProductAndOutboundSelection: false,
-    }),
-    null,
-  );
-  assert.equal(
-    preferredAdminRefundDisposition({
-      operations: [removeAdult],
-      sameProductAndOutboundSelection: true,
-    }),
-    null,
-  );
-  assert.deepEqual(
-    buildDefaultRefundDispositionsByOperationId({
-      operations: [changeReturn],
-      sameProductAndOutboundSelection: true,
-      allowedByOperationId: {
-        [changeReturn.operationId]: ['PENDING_REFUND', 'NO_REFUND'],
-      },
-    }),
-    { [changeReturn.operationId]: 'NO_REFUND' },
+  const mapped = mapAdminChangeBookingQuoteV2Data({
+    oldReceipt: { currency: 'CAD', grossSubtotal: 214.48, taxAmount: 18.23, payableTotal: 232.71 },
+    newQuote: { currency: 'CAD', payableTotal: 232.71, balanceDelta: 0, amountToCharge: 0, refundCandidate: 0 },
+    canApply: true,
+    returnPriceTreatmentOperations: [operation],
+    allowedRefundDispositionsByOperationId: {
+      [operation.operationId]: ['PENDING_REFUND', 'NO_REFUND'],
+    },
+  });
+  const slice = sliceChangeQuoteForUi(
+    mapped,
+    { total: 232.71, subtotal: 214.48, tax: 18.23 },
+    'CAD',
   );
+
+  assert.deepEqual(slice.returnPriceTreatmentOperations, [operation]);
   assert.deepEqual(
-    buildDefaultRefundDispositionsByOperationId({
-      operations: [removeAdult],
-      sameProductAndOutboundSelection: false,
-      allowedByOperationId: {
-        [removeAdult.operationId]: ['PENDING_REFUND', 'NO_REFUND'],
-      },
-    }),
-    {},
+    returnPriceTreatmentOptions(
+      slice.allowedRefundDispositionsByOperationId?.[operation.operationId],
+    ).map((option) => option.value),
+    ['KEEP_FLOOR', 'PENDING_REFUND', 'NO_REFUND'],
   );
 });
 
+test('unsupported immediate refund cannot become a return price treatment', () => {
+  assert.equal(normalizeReturnPriceTreatment(undefined), 'KEEP_FLOOR');
+  assert.equal(normalizeReturnPriceTreatment('REFUND_TO_ORIGINAL_PAYMENT'), 'KEEP_FLOOR');
+  assert.equal(normalizeReturnPriceTreatment('PENDING_REFUND'), 'PENDING_REFUND');
+  assert.equal(normalizeReturnPriceTreatment('NO_REFUND'), 'NO_REFUND');
+});
+
 test('changing admin refund treatment creates a distinct authoritative quote request', () => {
   const base = {
     bookingReference: 'DE8H04DX',