@ticketboothapp/booking 1.2.129 → 1.2.131

package/package.json

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

package/src/components/booking/pricing-v2-checkout-summary.ts

@@ -48,27 +48,37 @@ function isPaymentCreditType(type?: string | null): boolean {
   return normalized === "GIFT_CARD" || normalized === "PAYMENT_CREDIT";
 }
 
-function isPaymentCreditSummaryLine(line: PriceSummaryLine): boolean {
-  return line.kind === "line" && isPaymentCreditType(line.type);
+function isPaymentCreditQuoteLine(line: PricingV2QuoteLineSnapshot): boolean {
+  return isPaymentCreditType(line.type);
 }
 
-function movePaymentCreditLinesAfterTax(lines: PriceSummaryLine[]): PriceSummaryLine[] {
-  const paymentCreditLines = lines.filter(isPaymentCreditSummaryLine);
-  if (paymentCreditLines.length === 0) return lines;
+function isPostTaxDiscountQuoteLine(line: PricingV2QuoteLineSnapshot): boolean {
+  const discountBehavior = String(line.discountBehavior ?? "").trim().toUpperCase();
+  const source = String(line.source ?? "").trim().toUpperCase();
+  return discountBehavior === "POST_TAX_DISCOUNT" || source === "VOUCHER";
+}
 
-  const nonPaymentCreditLines = lines.filter((line) => !isPaymentCreditSummaryLine(line));
-  const taxIndex = nonPaymentCreditLines.findIndex(
-    (line) => line.kind === "line" && normalizedLineType(line.type) === "TAX",
+function moveSettlementLinesAfterTax(
+  lines: PricingV2QuoteLineSnapshot[],
+): PricingV2QuoteLineSnapshot[] {
+  const settlementLines = lines.filter(
+    (line) => isPaymentCreditQuoteLine(line) || isPostTaxDiscountQuoteLine(line),
+  );
+  if (settlementLines.length === 0) return lines;
+
+  const nonSettlementLines = lines.filter(
+    (line) => !isPaymentCreditQuoteLine(line) && !isPostTaxDiscountQuoteLine(line),
   );
+  const taxIndex = nonSettlementLines.findIndex((line) => normalizedLineType(line.type) === "TAX");
 
   if (taxIndex < 0) {
-    return [...nonPaymentCreditLines, ...paymentCreditLines];
+    return [...nonSettlementLines, ...settlementLines];
   }
 
   return [
-    ...nonPaymentCreditLines.slice(0, taxIndex + 1),
-    ...paymentCreditLines,
-    ...nonPaymentCreditLines.slice(taxIndex + 1),
+    ...nonSettlementLines.slice(0, taxIndex + 1),
+    ...settlementLines,
+    ...nonSettlementLines.slice(taxIndex + 1),
   ];
 }
 
@@ -112,11 +122,10 @@ export function buildCheckoutModalSummaryFromPricingV2Quote(
   const total = pricingV2QuoteTotal(quote);
   if (total == null) return undefined;
 
-  const mappedLines =
-    quote?.lines
-      ?.map((line, index) => priceSummaryLineFromQuoteLine(line, index))
-      .filter((line): line is PriceSummaryLine => line != null) ?? [];
-  const lines = movePaymentCreditLinesAfterTax(mappedLines);
+  const quoteLines = quote?.lines ?? [];
+  const lines = moveSettlementLinesAfterTax(quoteLines)
+    .map((line, index) => priceSummaryLineFromQuoteLine(line, index))
+    .filter((line): line is PriceSummaryLine => line != null);
 
   if (lines.length === 0) return undefined;
 
@@ -156,8 +165,9 @@ export function buildCheckoutModalSummaryFromPricingV2Quote(
     0,
     finiteNumber(quote?.paymentCreditTotal) ?? 0,
   );
+  const hasPostTaxDiscount = quoteLines.some(isPostTaxDiscountQuoteLine);
   const subtotal = finiteNumber(
-    paymentCreditTotal > 0
+    paymentCreditTotal > 0 || hasPostTaxDiscount
       ? quote?.taxableSubtotal ??
           quote?.grossSubtotal ??
           quote?.netSubtotalBeforeTax ??

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(
@@ -352,7 +363,7 @@ export function useStandardBookingPriceSummary({
     totalPrice,
   } = useStandardBookingPromoDiscount({
     appliedPromoCode,
-    selectedAvailability,
+    selectedAvailability: pricingAvailability,
     totalQuantity,
     productCompanyId,
     envCompanyId,

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;
@@ -188,9 +190,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

@@ -1669,6 +1669,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;
 }

package/test/change-booking-helpers.test.ts

@@ -218,6 +218,59 @@ test('maps Pricing V2 gift cards as payment credits after tax', () => {
   );
 });
 
+test('maps Pricing V2 post-tax vouchers after tax with full taxable subtotal', () => {
+  const summary = buildCheckoutModalSummaryFromPricingV2Quote(
+    {
+      currency: 'CAD',
+      grossSubtotal: 629.18,
+      discountTotal: -455.11,
+      paymentCreditTotal: 0,
+      netSubtotalBeforeTax: 174.07,
+      taxableSubtotal: 629.18,
+      taxAmount: 53.48,
+      payableTotal: 227.55,
+      amountToCharge: 227.55,
+      lines: [
+        {
+          lineId: 'ticket_1',
+          type: 'TICKET',
+          label: 'ADULT',
+          amount: 581.21,
+          quantity: 3,
+        },
+        {
+          lineId: 'fee_1',
+          type: 'FEE',
+          label: 'Moraine Lake Road Access Fee',
+          amount: 47.97,
+        },
+        {
+          lineId: 'voucher_1',
+          type: 'DISCOUNT',
+          label: "Les Clefs d'Or",
+          amount: -455.11,
+          discountBehavior: 'POST_TAX_DISCOUNT',
+          source: 'VOUCHER',
+        },
+        {
+          lineId: 'tax_1',
+          type: 'TAX',
+          label: 'Taxes and fees',
+          amount: 53.48,
+        },
+      ],
+    },
+    'Rounding',
+  );
+
+  assert.equal(summary?.subtotal, 629.18);
+  assert.equal(summary?.fullTotalAmount, 227.55);
+  assert.deepEqual(
+    summary?.lines.map((line) => (line.kind === 'line' ? line.type : 'TICKET')),
+    ['TICKET', 'FEE', 'TAX', 'DISCOUNT'],
+  );
+});
+
 test('builds paid checkout modal data with trimmed customer and change totals', () => {
   const modalData = buildChangeBookingPaidCheckoutModalData({
     bookingReference: 'bookRef_ABC-123',