@ticketboothapp/booking 1.2.83 → 1.2.85

package/package.json

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

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -152,14 +152,39 @@ function omitZeroAmountPromoDiscountSummaryLines(lines: PriceSummaryLine[]): Pri
   });
 }
 
-function mapSummaryLinesToFeReceiptLineItems(lines: PriceSummaryLine[]): NonNullable<AdminFeAuthoritativeReceipt['lineItems']> {
+function resolveTicketQtyFromQuantities(
+  category: string,
+  quantities: Record<string, number>,
+): number | undefined {
+  const c = category.trim();
+  if (Object.prototype.hasOwnProperty.call(quantities, c)) return quantities[c];
+  const up = c.toUpperCase();
+  for (const [key, val] of Object.entries(quantities)) {
+    if (key.toUpperCase() === up) return val;
+  }
+  return undefined;
+}
+
+/** Receipt TICKET rows sent on admin quote must follow picker {@link quantities}: BE apply uses these lines for headcount when feReceipt is authoritative — server `priceSummaryLines` can lag counts. */
+function mapSummaryLinesToFeReceiptLineItems(
+  lines: PriceSummaryLine[],
+  quantities: Record<string, number>,
+): NonNullable<AdminFeAuthoritativeReceipt['lineItems']> {
   return lines.map((line) => {
     if (line.kind === 'ticket') {
+      const uiQty = resolveTicketQtyFromQuantities(line.category, quantities);
+      const lineQty = Math.max(0, line.qty);
+      const effectiveQty =
+        uiQty != null && uiQty >= 0 ? Math.round(uiQty) : lineQty;
+      let amount = roundMoney(line.itemTotal);
+      if (lineQty > 0 && effectiveQty !== lineQty) {
+        amount = roundMoney((line.itemTotal * effectiveQty) / lineQty);
+      }
       return {
         label: line.category,
-        amount: roundMoney(line.itemTotal),
+        amount,
         type: 'TICKET',
-        quantity: line.qty,
+        quantity: Math.max(0, effectiveQty),
       };
     }
     const normalizedType = String(line.type ?? '').trim().toUpperCase();
@@ -3828,7 +3853,7 @@ export function AdminChangeBookingFlow({
   const displayChangeFlowProposedTotalWithEditableLines = roundMoney(
     displayChangeFlowProposedTotal + editableSummaryPreSubtotalDelta
   );
-  /** Tax-included currencies: ticket row amounts match authoritative new-booking total (quote/display), not raw catalog/floor rollup. */
+  /** Tax-included: scale ticket row $ on the PriceSummary so ADULT lines match the footer total (quote/display). Payment breakdown still uses {@link ticketLineItemsForChangeFlowDisplay} — it must reconcile to amount-due, not full new-booking total. */
   const taxIncludedReconciledCheckoutPriceSummaryLines = useMemo(() => {
     if (!isTaxIncludedInPrice || !originalReceipt || showProviderPricingInlineEditor) {
       return editableCheckoutPriceSummaryLines;
@@ -3847,11 +3872,39 @@ export function AdminChangeBookingFlow({
     effectivePromoDiscountAmount,
   ]);
 
+  /** Stripe modal / admin pay modal must use the same ticket row amounts as PriceSummary; unreconciled catalog lines caused ADULT € vs total mismatch (tax-included). PI `buildCheckoutBreakdown` stays on catalog ticket rows. */
+  const checkoutModalTicketLinesDisplay = useMemo((): CheckoutModalLineItem[] => {
+    return taxIncludedReconciledCheckoutPriceSummaryLines
+      .filter((l): l is Extract<PriceSummaryLine, { kind: 'ticket' }> => l.kind === 'ticket')
+      .map((line) => {
+        const rate = pricing.find((r) => r.category === line.category);
+        const breakdown = getPriceBreakdown(
+          line.category,
+          rate?.priceCAD ?? 0,
+          rate?.baseInDisplayCurrency,
+          rate?.appliedAdjustments ?? [],
+        );
+        const qty = Math.max(0, line.qty);
+        return {
+          line: {
+            category: line.category,
+            qty,
+            itemTotal: line.itemTotal,
+            pricePerUnit: qty > 0 ? roundMoney(line.itemTotal / qty) : 0,
+          },
+          breakdown,
+        };
+      });
+  }, [taxIncludedReconciledCheckoutPriceSummaryLines, pricing, getPriceBreakdown]);
+
   const adminFeAuthoritativeReceipt = useMemo((): AdminFeAuthoritativeReceipt => {
     const hasTaxLine = taxIncludedReconciledCheckoutPriceSummaryLines.some(
       (line) => line.kind === 'line' && String(line.type ?? '').toUpperCase() === 'TAX'
     );
-    const lineItems = mapSummaryLinesToFeReceiptLineItems(taxIncludedReconciledCheckoutPriceSummaryLines);
+    const lineItems = mapSummaryLinesToFeReceiptLineItems(
+      taxIncludedReconciledCheckoutPriceSummaryLines,
+      quantities,
+    );
     if (!hasTaxLine && Math.abs(displayChangeFlowTax) >= 0.0005) {
       lineItems.push({
         label: t('booking.tax') !== 'booking.tax' ? t('booking.tax') : 'Taxes and fees',
@@ -3875,6 +3928,7 @@ export function AdminChangeBookingFlow({
     };
   }, [
     taxIncludedReconciledCheckoutPriceSummaryLines,
+    quantities,
     displayChangeFlowTax,
     displayChangeFlowSubtotal,
     editableSummaryPreSubtotalDelta,
@@ -5034,11 +5088,8 @@ export function AdminChangeBookingFlow({
             }),
           )
         : totalPrice;
-      const ticketRowsForCheckoutBreakdown = taxIncludedReconciledCheckoutPriceSummaryLines.filter(
-        (l): l is Extract<PriceSummaryLine, { kind: 'ticket' }> => l.kind === 'ticket',
-      );
       const lines = [
-        ...ticketRowsForCheckoutBreakdown.map((line) => ({
+        ...ticketLineItemsForChangeFlowDisplay.map((line) => ({
           label: line.category,
           amount: line.itemTotal,
           type: 'TICKET' as const,
@@ -5181,25 +5232,7 @@ export function AdminChangeBookingFlow({
           availabilityProductOptionId,
           itineraryDisplay: itineraryDisplay ?? undefined,
           clientSecret: paymentIntent.clientSecret ?? '',
-          ticketLinesForModal: ticketRowsForCheckoutBreakdown.map((line) => {
-            const rate = pricing.find((r) => r.category === line.category);
-            const breakdown = getPriceBreakdown(
-              line.category,
-              rate?.priceCAD ?? 0,
-              rate?.baseInDisplayCurrency,
-              rate?.appliedAdjustments ?? []
-            );
-            const qty = Math.max(0, line.qty);
-            return {
-              line: {
-                category: line.category,
-                qty,
-                itemTotal: line.itemTotal,
-                pricePerUnit: qty > 0 ? roundMoney(line.itemTotal / qty) : 0,
-              },
-              breakdown,
-            };
-          }),
+          ticketLinesForModal: checkoutModalTicketLinesDisplay,
           feeLineItems: feeLineItemsWithAddOns,
           returnPriceAdjustment: checkoutReturnLineAmount,
           cancellationPolicyFee,
@@ -5217,26 +5250,6 @@ export function AdminChangeBookingFlow({
         return;
       }
 
-      const ticketLinesForModal: CheckoutModalLineItem[] = ticketRowsForCheckoutBreakdown.map((line) => {
-        const rate = pricing.find((r) => r.category === line.category);
-        const breakdown = getPriceBreakdown(
-          line.category,
-          rate?.priceCAD ?? 0,
-          rate?.baseInDisplayCurrency,
-          rate?.appliedAdjustments ?? []
-        );
-        const qty = Math.max(0, line.qty);
-        return {
-          line: {
-            category: line.category,
-            qty,
-            itemTotal: line.itemTotal,
-            pricePerUnit: qty > 0 ? roundMoney(line.itemTotal / qty) : 0,
-          },
-          breakdown,
-        };
-      });
-
       setCheckoutClientSecret(paymentIntent.clientSecret ?? '');
       setCheckoutModalData({
         reservationReference: changeBookingReferenceForPaidFlow ?? '',
@@ -5269,7 +5282,7 @@ export function AdminChangeBookingFlow({
                   return `${origin}/manage-booking?ref=${ref}&lastName=${ln}&${fromQ}${intentQ}`;
                 })()
             : undefined,
-        ticketLines: ticketLinesForModal,
+        ticketLines: checkoutModalTicketLinesDisplay,
         feeLineItems: feeLineItemsWithAddOns,
         returnPriceAdjustment: checkoutReturnLineAmount,
         cancellationPolicyFee,

package/src/components/booking/ChangeBookingFlow.tsx

@@ -3564,6 +3564,30 @@ export function ChangeBookingFlow({
     effectivePromoDiscountAmount,
   ]);
 
+  const checkoutModalTicketLinesDisplay = useMemo((): CheckoutModalLineItem[] => {
+    return taxIncludedSelfServeReconciledPriceSummaryLines
+      .filter((l): l is Extract<PriceSummaryLine, { kind: 'ticket' }> => l.kind === 'ticket')
+      .map((line) => {
+        const rate = pricing.find((r) => r.category === line.category);
+        const breakdown = getPriceBreakdown(
+          line.category,
+          rate?.priceCAD ?? 0,
+          rate?.baseInDisplayCurrency,
+          rate?.appliedAdjustments ?? [],
+        );
+        const qty = Math.max(0, line.qty);
+        return {
+          line: {
+            category: line.category,
+            qty,
+            itemTotal: line.itemTotal,
+            pricePerUnit: qty > 0 ? roundMoney(line.itemTotal / qty) : 0,
+          },
+          breakdown,
+        };
+      });
+  }, [taxIncludedSelfServeReconciledPriceSummaryLines, pricing, getPriceBreakdown]);
+
   const changeFlowClientEstimateDue = (() => {
     if (!originalReceipt) return totalPrice;
     // Customer self-serve: amount due comes from POST .../change/quote (`amountDueCents` / priceDiff), not FE delta math.
@@ -4466,11 +4490,8 @@ export function ChangeBookingFlow({
             originalReceiptTotal: originalReceipt?.total ?? 0,
             audience: 'customer',
           });
-      const ticketRowsForCheckoutBreakdown = taxIncludedSelfServeReconciledPriceSummaryLines.filter(
-        (l): l is Extract<PriceSummaryLine, { kind: 'ticket' }> => l.kind === 'ticket',
-      );
       const lines = [
-        ...ticketRowsForCheckoutBreakdown.map((line) => ({
+        ...ticketLineItemsForChangeFlowDisplay.map((line) => ({
           label: line.category,
           amount: line.itemTotal,
           type: 'TICKET' as const,
@@ -4555,26 +4576,6 @@ export function ChangeBookingFlow({
             })()
           );
 
-      const ticketLinesForModal: CheckoutModalLineItem[] = ticketRowsForCheckoutBreakdown.map((line) => {
-        const rate = pricing.find((r) => r.category === line.category);
-        const breakdown = getPriceBreakdown(
-          line.category,
-          rate?.priceCAD ?? 0,
-          rate?.baseInDisplayCurrency,
-          rate?.appliedAdjustments ?? []
-        );
-        const qty = Math.max(0, line.qty);
-        return {
-          line: {
-            category: line.category,
-            qty,
-            itemTotal: line.itemTotal,
-            pricePerUnit: qty > 0 ? roundMoney(line.itemTotal / qty) : 0,
-          },
-          breakdown,
-        };
-      });
-
       setCheckoutClientSecret(paymentIntent.clientSecret ?? '');
       setCheckoutModalData({
         reservationReference: changeBookingReferenceForPaidFlow ?? '',
@@ -4598,7 +4599,7 @@ export function ChangeBookingFlow({
                 return `${origin}/manage-booking?ref=${ref}&lastName=${ln}&${fromQ}${intentQ}`;
               })()
             : undefined,
-        ticketLines: ticketLinesForModal,
+        ticketLines: checkoutModalTicketLinesDisplay,
         feeLineItems: feeLineItemsWithAddOns,
         returnPriceAdjustment: checkoutReturnLineAmount,
         cancellationPolicyFee,