@ticketboothapp/booking 1.2.70 → 1.2.72

package/package.json

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

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -826,17 +826,12 @@ export function AdminChangeBookingFlow({
   /** Any change from an existing booking (public or provider). */
   const isChangeBookingContext = Boolean(initialValues?.bookingReference?.trim());
   /**
-   * When the provider passes `onChangeBooking` we normally apply the change immediately on checkout.
-   * In provider-dashboard + admin + change mode we need the "Pay now / confirm without payment" step
-   * first, so we run the public change-intent quote + PI, then call `onChangeBooking` from
-   * `handleConfirmWithoutPayment` (or after paying in the checkout modal).
+   * Public `POST .../change/quote` path whenever we are editing an existing booking — including when the host passes
+   * `onChangeBooking`. Provider apply (`onChangeBooking`) runs only after Pay now / Confirm without payment, never from
+   * Continue alone.
    */
-  const deferProviderApplyToAdminPaymentChoice =
-    isAdmin &&
-    isChangeBookingContext &&
-    bookingAppMode === 'provider-dashboard' &&
-    isProviderDashboardChange;
-  const isCustomerSelfServeChange = !isProviderDashboardChange || deferProviderApplyToAdminPaymentChoice;
+  const isCustomerSelfServeChange =
+    !isProviderDashboardChange || isChangeBookingContext;
   /** Do not render catalog-/FE-derived dollar amounts in UI until `quoteChangeBooking` returns `serverDisplay`. */
   const suppressSelfServeCurrencyUi = isCustomerSelfServeChange;
 
@@ -1722,14 +1717,14 @@ export function AdminChangeBookingFlow({
   }, [initialValues?.productId, product.productId]);
 
   /**
-   * Receipt pricing on protected seats/fees — **customer self-serve only**: Rule A (exact receipt unit when same calendar day
-   * + same product option) vs Rule B (`max(receipt, live)` when date or option changes). Provider dashboard uses live catalog.
+   * Receipt pricing on protected seats/fees: Rule A / B per `change-flow-pricing.ts`, same as public self-serve whenever
+   * `POST .../change/quote` runs (`isCustomerSelfServeChange`, including provider dashboard with `onChangeBooking`).
    */
   const changeFlowApplyReceiptPaidFloors = useMemo(
     () =>
-      !isProviderDashboardChange &&
+      isCustomerSelfServeChange &&
       changeFlowBookingParentProductIdForFloors === product.productId.trim(),
-    [isProviderDashboardChange, changeFlowBookingParentProductIdForFloors, product.productId],
+    [isCustomerSelfServeChange, changeFlowBookingParentProductIdForFloors, product.productId],
   );
 
   useEffect(() => {
@@ -2585,7 +2580,7 @@ export function AdminChangeBookingFlow({
     latestChangeQuote?.serverPreview?.returnOptionPriceByReturnAvailabilityId,
   ]);
 
-  /** Order-summary return row uses self-serve floors via [selectedReturnOptionWithFloor]; provider stays catalog-only. */
+  /** Order-summary return row uses self-serve floors via [selectedReturnOptionWithFloor] when `isCustomerSelfServeChange`. */
   const returnOptionForOrderSummary = useMemo(
     () => selectedReturnOptionWithFloor,
     [selectedReturnOptionWithFloor],
@@ -2839,7 +2834,7 @@ export function AdminChangeBookingFlow({
    */
   const changeFlowProtectedReturnAdjustment = useMemo(() => {
     if (totalQuantity <= 0) return returnPriceAdjustment;
-    if (isProviderDashboardChange) return returnPriceAdjustment;
+    if (!isCustomerSelfServeChange) return returnPriceAdjustment;
     if (effectiveChangeFlowReturnUnitFloorPerPerson == null) return returnPriceAdjustment;
     const livePerPerson =
       returnOptionCatalogPerPerson ?? (selectedReturnOption?.priceAdjustmentByCurrency?.[currency] ?? 0);
@@ -2853,13 +2848,13 @@ export function AdminChangeBookingFlow({
   }, [
     totalQuantity,
     returnPriceAdjustment,
-    isProviderDashboardChange,
     effectiveChangeFlowReturnUnitFloorPerPerson,
     selectedReturnOption,
     returnOptionCatalogPerPerson,
     currency,
     changeFlowInitialTicketCount,
     changeFlowReturnPricingRuleA,
+    isCustomerSelfServeChange,
   ]);
 
   /** Return row amount for PriceSummary, Stripe breakdown, and CheckoutModal (catalog vs protected same-product-option). */
@@ -3110,6 +3105,7 @@ export function AdminChangeBookingFlow({
     ticketLineItems: [] as Array<{ category: string; qty: number }>,
     effectiveSubtotal: 0,
     appliedPromoCode: null as string | null,
+    changeBookingPromo: null as { priorAmount?: number } | null,
   });
 
   const promoDiscountFetchKey = useMemo(() => {
@@ -3128,6 +3124,7 @@ export function AdminChangeBookingFlow({
       currency,
       quantitiesSignature,
       String(Math.round(effectiveSubtotal * 100)),
+      lockedPromoCode ? String(Math.round((originalReceipt?.promoAmount ?? 0) * 100)) : '',
     ].join('::');
   }, [
     appliedPromoCode,
@@ -3140,6 +3137,8 @@ export function AdminChangeBookingFlow({
     currency,
     quantitiesSignature,
     effectiveSubtotal,
+    lockedPromoCode,
+    originalReceipt?.promoAmount,
   ]);
 
   promoDiscountParamsRef.current = {
@@ -3147,6 +3146,9 @@ export function AdminChangeBookingFlow({
     ticketLineItems: ticketLineItems.map((l) => ({ category: l.category, qty: l.qty })),
     effectiveSubtotal,
     appliedPromoCode,
+    changeBookingPromo: lockedPromoCode
+      ? { priorAmount: originalReceipt?.promoAmount }
+      : null,
   };
 
   useEffect(() => {
@@ -3166,6 +3168,7 @@ export function AdminChangeBookingFlow({
         ticketLineItems: lines,
         effectiveSubtotal: sub,
         appliedPromoCode: code,
+        changeBookingPromo,
       } = promoDiscountParamsRef.current;
       if (!code || !sel) return;
       const companyId = product.companyId ?? env.COMPANY_ID;
@@ -3183,7 +3186,13 @@ export function AdminChangeBookingFlow({
         currency,
         items,
         sel.dateTime,
-        sub
+        sub,
+        changeBookingPromo
+          ? {
+              forBookingChange: true,
+              priorPromoDiscountAmount: changeBookingPromo.priorAmount,
+            }
+          : undefined
       )
         .then((res) => {
           if (cancelled) return;
@@ -3209,7 +3218,7 @@ export function AdminChangeBookingFlow({
 
   // Percentage/fixed promos: tax on discounted amount (promo before GST per CRA guidance).
   // Vouchers and gift cards: tax on full subtotal (voucher discount includes tax on free portion; gift card is payment).
-  // Change booking: same as normal — discount from get-promo-discount on the new selection (promo code from booking).
+  // 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)
@@ -4476,49 +4485,6 @@ export function AdminChangeBookingFlow({
         return;
       }
 
-      if (onChangeBooking && !deferProviderApplyToAdminPaymentChoice) {
-        const pickupForChange = pickupLocationId
-          ? product.pickupLocations?.find((loc) => loc.id === pickupLocationId)
-          : null;
-        await onChangeBooking({
-          productId: availabilityProductOptionId,
-          dateTime: selectedAvailability.dateTime,
-          bookingItems,
-          returnAvailabilityId: selectedReturnOption?.returnAvailabilityId ?? null,
-          pickupLocationId: pickupLocationId ?? null,
-          travelerHotel: pickupForChange?.name ?? null,
-          startTime: selectedAvailability.dateTime ?? null,
-          passengerCount: null,
-          childSafetySeatsCount: null,
-          foodRestrictions: null,
-          addOnSelections: addOnSelections.length > 0 ? addOnSelections : null,
-          cancellationPolicyId: cancellationPolicyId ?? initialValues?.cancellationPolicyId ?? null,
-          promoCode: appliedPromoCode ?? null,
-          newTotalAmount: displayChangeFlowProposedTotal,
-          additionalHoursCount: null,
-          pricingAdjustment:
-            providerPricingOverrides.length > 0 || providerAdditionalAdjustments.length > 0
-              ? {
-                  mode: 'MANUAL_LINES',
-                  lineOverrides: providerPricingOverrides,
-                  additionalAdjustments: providerAdditionalAdjustments,
-                }
-              : undefined,
-          capacitySeatCredit: {
-            enabled: true,
-            previousPassengerCount: changeFlowInitialTicketCount,
-            previousAvailabilityId: initialValues?.availabilityId ?? null,
-            previousReturnAvailabilityId: initialValues?.returnAvailabilityId ?? null,
-          },
-        });
-        const refAfterChange = initialValues?.bookingReference?.trim();
-        if (refAfterChange) {
-          onSuccess?.({ reservationReference: refAfterChange });
-        }
-        setLoading(false);
-        return;
-      }
-
       const bookingSourceContext = buildBookingSourceContext(bookingSourceAttribution, {
         clientChannelSource: inferClientBookingSourceFromProductIds(
           product.productId,

package/src/components/booking/ChangeBookingFlow.tsx

@@ -2995,6 +2995,8 @@ export function ChangeBookingFlow({
     ticketLineItems: [] as Array<{ category: string; qty: number }>,
     effectiveSubtotal: 0,
     appliedPromoCode: null as string | null,
+    /** Change flow: pass BE stored promo discount for expired / fixed promo locking. */
+    changeBookingPromo: null as { priorAmount?: number } | null,
   });
 
   const promoDiscountFetchKey = useMemo(() => {
@@ -3013,6 +3015,7 @@ export function ChangeBookingFlow({
       currency,
       quantitiesSignature,
       String(Math.round(effectiveSubtotal * 100)),
+      lockedPromoCode ? String(Math.round((originalReceipt?.promoAmount ?? 0) * 100)) : '',
     ].join('::');
   }, [
     appliedPromoCode,
@@ -3025,6 +3028,8 @@ export function ChangeBookingFlow({
     currency,
     quantitiesSignature,
     effectiveSubtotal,
+    lockedPromoCode,
+    originalReceipt?.promoAmount,
   ]);
 
   promoDiscountParamsRef.current = {
@@ -3032,6 +3037,9 @@ export function ChangeBookingFlow({
     ticketLineItems: ticketLineItems.map((l) => ({ category: l.category, qty: l.qty })),
     effectiveSubtotal,
     appliedPromoCode,
+    changeBookingPromo: lockedPromoCode
+      ? { priorAmount: originalReceipt?.promoAmount }
+      : null,
   };
 
   useEffect(() => {
@@ -3051,6 +3059,7 @@ export function ChangeBookingFlow({
         ticketLineItems: lines,
         effectiveSubtotal: sub,
         appliedPromoCode: code,
+        changeBookingPromo,
       } = promoDiscountParamsRef.current;
       if (!code || !sel) return;
       const companyId = product.companyId ?? env.COMPANY_ID;
@@ -3068,7 +3077,13 @@ export function ChangeBookingFlow({
         currency,
         items,
         sel.dateTime,
-        sub
+        sub,
+        changeBookingPromo
+          ? {
+              forBookingChange: true,
+              priorPromoDiscountAmount: changeBookingPromo.priorAmount,
+            }
+          : undefined
       )
         .then((res) => {
           if (cancelled) return;
@@ -3094,7 +3109,7 @@ export function ChangeBookingFlow({
 
   // Percentage/fixed promos: tax on discounted amount (promo before GST per CRA guidance).
   // Vouchers and gift cards: tax on full subtotal (voucher discount includes tax on free portion; gift card is payment).
-  // Change booking: same as normal — discount from get-promo-discount on the new selection (promo code from booking).
+  // Change booking: get-promo-discount uses forBookingChange + receipt prior promo (BE locks expired % / fixed / voucher).
   const lockedPromoFallbackAmount =
     lockedPromoCode
       ? Math.max(0, originalReceipt?.promoAmount ?? 0)

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

@@ -5,9 +5,9 @@
  * channel) on top of these formulas.
  *
  * ### 1. When receipt “paid floors” apply
- * Only **customer self-serve** change flow, when the booking’s **parent catalog product** matches the **loaded product**
- * (`changeFlowApplyReceiptPaidFloors` in BookingFlow). **Provider dashboard** change flow uses **live catalog only** (no
- * floors) so a cheaper date/return yields a lower total / refund via signed balance.
+ * When the booking’s **parent catalog product** matches the **loaded product** and the flow uses the public
+ * `POST .../change/quote` path (`isCustomerSelfServeChange` in AdminChangeBookingFlow, including provider dashboard with
+ * `onChangeBooking`).
  *
  * ### 2. Tickets (per category)
  * **Unchanged itinerary** (same calendar departure date **and** same product option as the booking): among seats up to the
@@ -26,12 +26,12 @@
  * BE `PublicChangeBookingQuotePricing`: **baseline party** (originally booked headcount) vs **incremental** seats. **Rule A**
  * (same `returnAvailabilityId` as the booking **and** unchanged outbound itinerary): protected pay exact locked per person;
  * incremental pay **live catalog** return only ($0 when free). **Else Rule B:** protected pay **`max(floor, live)`**;
- * incremental pay **live** only. Provider dashboard: **live catalog return only** (no floor).
+ * incremental pay **live** only.
  *
  * ### 5. Return option — **picker UI only** (BookingFlow)
  * **Self-serve:** return cards use the floored per-person price when a floor exists (aligned with §4), for every return
  * slot, regardless of date/option change.
- * **Provider dashboard:** cards show **catalog** prices only (no floor).
+ * With `POST .../change/quote`, return cards follow the same floor behavior as self-serve.
  *
  * ### 6. Quote “new booking” total & balance
  * **FE proposed total** = full cart math (subtotal + tax − promo), cent-rounded; optional **1¢ reconcile** to old receipt

package/src/lib/booking-api.ts

@@ -651,6 +651,13 @@ export interface GetPromoDiscountResponse {
   isVoucher?: boolean;
 }
 
+/** Booking change: server locks discount using stored receipt promo when windows expire / fixed codes. */
+export interface GetPromoDiscountBookingChangeOptions {
+  forBookingChange?: boolean;
+  /** Stored promo discount from the existing booking (major units, same currency as quote). */
+  priorPromoDiscountAmount?: number;
+}
+
 export async function getPromoDiscount(
   promoCode: string,
   companyId: string,
@@ -659,7 +666,8 @@ export async function getPromoDiscount(
   currency: string,
   items: Array<{ category: string; qty: number }>,
   dateTime?: string,
-  subtotal?: number
+  subtotal?: number,
+  bookingChange?: GetPromoDiscountBookingChangeOptions
 ): Promise<GetPromoDiscountResponse> {
   const itemsStr = items.map((i) => `${i.category}:${i.qty}`).join(',');
   const params = new URLSearchParams({
@@ -672,6 +680,15 @@ export async function getPromoDiscount(
   });
   if (dateTime) params.set('dateTime', dateTime);
   if (subtotal != null && subtotal > 0) params.set('subtotal', String(subtotal));
+  if (bookingChange?.forBookingChange === true) {
+    params.set('forBookingChange', 'true');
+  }
+  if (
+    bookingChange?.priorPromoDiscountAmount != null &&
+    Number.isFinite(bookingChange.priorPromoDiscountAmount)
+  ) {
+    params.set('priorPromoDiscountAmount', String(bookingChange.priorPromoDiscountAmount));
+  }
   const res = await fetchBookingGetWithRetry(`${API_BASE}/1/get-promo-discount?${params}`);
   if (!res.ok) {
     const err = await res.json();