@ticketboothapp/booking 1.2.71 → 1.2.72

package/package.json

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

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -3105,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(() => {
@@ -3123,6 +3124,7 @@ export function AdminChangeBookingFlow({
       currency,
       quantitiesSignature,
       String(Math.round(effectiveSubtotal * 100)),
+      lockedPromoCode ? String(Math.round((originalReceipt?.promoAmount ?? 0) * 100)) : '',
     ].join('::');
   }, [
     appliedPromoCode,
@@ -3135,6 +3137,8 @@ export function AdminChangeBookingFlow({
     currency,
     quantitiesSignature,
     effectiveSubtotal,
+    lockedPromoCode,
+    originalReceipt?.promoAmount,
   ]);
 
   promoDiscountParamsRef.current = {
@@ -3142,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(() => {
@@ -3161,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;
@@ -3178,7 +3186,13 @@ export function AdminChangeBookingFlow({
         currency,
         items,
         sel.dateTime,
-        sub
+        sub,
+        changeBookingPromo
+          ? {
+              forBookingChange: true,
+              priorPromoDiscountAmount: changeBookingPromo.priorAmount,
+            }
+          : undefined
       )
         .then((res) => {
           if (cancelled) return;
@@ -3204,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)

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-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();