@ticketboothapp/booking 1.2.84 → 1.2.86

package/package.json

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

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -3872,6 +3872,31 @@ 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'
@@ -5207,16 +5232,7 @@ export function AdminChangeBookingFlow({
           availabilityProductOptionId,
           itineraryDisplay: itineraryDisplay ?? undefined,
           clientSecret: paymentIntent.clientSecret ?? '',
-          ticketLinesForModal: ticketLineItemsForChangeFlowDisplay.map((line) => {
-            const rate = pricing.find((r) => r.category === line.category);
-            const breakdown = getPriceBreakdown(
-              line.category,
-              rate?.priceCAD ?? 0,
-              rate?.baseInDisplayCurrency,
-              rate?.appliedAdjustments ?? []
-            );
-            return { line, breakdown };
-          }),
+          ticketLinesForModal: checkoutModalTicketLinesDisplay,
           feeLineItems: feeLineItemsWithAddOns,
           returnPriceAdjustment: checkoutReturnLineAmount,
           cancellationPolicyFee,
@@ -5234,17 +5250,6 @@ export function AdminChangeBookingFlow({
         return;
       }
 
-      const ticketLinesForModal: CheckoutModalLineItem[] = ticketLineItemsForChangeFlowDisplay.map((line) => {
-        const rate = pricing.find((r) => r.category === line.category);
-        const breakdown = getPriceBreakdown(
-          line.category,
-          rate?.priceCAD ?? 0,
-          rate?.baseInDisplayCurrency,
-          rate?.appliedAdjustments ?? []
-        );
-        return { line, breakdown };
-      });
-
       setCheckoutClientSecret(paymentIntent.clientSecret ?? '');
       setCheckoutModalData({
         reservationReference: changeBookingReferenceForPaidFlow ?? '',
@@ -5277,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

@@ -3536,19 +3536,15 @@ export function ChangeBookingFlow({
   const displayChangeFlowSubtotal = displayedChangeAmounts.subtotal;
   const displayChangeFlowTax = displayedChangeAmounts.tax;
 
-  /** When quote is confirmed but BE sends no `priceSummaryLines`, we still show FE-built lines while total is quote-driven — reconcile ticket amounts for tax-included currencies. */
-  const selfServeSummaryUsesServerLines =
-    suppressSelfServeCurrencyUi &&
-    selfServePricingConfirmed &&
-    (latestChangeQuote?.serverPreview?.priceSummaryLines?.length ?? 0) > 0;
-
+  /**
+   * Tax-included: scale ticket row $ to match quote/display total. We **always** reconcile after lines are chosen
+   * (including when lines come from `serverPreview.priceSummaryLines`) — server ticket row amounts can still disagree
+   * with `serverDisplay.total` on EUR inclusive pricing.
+   */
   const taxIncludedSelfServeReconciledPriceSummaryLines = useMemo(() => {
     if (!isTaxIncludedInPrice || !originalReceipt || !isCustomerSelfServeChange) {
       return checkoutPriceSummaryLinesForCheckout;
     }
-    if (selfServeSummaryUsesServerLines) {
-      return checkoutPriceSummaryLinesForCheckout;
-    }
     return reconcileTaxIncludedChangeFlowTicketLines(
       checkoutPriceSummaryLinesForCheckout,
       displayChangeFlowProposedTotal,
@@ -3558,12 +3554,35 @@ export function ChangeBookingFlow({
     isTaxIncludedInPrice,
     originalReceipt,
     isCustomerSelfServeChange,
-    selfServeSummaryUsesServerLines,
     checkoutPriceSummaryLinesForCheckout,
     displayChangeFlowProposedTotal,
     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.
@@ -4552,17 +4571,6 @@ export function ChangeBookingFlow({
             })()
           );
 
-      const ticketLinesForModal: CheckoutModalLineItem[] = ticketLineItemsForChangeFlowDisplay.map((line) => {
-        const rate = pricing.find((r) => r.category === line.category);
-        const breakdown = getPriceBreakdown(
-          line.category,
-          rate?.priceCAD ?? 0,
-          rate?.baseInDisplayCurrency,
-          rate?.appliedAdjustments ?? []
-        );
-        return { line, breakdown };
-      });
-
       setCheckoutClientSecret(paymentIntent.clientSecret ?? '');
       setCheckoutModalData({
         reservationReference: changeBookingReferenceForPaidFlow ?? '',
@@ -4586,7 +4594,7 @@ export function ChangeBookingFlow({
                 return `${origin}/manage-booking?ref=${ref}&lastName=${ln}&${fromQ}${intentQ}`;
               })()
             : undefined,
-        ticketLines: ticketLinesForModal,
+        ticketLines: checkoutModalTicketLinesDisplay,
         feeLineItems: feeLineItemsWithAddOns,
         returnPriceAdjustment: checkoutReturnLineAmount,
         cancellationPolicyFee,