@ticketboothapp/booking 1.2.96 → 1.2.98

package/CHANGE_BOOKING_BE_HANDOFF.md

@@ -126,6 +126,17 @@ Same selection fields as `ChangeBookingQuoteRequest`, plus:
   - `lineItems: Array<{ label?: string; amount?: number; type?: string; quantity?: number }>`
 - `feAmountDueMajorUnits?` (optional signed delta the FE displays; `newTotal - previousTotal`)
 
+For admin/provider cross-product changes, FE also sends:
+
+- `newParentProductId`: destination parent catalog product id (`p_...`)
+- `newProductId`: destination product option id selected from availability (`po_...` or equivalent), preserved for existing quote/apply compatibility
+
+BE should persist both the destination parent product and selected option when applying the change. Capacity checks,
+receipt pricing, add-ons, pickup locations, and itinerary display should resolve against `newParentProductId` +
+`newProductId`, not the booking’s original product. Same-parent receipt-floor rules continue only when the booking
+parent product equals `newParentProductId`; cross-parent changes should price from the destination catalog / FE
+authoritative admin receipt path.
+
 ### Backend expectations
 
 - Validate admin auth + booking/availability eligibility only.

package/package.json

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

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -5,6 +5,7 @@ import { parseISO, addWeeks, format, isBefore, isAfter, startOfDay, endOfDay } f
 import { formatInTimeZone, fromZonedTime } from 'date-fns-tz';
 import {
   getAvailabilities,
+  fetchProducts,
   cancelReservation,
   cancelReservationBestEffort,
   createPaymentIntent,
@@ -152,6 +153,49 @@ function omitZeroAmountPromoDiscountSummaryLines(lines: PriceSummaryLine[]): Pri
   });
 }
 
+function isPromoDiscountGiftCardOrVoucherLine(line: {
+  type?: string | null;
+  label?: string | null;
+  amount?: number | null;
+}): boolean {
+  const type = String(line.type ?? '').trim().toUpperCase();
+  if (type === 'PROMO_CODE' || type === 'DISCOUNT' || type === 'GIFT_CARD' || type === 'VOUCHER') {
+    return true;
+  }
+  const label = String(line.label ?? '').trim().toLowerCase();
+  return /promo|discount|voucher|gift\s*card/.test(label);
+}
+
+function deriveOriginalReceiptPromoAdjustment(originalReceipt: ChangeBookingFlowProps['originalReceipt']): {
+  amount: number;
+  label: string | null;
+  type: 'PROMO_CODE' | 'GIFT_CARD' | 'VOUCHER' | 'DISCOUNT';
+} {
+  let amount = Math.max(0, Number(originalReceipt?.promoAmount) || 0);
+  let label = originalReceipt?.promoLabel?.trim() || null;
+  let type: 'PROMO_CODE' | 'GIFT_CARD' | 'VOUCHER' | 'DISCOUNT' = 'PROMO_CODE';
+
+  for (const line of originalReceipt?.lineItems ?? []) {
+    if (!isPromoDiscountGiftCardOrVoucherLine(line)) continue;
+    const lineAmount = Number(line.amount) || 0;
+    if (lineAmount < -0.005) {
+      amount = Math.max(amount, Math.abs(lineAmount));
+      if (!label) label = line.label?.trim() || null;
+    }
+    const lineType = String(line.type ?? '').trim().toUpperCase();
+    const lineLabel = String(line.label ?? '').trim().toLowerCase();
+    if (lineType === 'GIFT_CARD' || /gift\s*card/.test(lineLabel)) {
+      type = 'GIFT_CARD';
+    } else if (lineType === 'VOUCHER' || /voucher/.test(lineLabel)) {
+      type = 'VOUCHER';
+    } else if (lineType === 'DISCOUNT' || /discount/.test(lineLabel)) {
+      type = 'DISCOUNT';
+    }
+  }
+
+  return { amount: roundMoney(amount), label, type };
+}
+
 function resolveTicketQtyFromQuantities(
   category: string,
   quantities: Record<string, number>,
@@ -687,12 +731,29 @@ function resolveInitialAvailabilityFromBooking(
   return { selection: fallback, defer: false };
 }
 
+function isPrivateShuttleProduct(product: Pick<Product, 'productType'> | null | undefined): boolean {
+  return product?.productType === 'PRIVATE_SHUTTLE';
+}
+
+function getAdminChangeEligibleProducts(products: Product[], currentProduct: Product): Product[] {
+  if (isPrivateShuttleProduct(currentProduct)) return [currentProduct];
+  const activeStandardProducts = products.filter(
+    (p) =>
+      p.status === 'ACTIVE' &&
+      !isPrivateShuttleProduct(p) &&
+      p.options?.some((o) => o.status === 'ACTIVE'),
+  );
+  return activeStandardProducts.some((p) => p.productId === currentProduct.productId)
+    ? activeStandardProducts
+    : [currentProduct, ...activeStandardProducts];
+}
+
 /**
  * Admin / provider-dashboard **change booking** — literal duplicate of {@link ChangeBookingFlow} for now
  * so ticketbooth can diverge without affecting the public site flow.
  */
 export function AdminChangeBookingFlow({
-  product,
+  product: initialProduct,
   productId,
   onBack,
   currency: currencyFromParent,
@@ -714,6 +775,7 @@ export function AdminChangeBookingFlow({
   availabilityPricingProfileId,
   availabilityCancellationPolicyProfileId,
   onChangeBooking,
+  changeProductOptions,
 }: ChangeBookingFlowProps) {
   /** Always the booking’s sold currency — not the site currency switcher / parent default. */
   const currency = useMemo((): Currency => {
@@ -736,6 +798,19 @@ export function AdminChangeBookingFlow({
     return !(isPromoLikeType || isPromoLikeLabel);
   };
   const { env, analytics } = useBookingHost();
+  const isInitialPrivateShuttleBooking = isPrivateShuttleProduct(initialProduct);
+  const [availableChangeProducts, setAvailableChangeProducts] = useState<Product[]>(
+    () => getAdminChangeEligibleProducts(changeProductOptions ?? [initialProduct], initialProduct),
+  );
+  const [selectedChangeProductId, setSelectedChangeProductId] = useState(initialProduct.productId);
+  const [changeProductsLoading, setChangeProductsLoading] = useState(false);
+  const [changeProductsError, setChangeProductsError] = useState<string | null>(null);
+  const product = useMemo(
+    () =>
+      availableChangeProducts.find((p) => p.productId === selectedChangeProductId) ??
+      initialProduct,
+    [availableChangeProducts, selectedChangeProductId, initialProduct],
+  );
   const { t } = useTranslations();
   const { locale } = useLocale();
   const companyTimezone = useCompanyTimezone(); // Get timezone from context
@@ -752,6 +827,12 @@ export function AdminChangeBookingFlow({
   } = useBookingApp();
   const availabilitiesCache = useAvailabilitiesCache();
   const isAdmin = permissions.viewerRole === 'admin';
+  const originalParentProductId = useMemo(() => {
+    const pid = initialValues?.productId?.trim();
+    if (pid && isParentProductId(pid)) return pid;
+    return initialProduct.productId;
+  }, [initialValues?.productId, initialProduct.productId]);
+  const selectedParentProductChanged = selectedChangeProductId !== originalParentProductId;
   const [availabilities, setAvailabilities] = useState<Availability[]>([]);
   const [selectedAvailability, setSelectedAvailability] = useState<Availability | null>(null);
   const [selectedReturnOption, setSelectedReturnOption] = useState<ReturnOption | null>(null);
@@ -783,6 +864,83 @@ export function AdminChangeBookingFlow({
     Array<{ id: string; label: string; amountInput: string; amountSign: 1 | -1 }>
   >([]);
   const adminCustomLineIdRef = useRef(0);
+  const previousSelectedChangeProductIdRef = useRef(selectedChangeProductId);
+
+  useEffect(() => {
+    if (changeProductOptions?.length) {
+      const nextProducts = getAdminChangeEligibleProducts(changeProductOptions, initialProduct);
+      setAvailableChangeProducts(nextProducts);
+      setSelectedChangeProductId((current) =>
+        nextProducts.some((p) => p.productId === current) ? current : initialProduct.productId,
+      );
+      return;
+    }
+    setAvailableChangeProducts((prev) => {
+      const hasInitial = prev.some((p) => p.productId === initialProduct.productId);
+      return hasInitial ? prev : [initialProduct, ...prev];
+    });
+    setSelectedChangeProductId((current) => current || initialProduct.productId);
+  }, [initialProduct, changeProductOptions]);
+
+  useEffect(() => {
+    if (changeProductOptions?.length) return;
+    if (!isAdmin || !env.COMPANY_ID) return;
+    let cancelled = false;
+    setChangeProductsLoading(true);
+    setChangeProductsError(null);
+    fetchProducts(env.COMPANY_ID)
+      .then((products) => {
+        if (cancelled) return;
+        const nextProducts = getAdminChangeEligibleProducts(products, initialProduct);
+        setAvailableChangeProducts(nextProducts);
+        setSelectedChangeProductId((current) =>
+          nextProducts.some((p) => p.productId === current) ? current : initialProduct.productId,
+        );
+      })
+      .catch((err) => {
+        if (cancelled) return;
+        setChangeProductsError(err instanceof Error ? err.message : 'Failed to load products');
+      })
+      .finally(() => {
+        if (!cancelled) setChangeProductsLoading(false);
+      });
+    return () => {
+      cancelled = true;
+    };
+  }, [changeProductOptions, isAdmin, env.COMPANY_ID, initialProduct]);
+
+  useEffect(() => {
+    if (previousSelectedChangeProductIdRef.current === selectedChangeProductId) return;
+    previousSelectedChangeProductIdRef.current = selectedChangeProductId;
+    setAvailabilities([]);
+    setSelectedAvailability(null);
+    setSelectedReturnOption(null);
+    setAddOns([]);
+    setPrecomputedPricesByOption(null);
+    setPricingConfig(null);
+    pricingConfigSetRef.current = false;
+    fetchingRef.current = false;
+    hasLoadedAvailabilitiesRef.current = false;
+    inFlightRangeRef.current = null;
+    fetchedRangesRef.current = [];
+    pendingRangeRef.current = null;
+    earliestAvailabilityDateRef.current = null;
+    lastCompletedQuoteInputsKeyRef.current = null;
+    inFlightQuoteInputsKeyRef.current = null;
+    setLatestChangeQuote(null);
+    setChangeQuoteFetchError(null);
+    setChangeQuoteLoading(false);
+    setError('');
+  }, [selectedChangeProductId]);
+
+  useEffect(() => {
+    if (!pickupLocationId) return;
+    const pickupLocations = product.pickupLocations ?? [];
+    if (pickupLocations.length === 0) return;
+    if (pickupLocations.some((loc) => loc.id === pickupLocationId)) return;
+    setPickupLocationId(null);
+    setPickupLocationSkipped(false);
+  }, [pickupLocationId, product.pickupLocations]);
 
   // Auto-apply promo code when parent page passes one (e.g. partner pages).
   // Seed input only; validate/apply runs after date/time + tickets exist (debounced + handleApplyPromo).
@@ -3150,49 +3308,6 @@ export function AdminChangeBookingFlow({
     providerEditableLineByNormalizedLabel,
   ]);
 
-  const checkoutPriceSummaryLinesForCheckout = useMemo(() => {
-    let raw: PriceSummaryLine[];
-    if (suppressSelfServeCurrencyUi && selfServePricingConfirmed) {
-      const serverLines = latestChangeQuote?.serverPreview?.priceSummaryLines;
-      raw = serverLines && serverLines.length > 0 ? serverLines : checkoutPriceSummaryLines;
-    } else {
-      raw = checkoutPriceSummaryLines;
-    }
-    return omitZeroAmountPromoDiscountSummaryLines(raw);
-  }, [
-    suppressSelfServeCurrencyUi,
-    selfServePricingConfirmed,
-    checkoutPriceSummaryLines,
-    latestChangeQuote?.serverPreview?.priceSummaryLines,
-  ]);
-
-  /** Receipt/server lines already include {@link PriceSummary}'s TAX row — do not also pass `taxAmount` or it duplicates. */
-  const priceSummaryLinesIncludeTaxRow = useMemo(
-    () =>
-      checkoutPriceSummaryLinesForCheckout.some(
-        (line) => line.kind === 'line' && String(line.type ?? '').toUpperCase() === 'TAX',
-      ),
-    [checkoutPriceSummaryLinesForCheckout],
-  );
-  const {
-    editableCheckoutPriceSummaryLines,
-    editableSummaryLineAmountInputs,
-    editableSummaryLineLabelInputs,
-    editableSummaryPreSubtotalDelta,
-    editableSummaryPreSubtotalDebugRows,
-    onLineAmountInputChange: handleEditableLineAmountInputChange,
-    onLineAmountInputBlur: handleEditableLineAmountInputBlur,
-    onLineAmountReset: handleEditableLineAmountReset,
-  } = useEditableSummaryLines(
-    checkoutPriceSummaryLinesForCheckout,
-    {
-      enabled: showProviderPricingInlineEditor,
-      onChange: providerPricingUi?.onLineAmountInputChange,
-      onBlur: providerPricingUi?.onLineAmountInputBlur,
-      onReset: providerPricingUi?.onLineAmountReset,
-    },
-  );
-
   // Promo discount from backend (order-level only; rates are pre-promo)
   const [promoDiscountAmount, setPromoDiscountAmount] = useState(0);
   const [isGiftCard, setIsGiftCard] = useState(false);
@@ -3208,6 +3323,11 @@ export function AdminChangeBookingFlow({
     changeBookingPromo: null as { priorAmount?: number } | null,
   });
 
+  const originalReceiptPromoAdjustment = useMemo(
+    () => deriveOriginalReceiptPromoAdjustment(originalReceipt),
+    [originalReceipt],
+  );
+
   const promoDiscountFetchKey = useMemo(() => {
     if (!appliedPromoCode || !selectedAvailability || totalQuantity === 0) return '';
     const companyId = product.companyId ?? env.COMPANY_ID;
@@ -3224,7 +3344,7 @@ export function AdminChangeBookingFlow({
       currency,
       quantitiesSignature,
       String(Math.round(effectiveSubtotalForCheckout * 100)),
-      lockedPromoCode ? String(Math.round((originalReceipt?.promoAmount ?? 0) * 100)) : '',
+      lockedPromoCode ? String(Math.round(originalReceiptPromoAdjustment.amount * 100)) : '',
     ].join('::');
   }, [
     appliedPromoCode,
@@ -3238,7 +3358,7 @@ export function AdminChangeBookingFlow({
     quantitiesSignature,
     effectiveSubtotalForCheckout,
     lockedPromoCode,
-    originalReceipt?.promoAmount,
+    originalReceiptPromoAdjustment.amount,
   ]);
 
   promoDiscountParamsRef.current = {
@@ -3247,7 +3367,7 @@ export function AdminChangeBookingFlow({
     effectiveSubtotal: effectiveSubtotalForCheckout,
     appliedPromoCode,
     changeBookingPromo: lockedPromoCode
-      ? { priorAmount: originalReceipt?.promoAmount }
+      ? { priorAmount: originalReceiptPromoAdjustment.amount }
       : null,
   };
 
@@ -3321,16 +3441,88 @@ export function AdminChangeBookingFlow({
   // Change booking: get-promo-discount uses forBookingChange + prior promo from receipt so expired codes stay locked (BE).
   const lockedPromoFallbackAmount =
     lockedPromoCode
-      ? Math.max(0, originalReceipt?.promoAmount ?? 0)
+      ? Math.max(0, originalReceiptPromoAdjustment.amount)
       : 0;
   const effectivePromoDiscountAmount =
     promoDiscountAmount > 0 ? promoDiscountAmount : lockedPromoFallbackAmount;
+  const effectivePromoLineType =
+    isGiftCard || originalReceiptPromoAdjustment.type === 'GIFT_CARD'
+      ? 'GIFT_CARD'
+      : isVoucher || originalReceiptPromoAdjustment.type === 'VOUCHER'
+        ? 'VOUCHER'
+        : originalReceiptPromoAdjustment.type;
   const taxOnSubtotal = isTaxIncludedInPrice ? 0 : effectiveSubtotalForCheckout * (pricingConfig?.taxRate ?? 0);
   const effectiveTax =
-    effectivePromoDiscountAmount > 0 && !isGiftCard && !isVoucher
+    effectivePromoDiscountAmount > 0 && effectivePromoLineType !== 'GIFT_CARD' && effectivePromoLineType !== 'VOUCHER'
       ? (effectiveSubtotalForCheckout - effectivePromoDiscountAmount) * (pricingConfig?.taxRate ?? 0)
       : taxOnSubtotal;
   const totalPrice = effectiveSubtotalForCheckout + effectiveTax - effectivePromoDiscountAmount;
+
+  const checkoutPriceSummaryLinesForCheckout = useMemo(() => {
+    let raw: PriceSummaryLine[];
+    if (suppressSelfServeCurrencyUi && selfServePricingConfirmed) {
+      const serverLines = latestChangeQuote?.serverPreview?.priceSummaryLines;
+      raw = serverLines && serverLines.length > 0 ? serverLines : checkoutPriceSummaryLines;
+    } else {
+      raw = checkoutPriceSummaryLines;
+    }
+    const lines = omitZeroAmountPromoDiscountSummaryLines(raw);
+    const hasPromoSummaryLine = lines.some((line) =>
+      line.kind === 'line' && isPromoDiscountGiftCardOrVoucherLine(line)
+    );
+    if (hasPromoSummaryLine || effectivePromoDiscountAmount < 0.005) return lines;
+    const trimmedPromoCode = appliedPromoCode?.trim() ?? '';
+    const promoLabel =
+      trimmedPromoCode.length > 0
+        ? `Promo: ${trimmedPromoCode}`
+        : originalReceiptPromoAdjustment.label || (t('booking.discount') || 'Discount');
+    return [
+      ...lines,
+      {
+        kind: 'line' as const,
+        label: promoLabel,
+        amount: -effectivePromoDiscountAmount,
+        type: effectivePromoLineType,
+      },
+    ];
+  }, [
+    suppressSelfServeCurrencyUi,
+    selfServePricingConfirmed,
+    checkoutPriceSummaryLines,
+    latestChangeQuote?.serverPreview?.priceSummaryLines,
+    effectivePromoDiscountAmount,
+    effectivePromoLineType,
+    appliedPromoCode,
+    originalReceiptPromoAdjustment.label,
+    t,
+  ]);
+
+  /** Receipt/server lines already include {@link PriceSummary}'s TAX row — do not also pass `taxAmount` or it duplicates. */
+  const priceSummaryLinesIncludeTaxRow = useMemo(
+    () =>
+      checkoutPriceSummaryLinesForCheckout.some(
+        (line) => line.kind === 'line' && String(line.type ?? '').toUpperCase() === 'TAX',
+      ),
+    [checkoutPriceSummaryLinesForCheckout],
+  );
+  const {
+    editableCheckoutPriceSummaryLines,
+    editableSummaryLineAmountInputs,
+    editableSummaryLineLabelInputs,
+    editableSummaryPreSubtotalDelta,
+    editableSummaryPreSubtotalDebugRows,
+    onLineAmountInputChange: handleEditableLineAmountInputChange,
+    onLineAmountInputBlur: handleEditableLineAmountInputBlur,
+    onLineAmountReset: handleEditableLineAmountReset,
+  } = useEditableSummaryLines(
+    checkoutPriceSummaryLinesForCheckout,
+    {
+      enabled: showProviderPricingInlineEditor,
+      onChange: providerPricingUi?.onLineAmountInputChange,
+      onBlur: providerPricingUi?.onLineAmountInputBlur,
+      onReset: providerPricingUi?.onLineAmountReset,
+    },
+  );
   /**
    * FE cart rollup for line math, breakdowns, and `clientProposedTotal` hint to the API. Self-serve **footer** totals
    * prefer `latestChangeQuote` once quote succeeds — this value is not an alternate source of truth for checkout.
@@ -3574,6 +3766,7 @@ export function AdminChangeBookingFlow({
         hasOperationalChangesFromInitial: false,
         dateChanged: false,
         ticketsChanged: false,
+        productChanged: false,
         optionChanged: false,
         pickupChanged: false,
         countsChanged: false,
@@ -3587,6 +3780,7 @@ export function AdminChangeBookingFlow({
         hasOperationalChangesFromInitial: false,
         dateChanged: false,
         ticketsChanged: false,
+        productChanged: false,
         optionChanged: false,
         pickupChanged: false,
         countsChanged: false,
@@ -3605,6 +3799,7 @@ export function AdminChangeBookingFlow({
     const optionChanged = Boolean(
       selectedOpt != null && initialOpt != null && initialOpt !== selectedOpt
     );
+    const productChanged = selectedParentProductChanged;
     const normalizePickupId = (value: string | null | undefined) => {
       const trimmed = value?.trim();
       return trimmed ? trimmed : null;
@@ -3678,6 +3873,7 @@ export function AdminChangeBookingFlow({
     return {
       hasChangesFromInitial:
         dateChanged ||
+        productChanged ||
         optionChanged ||
         pickupChanged ||
         countsChanged ||
@@ -3687,13 +3883,15 @@ export function AdminChangeBookingFlow({
       // ignore option-id noise and only consider user-visible booking deltas.
       hasOperationalChangesFromInitial:
         dateChanged ||
+        productChanged ||
         pickupChanged ||
         countsChanged ||
         addOnsChanged ||
         returnChanged,
       dateChanged,
       // Tickets line corresponds to "option + ticket counts"; add-ons and pickup changes affect itinerary but not the ticket label.
-      ticketsChanged: Boolean(optionChanged || countsChanged),
+      ticketsChanged: Boolean(productChanged || optionChanged || countsChanged),
+      productChanged,
       optionChanged,
       pickupChanged,
       countsChanged,
@@ -3702,6 +3900,7 @@ export function AdminChangeBookingFlow({
     };
   }, [
     initialValues,
+    selectedParentProductChanged,
     changeFlowResolvedInitialProductOptionId,
     selectedAvailability,
     selectedReturnOption,
@@ -3726,6 +3925,7 @@ export function AdminChangeBookingFlow({
   const changeQuoteInputsKey = useMemo(() => JSON.stringify({
     bookingReference: initialValues?.bookingReference?.trim() ?? '',
     lastName: lastName.trim().toLowerCase(),
+    parentProductId: product.productId,
     optionId: selectedAvailability?.productOptionId?.trim() || activeOptions[0]?.optionId || '',
     dateTime: selectedAvailability?.dateTime ?? '',
     availabilityId: selectedAvailability?.availabilityId ?? null,
@@ -3740,6 +3940,7 @@ export function AdminChangeBookingFlow({
   }), [
     initialValues?.bookingReference,
     lastName,
+    product.productId,
     selectedAvailability?.productOptionId,
     selectedAvailability?.dateTime,
     selectedAvailability?.availabilityId,
@@ -3753,8 +3954,8 @@ export function AdminChangeBookingFlow({
     editableSummaryLineLabelInputs,
     useAdminFeAuthoritativeQuote,
   ]);
-  const requiresReturnInChangeFlow = isCustomerSelfServeChange && !!initialValues?.returnAvailabilityId?.trim();
-  const missingRequiredReturnSelection = requiresReturnInChangeFlow && !selectedReturnOption;
+  const destinationRequiresReturnSelection = Boolean(selectedAvailability?.returnOptions?.length);
+  const missingRequiredReturnSelection = destinationRequiresReturnSelection && !selectedReturnOption;
 
   const changeFlowSubmitDisabled =
     missingRequiredReturnSelection ||
@@ -3912,9 +4113,14 @@ export function AdminChangeBookingFlow({
     let subtotal = roundMoney(displayChangeFlowSubtotal + editableSummaryPreSubtotalDelta);
     const tax = roundMoney(displayChangeFlowTax);
     const expectedTotal = roundMoney(displayChangeFlowProposedTotalWithEditableLines);
-    const recomputed = roundMoney(subtotal + tax);
+    const promoAdjustmentTotal = roundMoney(
+      lineItems.reduce((sum, line) => (
+        isPromoDiscountGiftCardOrVoucherLine(line) ? sum + (Number(line.amount) || 0) : sum
+      ), 0)
+    );
+    const recomputed = roundMoney(subtotal + tax + promoAdjustmentTotal);
     if (Math.abs(recomputed - expectedTotal) >= 0.005) {
-      subtotal = roundMoney(expectedTotal - tax);
+      subtotal = roundMoney(expectedTotal - tax - promoAdjustmentTotal);
     }
     return {
       subtotal,
@@ -4104,7 +4310,7 @@ export function AdminChangeBookingFlow({
 
   const checkoutFormError =
     (error || '') ||
-    (missingRequiredReturnSelection ? 'Removing return option in self-serve is not available. Please contact support.' : '') ||
+    (missingRequiredReturnSelection ? 'Please select a return time for this product.' : '') ||
     (isCustomerSelfServeChange && isChangeQuoteBlocked ? (latestChangeQuote?.reasonIfBlocked ?? '') : '') ||
     (isCustomerSelfServeChange ? changeQuoteFetchError ?? '' : '');
 
@@ -4317,6 +4523,7 @@ export function AdminChangeBookingFlow({
             bookingReference: bookingReferenceForQuote,
             lastName: lastName.trim(),
             newProductId: optionId,
+            newParentProductId: product.productId,
             newDateTime: selectedAvailability.dateTime,
             newAvailabilityId: selectedAvailability.availabilityId || null,
             newPickupLocationId: pickupLocationId || null,
@@ -4588,6 +4795,21 @@ export function AdminChangeBookingFlow({
     initialValues?.returnDateTime,
   ]);
 
+  useEffect(() => {
+    if (!selectedReturnOption) return;
+    const returnOptions = selectedAvailability?.returnOptions ?? [];
+    if (returnOptions.length === 0) {
+      setSelectedReturnOption(null);
+      return;
+    }
+    const updatedReturnOption = returnOptions.find(
+      (opt) => opt.returnAvailabilityId === selectedReturnOption.returnAvailabilityId,
+    );
+    if (!updatedReturnOption) {
+      setSelectedReturnOption(null);
+    }
+  }, [selectedAvailability?.returnOptions, selectedReturnOption]);
+
   // Fetch add-ons when availability (product option) is selected; clear selections when option changes
   const availabilityProductOptionId = selectedAvailability?.productOptionId ?? null;
   const prevAvailabilityProductOptionIdRef = useRef<string | null>(null);
@@ -4856,7 +5078,7 @@ export function AdminChangeBookingFlow({
       return;
     }
     if (missingRequiredReturnSelection) {
-      setError('Removing return option in self-serve is not available. Please contact support.');
+      setError('Please select a return time for this product.');
       return;
     }
 
@@ -4939,6 +5161,7 @@ export function AdminChangeBookingFlow({
           bookingReference: changeBookingReference,
           lastName: changeLastName,
           newProductId: availabilityProductOptionId,
+          newParentProductId: product.productId,
           newDateTime: selectedAvailability.dateTime,
           newAvailabilityId: selectedAvailability.availabilityId || null,
           newPickupLocationId: pickupLocationId || null,
@@ -5053,6 +5276,7 @@ export function AdminChangeBookingFlow({
               : null;
             await onChangeBooking({
               productId: availabilityProductOptionId,
+              parentProductId: product.productId,
               dateTime: selectedAvailability.dateTime,
               bookingItems,
               returnAvailabilityId: selectedReturnOption?.returnAvailabilityId ?? null,
@@ -5222,7 +5446,7 @@ export function AdminChangeBookingFlow({
               {
                 label: appliedPromoCode ? `Promo: ${appliedPromoCode}` : (originalReceipt?.promoLabel || (t('booking.discount') || 'Discount')),
                 amount: -effectivePromoDiscountAmount,
-                type: isGiftCard ? 'GIFT_CARD' : 'PROMO_CODE',
+                type: effectivePromoLineType,
               },
             ]
           : []),
@@ -5448,6 +5672,7 @@ export function AdminChangeBookingFlow({
           : null;
         await onChangeBooking({
           productId: availabilityProductOptionId,
+          parentProductId: product.productId,
           dateTime: selectedAvailability.dateTime,
           bookingItems,
           returnAvailabilityId: selectedReturnOption?.returnAvailabilityId ?? null,
@@ -5645,6 +5870,40 @@ export function AdminChangeBookingFlow({
       )}
       {isPartialLaunch ? null : (
       <div className="booking-calendar-section">
+      {isAdmin && !isInitialPrivateShuttleBooking && availableChangeProducts.length > 1 ? (
+        <div className="mb-6 rounded-lg border border-stone-200 bg-stone-50 p-4">
+          <label
+            className="mb-2 block text-sm font-medium text-stone-800"
+            htmlFor="admin-change-product-select"
+          >
+            Product
+          </label>
+          <select
+            id="admin-change-product-select"
+            className="w-full rounded-md border border-stone-300 bg-white px-3 py-2 text-sm text-stone-900 focus:outline-none focus:ring-2 focus:ring-stone-400/80"
+            value={selectedChangeProductId}
+            disabled={changeProductsLoading || loading || showCheckoutModal || showAdminPaymentChoice}
+            onChange={(e) => {
+              setSelectedChangeProductId(e.target.value);
+              setSelectedDate('');
+              setImplicitReturnBaselineId(null);
+              changeFlowOutboundAnchorRef.current = null;
+              changeFlowReturnAnchorRef.current = null;
+            }}
+          >
+            {availableChangeProducts.map((p) => (
+              <option key={p.productId} value={p.productId}>
+                {p.name}
+              </option>
+            ))}
+          </select>
+          {changeProductsError ? (
+            <div className="mt-2 text-xs text-amber-800">
+              Product list could not be refreshed. Showing the current product only.
+            </div>
+          ) : null}
+        </div>
+      ) : null}
       {loadingAvailabilities && availabilities.length === 0 ? (
         <div className="flex flex-col items-center justify-center py-12 gap-4">
           <div className="booking-loading-spinner" aria-hidden />

package/src/components/booking/booking-flow-types.ts

@@ -104,6 +104,8 @@ export interface BookingFlowBaseProps {
   availabilityPricingProfileId?: string | null;
   /** When set (e.g. partner portal), get-availabilities filters cancellation policies by this profile. */
   availabilityCancellationPolicyProfileId?: string | null;
+  /** Admin change-booking: available destination products for switching the booking to another product. */
+  changeProductOptions?: Product[];
 }
 
 /** Standard (new) reservation flow — no change-booking receipt or callbacks. */

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

@@ -2,6 +2,9 @@ import type { Currency } from './CurrencySwitcher';
 
 /** Payload passed to `onChangeBooking` when applying a dashboard-managed booking change. */
 export type ProviderDashboardChangeBookingPayload = {
+  /** Parent catalog product id. Present when admin changes the booking to a different product. */
+  parentProductId?: string;
+  /** Product option id selected for the new booking. */
   productId: string;
   dateTime: string;
   bookingItems: Array<{ category: string; count: number }>;

package/src/lib/booking-api.ts

@@ -845,6 +845,9 @@ export interface CreatePaymentIntentResponse {
 export interface ChangeBookingQuoteRequest {
   bookingReference: string;
   lastName: string;
+  /** Parent catalog product id for cross-product admin/provider changes. */
+  newParentProductId?: string | null;
+  /** Product option id selected for the new booking; retained as `newProductId` for existing BE compatibility. */
   newProductId: string;
   newDateTime: string;
   /** Outbound availability id for the new selection (must match option + datetime server-side). */