@ticketboothapp/booking 1.2.130 → 1.2.132

package/package.json

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

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -517,6 +517,8 @@ export function AdminChangeBookingFlow({
     feeLineItems,
     changeFlowBookedFeeUnitByNormalizedLabel,
     addOnSelections,
+    originalAddOnSelections: initialValues?.addOnSelections ?? null,
+    originalProductOptionId: initialValues?.productOptionId ?? null,
     addOns,
     adminCustomReceiptLines,
     quantities,

package/src/components/booking/ChangeBookingFlow.tsx

@@ -528,6 +528,8 @@ export function ChangeBookingFlow({
     feeLineItems,
     changeFlowBookedFeeUnitByNormalizedLabel,
     addOnSelections,
+    originalAddOnSelections: initialValues?.addOnSelections ?? null,
+    originalProductOptionId: initialValues?.productOptionId ?? null,
     addOns,
     quantities,
     pricing,

package/src/components/booking/useAdminChangePriceSummary.ts

@@ -59,6 +59,8 @@ export interface UseAdminChangePriceSummaryParams {
   feeLineItems: OrderSummaryFeeLine[];
   changeFlowBookedFeeUnitByNormalizedLabel: Map<string, number>;
   addOnSelections: AddOnSelection[];
+  originalAddOnSelections?: AddOnSelection[] | null;
+  originalProductOptionId?: string | null;
   addOns: AddOn[];
   adminCustomReceiptLines: AdminCustomReceiptLine[];
   quantities: Record<string, number>;
@@ -106,6 +108,8 @@ export function useAdminChangePriceSummary({
   feeLineItems,
   changeFlowBookedFeeUnitByNormalizedLabel,
   addOnSelections,
+  originalAddOnSelections,
+  originalProductOptionId,
   addOns,
   adminCustomReceiptLines,
   quantities,
@@ -138,6 +142,9 @@ export function useAdminChangePriceSummary({
     effectiveSubtotal,
     adminCustomAdjustmentTotal,
     effectiveSubtotalForCheckout,
+    promoEligibleSubtotalForCheckout,
+    addOnTotal,
+    originalAddOnSubtotal,
     feeLineItemsForChangeFlowDisplay,
     feeLineItemsWithAddOns,
   } = useAdminChangeProtectedPricing({
@@ -160,6 +167,7 @@ export function useAdminChangePriceSummary({
     feeLineItems,
     changeFlowBookedFeeUnitByNormalizedLabel,
     addOnSelections,
+    originalAddOnSelections,
     addOns,
     adminCustomReceiptLines,
   });
@@ -307,6 +315,10 @@ export function useAdminChangePriceSummary({
     ticketLineItemsForChangeFlowDisplay,
     feeLineItemsWithAddOns,
     effectiveSubtotalForCheckout,
+    promoEligibleSubtotalForCheckout,
+    addOnTotal,
+    originalAddOnSubtotal,
+    originalProductOptionId,
     lockedPromoCode,
     originalReceipt,
     isTaxIncludedInPrice,

package/src/components/booking/useAdminChangePromoDiscount.ts

@@ -24,12 +24,29 @@ interface UseAdminChangePromoDiscountParams {
   ticketLineItemsForChangeFlowDisplay: OrderSummaryTicketLine[];
   feeLineItemsWithAddOns: OrderSummaryFeeLine[];
   effectiveSubtotalForCheckout: number;
+  promoEligibleSubtotalForCheckout?: number;
+  addOnTotal?: number;
+  originalAddOnSubtotal?: number;
+  originalProductOptionId?: string | null;
   lockedPromoCode: string | null;
   originalReceipt: ChangeBookingFlowProps['originalReceipt'];
   isTaxIncludedInPrice: boolean;
   pricingConfig: PricingConfig | null;
 }
 
+function originalReceiptGrossSubtotalBeforePromo(
+  originalReceipt: ChangeBookingFlowProps['originalReceipt'],
+): number {
+  const chargeTypes = new Set(['TICKET', 'FEE', 'RETURN_OPTION', 'CANCELLATION_UPGRADE']);
+  return (originalReceipt?.lineItems ?? []).reduce((sum, line) => {
+    const amount = Number(line.amount) || 0;
+    if (amount <= 0) return sum;
+    const type = String(line.type ?? '').trim().toUpperCase();
+    if (!chargeTypes.has(type)) return sum;
+    return sum + amount;
+  }, 0);
+}
+
 export function useAdminChangePromoDiscount({
   appliedPromoCode,
   selectedAvailability,
@@ -42,6 +59,10 @@ export function useAdminChangePromoDiscount({
   ticketLineItemsForChangeFlowDisplay,
   feeLineItemsWithAddOns,
   effectiveSubtotalForCheckout,
+  promoEligibleSubtotalForCheckout = effectiveSubtotalForCheckout,
+  addOnTotal = Math.max(0, effectiveSubtotalForCheckout - promoEligibleSubtotalForCheckout),
+  originalAddOnSubtotal = 0,
+  originalProductOptionId,
   lockedPromoCode,
   originalReceipt,
   isTaxIncludedInPrice,
@@ -65,20 +86,40 @@ export function useAdminChangePromoDiscount({
     selectedAvailability: null as Availability | null,
     ticketLineItems: [] as Array<{ category: string; qty: number; itemTotal: number }>,
     effectiveSubtotal: 0,
+    promoEligibleSubtotal: 0,
     displayedProductFeeTotal: 0,
     appliedPromoCode: null as string | null,
-    changeBookingPromo: null as { priorAmount?: number } | null,
+    changeBookingPromo: null as {
+      priorAmount?: number;
+      originalFullSubtotal?: number;
+      originalAddOnSubtotal?: number;
+      newFullSubtotal?: number;
+      newAddOnSubtotal?: number;
+    } | null,
   });
 
   const originalReceiptPromoAdjustment = useMemo(
     () => deriveOriginalReceiptPromoAdjustment(originalReceipt),
     [originalReceipt],
   );
+  const originalFullSubtotalBeforePromo = useMemo(
+    () => originalReceiptGrossSubtotalBeforePromo(originalReceipt),
+    [originalReceipt],
+  );
 
   const selectedAvailabilityOptionId = useMemo(
     () => (selectedAvailability ? getAvailabilityOptionId(selectedAvailability) : ''),
     [selectedAvailability],
   );
+  const includeLegacyPromoRetentionContext = useMemo(() => {
+    const originalOptionId = originalProductOptionId?.trim();
+    return Boolean(
+      lockedPromoCode &&
+        originalOptionId &&
+        selectedAvailabilityOptionId &&
+        selectedAvailabilityOptionId === originalOptionId,
+    );
+  }, [lockedPromoCode, originalProductOptionId, selectedAvailabilityOptionId]);
 
   const promoDiscountFetchKey = useMemo(() => {
     if (!appliedPromoCode || !selectedAvailability || totalQuantity === 0) return '';
@@ -100,6 +141,10 @@ export function useAdminChangePromoDiscount({
         .join('|'),
       String(Math.round(feeLineItemsWithAddOns.reduce((sum, fee) => sum + fee.totalAmount, 0) * 100)),
       String(Math.round(effectiveSubtotalForCheckout * 100)),
+      String(Math.round(promoEligibleSubtotalForCheckout * 100)),
+      String(Math.round(addOnTotal * 100)),
+      includeLegacyPromoRetentionContext ? String(Math.round(originalFullSubtotalBeforePromo * 100)) : '',
+      includeLegacyPromoRetentionContext ? String(Math.round(originalAddOnSubtotal * 100)) : '',
       lockedPromoCode ? String(Math.round(originalReceiptPromoAdjustment.amount * 100)) : '',
     ].join('::');
   }, [
@@ -115,6 +160,11 @@ export function useAdminChangePromoDiscount({
     ticketLineItemsForChangeFlowDisplay,
     feeLineItemsWithAddOns,
     effectiveSubtotalForCheckout,
+    promoEligibleSubtotalForCheckout,
+    addOnTotal,
+    includeLegacyPromoRetentionContext,
+    originalFullSubtotalBeforePromo,
+    originalAddOnSubtotal,
     lockedPromoCode,
     originalReceiptPromoAdjustment.amount,
   ]);
@@ -127,10 +177,17 @@ export function useAdminChangePromoDiscount({
       itemTotal: line.itemTotal,
     })),
     effectiveSubtotal: effectiveSubtotalForCheckout,
+    promoEligibleSubtotal: promoEligibleSubtotalForCheckout,
     displayedProductFeeTotal: feeLineItemsWithAddOns.reduce((sum, fee) => sum + fee.totalAmount, 0),
     appliedPromoCode,
     changeBookingPromo: lockedPromoCode
-      ? { priorAmount: originalReceiptPromoAdjustment.amount }
+      ? {
+          priorAmount: originalReceiptPromoAdjustment.amount,
+          originalFullSubtotal: includeLegacyPromoRetentionContext ? originalFullSubtotalBeforePromo : undefined,
+          originalAddOnSubtotal: includeLegacyPromoRetentionContext ? originalAddOnSubtotal : undefined,
+          newFullSubtotal: includeLegacyPromoRetentionContext ? effectiveSubtotalForCheckout : undefined,
+          newAddOnSubtotal: includeLegacyPromoRetentionContext ? addOnTotal : undefined,
+        }
       : null,
   };
 
@@ -151,6 +208,7 @@ export function useAdminChangePromoDiscount({
         ticketLineItems: lines,
         effectiveSubtotal: sub,
         displayedProductFeeTotal,
+        promoEligibleSubtotal: promoSub,
         appliedPromoCode: code,
         changeBookingPromo,
       } = promoDiscountParamsRef.current;
@@ -177,10 +235,16 @@ export function useAdminChangePromoDiscount({
               priorPromoDiscountAmount: changeBookingPromo.priorAmount,
               displayedTicketLines: lines,
               displayedProductFeeTotal,
+              promoEligibleSubtotal: promoSub,
+              legacyPromoOriginalFullSubtotal: changeBookingPromo.originalFullSubtotal,
+              legacyPromoOriginalAddOnSubtotal: changeBookingPromo.originalAddOnSubtotal,
+              legacyPromoNewFullSubtotal: changeBookingPromo.newFullSubtotal,
+              legacyPromoNewAddOnSubtotal: changeBookingPromo.newAddOnSubtotal,
             }
           : {
               displayedTicketLines: lines,
               displayedProductFeeTotal,
+              promoEligibleSubtotal: promoSub,
             },
       )
         .then((res) => {

package/src/components/booking/useAdminChangeProtectedPricing.ts

@@ -17,6 +17,23 @@ import { normalizeLineLabelForCompare } from './change-booking-flow-helpers';
 type AddOnSelection = { addOnId: string; variantId?: string; quantity?: number };
 type AdminCustomReceiptLine = { label: string; amountInput: string; amountSign?: number };
 
+function addOnSelectionTotal(selections: AddOnSelection[] | null | undefined, addOns: AddOn[]): number {
+  let sum = 0;
+  for (const sel of selections ?? []) {
+    const addOn = addOns.find((a) => a.addOnId === sel.addOnId);
+    if (!addOn) continue;
+    const basePrice = addOn.price ?? 0;
+    const hasVariant =
+      (addOn.variantType === 'single_choice' || addOn.variantType === 'multi_quantity') &&
+      sel.variantId;
+    const variantAdjustment = hasVariant
+      ? (addOn.variants?.find((v) => v.id === sel.variantId)?.priceAdjustment ?? 0)
+      : 0;
+    sum += (basePrice + variantAdjustment) * (sel.quantity ?? 1);
+  }
+  return sum;
+}
+
 interface UseAdminChangeProtectedPricingParams {
   selectedAvailability: Availability | null;
   selectedReturnOption: ReturnOption | null;
@@ -37,6 +54,7 @@ interface UseAdminChangeProtectedPricingParams {
   feeLineItems: OrderSummaryFeeLine[];
   changeFlowBookedFeeUnitByNormalizedLabel: Map<string, number>;
   addOnSelections: AddOnSelection[];
+  originalAddOnSelections?: AddOnSelection[] | null;
   addOns: AddOn[];
   adminCustomReceiptLines: AdminCustomReceiptLine[];
 }
@@ -61,25 +79,18 @@ export function useAdminChangeProtectedPricing({
   feeLineItems,
   changeFlowBookedFeeUnitByNormalizedLabel,
   addOnSelections,
+  originalAddOnSelections,
   addOns,
   adminCustomReceiptLines,
 }: UseAdminChangeProtectedPricingParams) {
-  const addOnTotal = useMemo(() => {
-    let sum = 0;
-    for (const sel of addOnSelections) {
-      const addOn = addOns.find((a) => a.addOnId === sel.addOnId);
-      if (!addOn) continue;
-      const basePrice = addOn.price ?? 0;
-      const hasVariant =
-        (addOn.variantType === 'single_choice' || addOn.variantType === 'multi_quantity') &&
-        sel.variantId;
-      const variantAdjustment = hasVariant
-        ? (addOn.variants?.find((v) => v.id === sel.variantId)?.priceAdjustment ?? 0)
-        : 0;
-      sum += (basePrice + variantAdjustment) * (sel.quantity ?? 1);
-    }
-    return sum;
-  }, [addOnSelections, addOns]);
+  const addOnTotal = useMemo(
+    () => addOnSelectionTotal(addOnSelections, addOns),
+    [addOnSelections, addOns],
+  );
+  const originalAddOnSubtotal = useMemo(
+    () => addOnSelectionTotal(originalAddOnSelections, addOns),
+    [originalAddOnSelections, addOns],
+  );
 
   const currentTicketSubtotal = useMemo(
     () => ticketLineItems.reduce((sum, line) => sum + Math.max(0, Number(line.itemTotal) || 0), 0),
@@ -215,6 +226,7 @@ export function useAdminChangeProtectedPricing({
     [adminCustomReceiptLines],
   );
   const effectiveSubtotalForCheckout = roundMoney(effectiveSubtotal + adminCustomAdjustmentTotal);
+  const promoEligibleSubtotalForCheckout = roundMoney(effectiveSubtotalBeforeAddOns + adminCustomAdjustmentTotal);
 
   const feeLineItemsForChangeFlowDisplay = useMemo(() => {
     if (!changeFlowApplyReceiptPaidFloors || totalQuantity <= 0) return feeLineItems;
@@ -274,6 +286,9 @@ export function useAdminChangeProtectedPricing({
     effectiveSubtotal,
     adminCustomAdjustmentTotal,
     effectiveSubtotalForCheckout,
+    promoEligibleSubtotalForCheckout,
+    addOnTotal,
+    originalAddOnSubtotal,
     feeLineItemsForChangeFlowDisplay,
     feeLineItemsWithAddOns,
   };

package/src/components/booking/useChangeBookingPriceSummary.ts

@@ -48,6 +48,8 @@ interface UseChangeBookingPriceSummaryParams {
   feeLineItems: OrderSummaryFeeLine[];
   changeFlowBookedFeeUnitByNormalizedLabel: Map<string, number>;
   addOnSelections: AddOnSelection[];
+  originalAddOnSelections?: AddOnSelection[] | null;
+  originalProductOptionId?: string | null;
   addOns: AddOn[];
   quantities: Record<string, number>;
   pricing: PricingRate[];
@@ -88,6 +90,8 @@ export function useChangeBookingPriceSummary({
   feeLineItems,
   changeFlowBookedFeeUnitByNormalizedLabel,
   addOnSelections,
+  originalAddOnSelections,
+  originalProductOptionId,
   addOns,
   quantities,
   pricing,
@@ -113,6 +117,9 @@ export function useChangeBookingPriceSummary({
     ticketLineItemsForChangeFlowDisplay,
     effectiveSubtotal,
     feeLineItemsWithAddOns,
+    promoEligibleSubtotal,
+    addOnTotal,
+    originalAddOnSubtotal,
   } = useChangeBookingProtectedPricing({
     selectedAvailability,
     selectedReturnOption,
@@ -132,6 +139,7 @@ export function useChangeBookingPriceSummary({
     feeLineItems,
     changeFlowBookedFeeUnitByNormalizedLabel,
     addOnSelections,
+    originalAddOnSelections,
     addOns,
   });
 
@@ -151,6 +159,10 @@ export function useChangeBookingPriceSummary({
     ticketLineItemsForChangeFlowDisplay,
     feeLineItems,
     effectiveSubtotal,
+    promoEligibleSubtotal,
+    addOnTotal,
+    originalAddOnSubtotal,
+    originalProductOptionId,
     lockedPromoCode,
     originalReceipt,
     isTaxIncludedInPrice,

package/src/components/booking/useChangeBookingPromoDiscount.ts

@@ -21,12 +21,29 @@ interface UseChangeBookingPromoDiscountParams {
   ticketLineItemsForChangeFlowDisplay: OrderSummaryTicketLine[];
   feeLineItems: OrderSummaryFeeLine[];
   effectiveSubtotal: number;
+  promoEligibleSubtotal?: number;
+  addOnTotal?: number;
+  originalAddOnSubtotal?: number;
+  originalProductOptionId?: string | null;
   lockedPromoCode: string | null;
   originalReceipt: ChangeBookingFlowProps['originalReceipt'];
   isTaxIncludedInPrice: boolean;
   pricingConfig: PricingConfig | null;
 }
 
+function originalReceiptGrossSubtotalBeforePromo(
+  originalReceipt: ChangeBookingFlowProps['originalReceipt'],
+): number {
+  const chargeTypes = new Set(['TICKET', 'FEE', 'RETURN_OPTION', 'CANCELLATION_UPGRADE']);
+  return (originalReceipt?.lineItems ?? []).reduce((sum, line) => {
+    const amount = Number(line.amount) || 0;
+    if (amount <= 0) return sum;
+    const type = String(line.type ?? '').trim().toUpperCase();
+    if (!chargeTypes.has(type)) return sum;
+    return sum + amount;
+  }, 0);
+}
+
 export function useChangeBookingPromoDiscount({
   appliedPromoCode,
   selectedAvailability,
@@ -39,6 +56,10 @@ export function useChangeBookingPromoDiscount({
   ticketLineItemsForChangeFlowDisplay,
   feeLineItems,
   effectiveSubtotal,
+  promoEligibleSubtotal = effectiveSubtotal,
+  addOnTotal = Math.max(0, effectiveSubtotal - promoEligibleSubtotal),
+  originalAddOnSubtotal = 0,
+  originalProductOptionId,
   lockedPromoCode,
   originalReceipt,
   isTaxIncludedInPrice,
@@ -62,15 +83,36 @@ export function useChangeBookingPromoDiscount({
     selectedAvailability: null as Availability | null,
     ticketLineItems: [] as Array<{ category: string; qty: number; itemTotal: number }>,
     effectiveSubtotal: 0,
+    promoEligibleSubtotal: 0,
     displayedProductFeeTotal: 0,
     appliedPromoCode: null as string | null,
-    changeBookingPromo: null as { priorAmount?: number } | null,
+    changeBookingPromo: null as {
+      priorAmount?: number;
+      originalFullSubtotal?: number;
+      originalAddOnSubtotal?: number;
+      newFullSubtotal?: number;
+      newAddOnSubtotal?: number;
+    } | null,
   });
 
+  const originalFullSubtotalBeforePromo = useMemo(
+    () => originalReceiptGrossSubtotalBeforePromo(originalReceipt),
+    [originalReceipt],
+  );
+
   const selectedAvailabilityOptionId = useMemo(
     () => (selectedAvailability ? getAvailabilityOptionId(selectedAvailability) : ''),
     [selectedAvailability],
   );
+  const includeLegacyPromoRetentionContext = useMemo(() => {
+    const originalOptionId = originalProductOptionId?.trim();
+    return Boolean(
+      lockedPromoCode &&
+        originalOptionId &&
+        selectedAvailabilityOptionId &&
+        selectedAvailabilityOptionId === originalOptionId,
+    );
+  }, [lockedPromoCode, originalProductOptionId, selectedAvailabilityOptionId]);
 
   const promoDiscountFetchKey = useMemo(() => {
     if (!appliedPromoCode || !selectedAvailability || totalQuantity === 0) return '';
@@ -92,6 +134,10 @@ export function useChangeBookingPromoDiscount({
         .join('|'),
       String(Math.round(feeLineItems.reduce((sum, fee) => sum + fee.totalAmount, 0) * 100)),
       String(Math.round(effectiveSubtotal * 100)),
+      String(Math.round(promoEligibleSubtotal * 100)),
+      String(Math.round(addOnTotal * 100)),
+      includeLegacyPromoRetentionContext ? String(Math.round(originalFullSubtotalBeforePromo * 100)) : '',
+      includeLegacyPromoRetentionContext ? String(Math.round(originalAddOnSubtotal * 100)) : '',
       lockedPromoCode ? String(Math.round((originalReceipt?.promoAmount ?? 0) * 100)) : '',
     ].join('::');
   }, [
@@ -107,6 +153,11 @@ export function useChangeBookingPromoDiscount({
     ticketLineItemsForChangeFlowDisplay,
     feeLineItems,
     effectiveSubtotal,
+    promoEligibleSubtotal,
+    addOnTotal,
+    includeLegacyPromoRetentionContext,
+    originalFullSubtotalBeforePromo,
+    originalAddOnSubtotal,
     lockedPromoCode,
     originalReceipt?.promoAmount,
   ]);
@@ -119,10 +170,17 @@ export function useChangeBookingPromoDiscount({
       itemTotal: line.itemTotal,
     })),
     effectiveSubtotal,
+    promoEligibleSubtotal,
     displayedProductFeeTotal: feeLineItems.reduce((sum, fee) => sum + fee.totalAmount, 0),
     appliedPromoCode,
     changeBookingPromo: lockedPromoCode
-      ? { priorAmount: originalReceipt?.promoAmount }
+      ? {
+          priorAmount: originalReceipt?.promoAmount,
+          originalFullSubtotal: includeLegacyPromoRetentionContext ? originalFullSubtotalBeforePromo : undefined,
+          originalAddOnSubtotal: includeLegacyPromoRetentionContext ? originalAddOnSubtotal : undefined,
+          newFullSubtotal: includeLegacyPromoRetentionContext ? effectiveSubtotal : undefined,
+          newAddOnSubtotal: includeLegacyPromoRetentionContext ? addOnTotal : undefined,
+        }
       : null,
   };
 
@@ -143,6 +201,7 @@ export function useChangeBookingPromoDiscount({
         ticketLineItems: lines,
         effectiveSubtotal: sub,
         displayedProductFeeTotal,
+        promoEligibleSubtotal: promoSub,
         appliedPromoCode: code,
         changeBookingPromo,
       } = promoDiscountParamsRef.current;
@@ -169,10 +228,16 @@ export function useChangeBookingPromoDiscount({
               priorPromoDiscountAmount: changeBookingPromo.priorAmount,
               displayedTicketLines: lines,
               displayedProductFeeTotal,
+              promoEligibleSubtotal: promoSub,
+              legacyPromoOriginalFullSubtotal: changeBookingPromo.originalFullSubtotal,
+              legacyPromoOriginalAddOnSubtotal: changeBookingPromo.originalAddOnSubtotal,
+              legacyPromoNewFullSubtotal: changeBookingPromo.newFullSubtotal,
+              legacyPromoNewAddOnSubtotal: changeBookingPromo.newAddOnSubtotal,
             }
           : {
               displayedTicketLines: lines,
               displayedProductFeeTotal,
+              promoEligibleSubtotal: promoSub,
             },
       )
         .then((res) => {

package/src/components/booking/useChangeBookingProtectedPricing.ts

@@ -15,6 +15,23 @@ import { normalizeLineLabelForCompare } from './change-booking-flow-helpers';
 
 type AddOnSelection = { addOnId: string; variantId?: string; quantity?: number };
 
+function addOnSelectionTotal(selections: AddOnSelection[] | null | undefined, addOns: AddOn[]): number {
+  let sum = 0;
+  for (const sel of selections ?? []) {
+    const addOn = addOns.find((a) => a.addOnId === sel.addOnId);
+    if (!addOn) continue;
+    const basePrice = addOn.price ?? 0;
+    const hasVariant =
+      (addOn.variantType === 'single_choice' || addOn.variantType === 'multi_quantity') &&
+      sel.variantId;
+    const variantAdjustment = hasVariant
+      ? (addOn.variants?.find((v) => v.id === sel.variantId)?.priceAdjustment ?? 0)
+      : 0;
+    sum += (basePrice + variantAdjustment) * (sel.quantity ?? 1);
+  }
+  return sum;
+}
+
 interface UseChangeBookingProtectedPricingParams {
   selectedAvailability: Availability | null;
   selectedReturnOption: ReturnOption | null;
@@ -34,6 +51,7 @@ interface UseChangeBookingProtectedPricingParams {
   feeLineItems: OrderSummaryFeeLine[];
   changeFlowBookedFeeUnitByNormalizedLabel: Map<string, number>;
   addOnSelections: AddOnSelection[];
+  originalAddOnSelections?: AddOnSelection[] | null;
   addOns: AddOn[];
 }
 
@@ -56,6 +74,7 @@ export function useChangeBookingProtectedPricing({
   feeLineItems,
   changeFlowBookedFeeUnitByNormalizedLabel,
   addOnSelections,
+  originalAddOnSelections,
   addOns,
 }: UseChangeBookingProtectedPricingParams) {
   const changeFlowProtectedTicketSubtotal = useMemo(() => {
@@ -87,22 +106,14 @@ export function useChangeBookingProtectedPricing({
     changeFlowProtectedReceiptPricing,
   ]);
 
-  const addOnTotal = useMemo(() => {
-    let sum = 0;
-    for (const sel of addOnSelections) {
-      const addOn = addOns.find((a) => a.addOnId === sel.addOnId);
-      if (!addOn) continue;
-      const basePrice = addOn.price ?? 0;
-      const hasVariant =
-        (addOn.variantType === 'single_choice' || addOn.variantType === 'multi_quantity') &&
-        sel.variantId;
-      const variantAdjustment = hasVariant
-        ? (addOn.variants?.find((v) => v.id === sel.variantId)?.priceAdjustment ?? 0)
-        : 0;
-      sum += (basePrice + variantAdjustment) * (sel.quantity ?? 1);
-    }
-    return sum;
-  }, [addOnSelections, addOns]);
+  const addOnTotal = useMemo(
+    () => addOnSelectionTotal(addOnSelections, addOns),
+    [addOnSelections, addOns],
+  );
+  const originalAddOnSubtotal = useMemo(
+    () => addOnSelectionTotal(originalAddOnSelections, addOns),
+    [originalAddOnSelections, addOns],
+  );
 
   const currentTicketSubtotal = useMemo(
     () => ticketLineItems.reduce((sum, line) => sum + Math.max(0, Number(line.itemTotal) || 0), 0),
@@ -220,6 +231,7 @@ export function useChangeBookingProtectedPricing({
         changeFlowProtectedReturnAdjustment
       : subtotal;
   const effectiveSubtotal = effectiveSubtotalBeforeAddOns + addOnTotal;
+  const promoEligibleSubtotal = effectiveSubtotalBeforeAddOns;
 
   const feeLineItemsWithAddOns = useMemo(() => {
     const addOnLines = addOnSelections
@@ -251,6 +263,9 @@ export function useChangeBookingProtectedPricing({
     checkoutReturnLineAmount,
     ticketLineItemsForChangeFlowDisplay,
     effectiveSubtotal,
+    promoEligibleSubtotal,
+    addOnTotal,
+    originalAddOnSubtotal,
     feeLineItemsWithAddOns,
   };
 }

package/src/components/booking/useStandardBookingPriceSummary.ts

@@ -112,10 +112,21 @@ export function useStandardBookingPriceSummary({
     return Math.max(0, selectedReturnOption.vacancies ?? 0);
   }, [selectedReturnOption]);
 
+  const pricingAvailability = useMemo(() => {
+    if (!selectedAvailability || !selectedReturnOption?.rates?.length) return selectedAvailability;
+    const outboundVacancies = Math.max(0, selectedAvailability.vacancies ?? 0);
+    const returnVacancies = Math.max(0, selectedReturnOption.vacancies ?? 0);
+    return {
+      ...selectedAvailability,
+      vacancies: Math.min(outboundVacancies, returnVacancies),
+      rates: selectedReturnOption.rates,
+    };
+  }, [selectedAvailability, selectedReturnOption?.rates, selectedReturnOption?.vacancies]);
+
   const pricing = useMemo(
     () =>
       buildPricingFromAvailability(
-        selectedAvailability,
+        pricingAvailability,
         activeOptions,
         precomputedPricesByOption,
         currency,
@@ -124,7 +135,7 @@ export function useStandardBookingPriceSummary({
         isSimplifiedPricingView,
       ),
     [
-      selectedAvailability,
+      pricingAvailability,
       activeOptions,
       precomputedPricesByOption,
       currency,
@@ -145,7 +156,7 @@ export function useStandardBookingPriceSummary({
       const selectedOption = activeOptions.find(
         (option) =>
           option.optionId ===
-          (selectedAvailability ? getAvailabilityOptionId(selectedAvailability) : ''),
+          (pricingAvailability ? getAvailabilityOptionId(pricingAvailability) : ''),
       );
       const basePriceCAD = selectedOption?.pricing?.[category.toUpperCase()] ?? 0;
       return computePriceBreakdown(
@@ -160,7 +171,7 @@ export function useStandardBookingPriceSummary({
         isSimplifiedPricingView,
       );
     },
-    [pricingConfig, activeOptions, selectedAvailability, currency, hasFees, isSimplifiedPricingView],
+    [pricingConfig, activeOptions, pricingAvailability, currency, hasFees, isSimplifiedPricingView],
   );
 
   const orderSummary = useMemo(
@@ -235,6 +246,7 @@ export function useStandardBookingPriceSummary({
   const checkoutReturnLineAmount = returnPriceAdjustment;
   const effectiveSubtotalBeforeAddOns = subtotal;
   const effectiveSubtotal = effectiveSubtotalBeforeAddOns + addOnTotal;
+  const promoEligibleSubtotal = effectiveSubtotalBeforeAddOns;
 
   const feeLineItemsWithAddOns = useMemo(() => {
     const addOnLines = addOnSelections
@@ -352,7 +364,7 @@ export function useStandardBookingPriceSummary({
     totalPrice,
   } = useStandardBookingPromoDiscount({
     appliedPromoCode,
-    selectedAvailability,
+    selectedAvailability: pricingAvailability,
     totalQuantity,
     productCompanyId,
     envCompanyId,
@@ -362,6 +374,7 @@ export function useStandardBookingPriceSummary({
     ticketLineItems,
     feeLineItems,
     effectiveSubtotal,
+    promoEligibleSubtotal,
     isTaxIncludedInPrice,
     pricingConfig,
   });

package/src/components/booking/useStandardBookingPromoDiscount.ts

@@ -11,6 +11,8 @@ import type {
 import type { Currency } from './CurrencySwitcher';
 import { getAvailabilityOptionId } from './standard-booking-availability';
 
+const normalizeMoneyZero = (value: number) => (Math.abs(value) < 0.005 ? 0 : value);
+
 interface UseStandardBookingPromoDiscountParams {
   appliedPromoCode: string | null;
   selectedAvailability: Availability | null;
@@ -23,6 +25,7 @@ interface UseStandardBookingPromoDiscountParams {
   ticketLineItems: OrderSummaryTicketLine[];
   feeLineItems: OrderSummaryFeeLine[];
   effectiveSubtotal: number;
+  promoEligibleSubtotal?: number;
   isTaxIncludedInPrice: boolean;
   pricingConfig: PricingConfig | null;
 }
@@ -39,6 +42,7 @@ export function useStandardBookingPromoDiscount({
   ticketLineItems,
   feeLineItems,
   effectiveSubtotal,
+  promoEligibleSubtotal = effectiveSubtotal,
   isTaxIncludedInPrice,
   pricingConfig,
 }: UseStandardBookingPromoDiscountParams) {
@@ -60,6 +64,7 @@ export function useStandardBookingPromoDiscount({
     selectedAvailability: null as Availability | null,
     ticketLineItems: [] as Array<{ category: string; qty: number; itemTotal: number }>,
     effectiveSubtotal: 0,
+    promoEligibleSubtotal: 0,
     displayedProductFeeTotal: 0,
     appliedPromoCode: null as string | null,
   });
@@ -89,6 +94,7 @@ export function useStandardBookingPromoDiscount({
         .join('|'),
       String(Math.round(feeLineItems.reduce((sum, fee) => sum + fee.totalAmount, 0) * 100)),
       String(Math.round(effectiveSubtotal * 100)),
+      String(Math.round(promoEligibleSubtotal * 100)),
     ].join('::');
   }, [
     appliedPromoCode,
@@ -103,6 +109,7 @@ export function useStandardBookingPromoDiscount({
     ticketLineItems,
     feeLineItems,
     effectiveSubtotal,
+    promoEligibleSubtotal,
   ]);
 
   promoDiscountParamsRef.current = {
@@ -113,6 +120,7 @@ export function useStandardBookingPromoDiscount({
       itemTotal: line.itemTotal,
     })),
     effectiveSubtotal,
+    promoEligibleSubtotal,
     displayedProductFeeTotal: feeLineItems.reduce((sum, fee) => sum + fee.totalAmount, 0),
     appliedPromoCode,
   };
@@ -134,6 +142,7 @@ export function useStandardBookingPromoDiscount({
         ticketLineItems: lines,
         effectiveSubtotal: sub,
         displayedProductFeeTotal,
+        promoEligibleSubtotal: promoSub,
         appliedPromoCode: code,
       } = promoDiscountParamsRef.current;
       if (!code || !sel) return;
@@ -158,6 +167,7 @@ export function useStandardBookingPromoDiscount({
           totalCapacity: sel.totalCapacity,
           displayedTicketLines: lines,
           displayedProductFeeTotal,
+          promoEligibleSubtotal: promoSub,
         },
       )
         .then((res) => {
@@ -188,9 +198,9 @@ export function useStandardBookingPromoDiscount({
   const taxOnSubtotal = isTaxIncludedInPrice ? 0 : effectiveSubtotal * (pricingConfig?.taxRate ?? 0);
   const effectiveTax =
     effectivePromoDiscountAmount > 0 && !isGiftCard && !isVoucher
-      ? (effectiveSubtotal - effectivePromoDiscountAmount) * (pricingConfig?.taxRate ?? 0)
-      : taxOnSubtotal;
-  const totalPrice = effectiveSubtotal + effectiveTax - effectivePromoDiscountAmount;
+      ? normalizeMoneyZero((effectiveSubtotal - effectivePromoDiscountAmount) * (pricingConfig?.taxRate ?? 0))
+      : normalizeMoneyZero(taxOnSubtotal);
+  const totalPrice = normalizeMoneyZero(effectiveSubtotal + effectiveTax - effectivePromoDiscountAmount);
 
   return {
     promoDiscountAmount,

package/src/lib/booking-api.ts

@@ -980,6 +980,12 @@ export interface GetPromoDiscountBookingChangeOptions {
   displayedTicketLines?: Array<{ category: string; qty: number; itemTotal: number }>;
   /** Displayed product fee total from the cart, excluding add-ons, return, and cancellation lines. */
   displayedProductFeeTotal?: number;
+  /** Promo-eligible subtotal excluding add-ons; normal promos use this, gift cards/vouchers use subtotal. */
+  promoEligibleSubtotal?: number;
+  legacyPromoOriginalFullSubtotal?: number;
+  legacyPromoOriginalAddOnSubtotal?: number;
+  legacyPromoNewFullSubtotal?: number;
+  legacyPromoNewAddOnSubtotal?: number;
 }
 
 export async function getPromoDiscount(
@@ -1004,6 +1010,13 @@ export async function getPromoDiscount(
   });
   if (dateTime) params.set('dateTime', dateTime);
   if (subtotal != null && subtotal > 0) params.set('subtotal', String(subtotal));
+  if (
+    bookingChange?.promoEligibleSubtotal != null &&
+    Number.isFinite(bookingChange.promoEligibleSubtotal) &&
+    bookingChange.promoEligibleSubtotal >= 0
+  ) {
+    params.set('promoEligibleSubtotal', String(bookingChange.promoEligibleSubtotal));
+  }
   if (
     bookingChange?.availabilityCount != null &&
     Number.isFinite(bookingChange.availabilityCount)
@@ -1039,6 +1052,34 @@ export async function getPromoDiscount(
   ) {
     params.set('priorPromoDiscountAmount', String(bookingChange.priorPromoDiscountAmount));
   }
+  if (
+    bookingChange?.legacyPromoOriginalFullSubtotal != null &&
+    Number.isFinite(bookingChange.legacyPromoOriginalFullSubtotal) &&
+    bookingChange.legacyPromoOriginalFullSubtotal >= 0
+  ) {
+    params.set('legacyPromoOriginalFullSubtotal', String(bookingChange.legacyPromoOriginalFullSubtotal));
+  }
+  if (
+    bookingChange?.legacyPromoOriginalAddOnSubtotal != null &&
+    Number.isFinite(bookingChange.legacyPromoOriginalAddOnSubtotal) &&
+    bookingChange.legacyPromoOriginalAddOnSubtotal >= 0
+  ) {
+    params.set('legacyPromoOriginalAddOnSubtotal', String(bookingChange.legacyPromoOriginalAddOnSubtotal));
+  }
+  if (
+    bookingChange?.legacyPromoNewFullSubtotal != null &&
+    Number.isFinite(bookingChange.legacyPromoNewFullSubtotal) &&
+    bookingChange.legacyPromoNewFullSubtotal >= 0
+  ) {
+    params.set('legacyPromoNewFullSubtotal', String(bookingChange.legacyPromoNewFullSubtotal));
+  }
+  if (
+    bookingChange?.legacyPromoNewAddOnSubtotal != null &&
+    Number.isFinite(bookingChange.legacyPromoNewAddOnSubtotal) &&
+    bookingChange.legacyPromoNewAddOnSubtotal >= 0
+  ) {
+    params.set('legacyPromoNewAddOnSubtotal', String(bookingChange.legacyPromoNewAddOnSubtotal));
+  }
   const res = await fetchBookingGetWithRetry(`${API_BASE}/1/get-promo-discount?${params}`);
   if (!res.ok) {
     const err = await res.json();
@@ -1669,6 +1710,8 @@ export interface ReturnOption {
   bookedCapacity?: number;
   pricesByCategory?: { retailPrices: Array<{ category: string; price: number }> };
   priceAdjustmentByCurrency?: Record<string, number>;
+  /** Ticket rates priced using this specific return option's capacity floor. */
+  rates?: AvailabilityRate[];
   returnLocation: string;
   mostPopular?: boolean;
 }