@ticketboothapp/booking 1.2.97 → 1.2.99

package/package.json

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

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -153,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>,
@@ -3265,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);
@@ -3323,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;
@@ -3339,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,
@@ -3353,7 +3358,7 @@ export function AdminChangeBookingFlow({
     quantitiesSignature,
     effectiveSubtotalForCheckout,
     lockedPromoCode,
-    originalReceipt?.promoAmount,
+    originalReceiptPromoAdjustment.amount,
   ]);
 
   promoDiscountParamsRef.current = {
@@ -3362,7 +3367,7 @@ export function AdminChangeBookingFlow({
     effectiveSubtotal: effectiveSubtotalForCheckout,
     appliedPromoCode,
     changeBookingPromo: lockedPromoCode
-      ? { priorAmount: originalReceipt?.promoAmount }
+      ? { priorAmount: originalReceiptPromoAdjustment.amount }
       : null,
   };
 
@@ -3434,18 +3439,87 @@ 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: get-promo-discount uses forBookingChange + prior promo from receipt so expired codes stay locked (BE).
-  const lockedPromoFallbackAmount =
-    lockedPromoCode
-      ? Math.max(0, originalReceipt?.promoAmount ?? 0)
-      : 0;
+  const receiptPromoFallbackAmount = Math.max(0, originalReceiptPromoAdjustment.amount);
   const effectivePromoDiscountAmount =
-    promoDiscountAmount > 0 ? promoDiscountAmount : lockedPromoFallbackAmount;
+    promoDiscountAmount > 0 ? promoDiscountAmount : receiptPromoFallbackAmount;
+  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.
@@ -4036,9 +4110,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,
@@ -5362,9 +5441,9 @@ export function AdminChangeBookingFlow({
         ...(effectivePromoDiscountAmount > 0
           ? [
               {
-                label: appliedPromoCode ? `Promo: ${appliedPromoCode}` : (originalReceipt?.promoLabel || (t('booking.discount') || 'Discount')),
+                label: appliedPromoCode ? `Promo: ${appliedPromoCode}` : (originalReceiptPromoAdjustment.label || originalReceipt?.promoLabel || (t('booking.discount') || 'Discount')),
                 amount: -effectivePromoDiscountAmount,
-                type: isGiftCard ? 'GIFT_CARD' : 'PROMO_CODE',
+                type: effectivePromoLineType,
               },
             ]
           : []),
@@ -5440,7 +5519,7 @@ export function AdminChangeBookingFlow({
           isTaxIncludedInPrice,
           taxRate: pricingConfig?.taxRate ?? 0,
           promoDiscountAmount: effectivePromoDiscountAmount > 0 ? effectivePromoDiscountAmount : 0,
-          discountLabel: appliedPromoCode ? `Promo: ${appliedPromoCode}` : (originalReceipt?.promoLabel || undefined),
+          discountLabel: appliedPromoCode ? `Promo: ${appliedPromoCode}` : (originalReceiptPromoAdjustment.label || originalReceipt?.promoLabel || undefined),
         });
         setShowAdminPaymentChoice(true);
         setLoading(false);
@@ -5491,7 +5570,7 @@ export function AdminChangeBookingFlow({
         isTaxIncludedInPrice,
         taxRate: pricingConfig?.taxRate ?? 0,
         promoDiscountAmount: effectivePromoDiscountAmount > 0 ? effectivePromoDiscountAmount : 0,
-        discountLabel: appliedPromoCode ? `Promo: ${appliedPromoCode}` : (originalReceipt?.promoLabel || undefined),
+        discountLabel: appliedPromoCode ? `Promo: ${appliedPromoCode}` : (originalReceiptPromoAdjustment.label || originalReceipt?.promoLabel || undefined),
         changeTotals:
           isCustomerSelfServeChange && originalReceipt
             ? {