@ticketboothapp/booking 1.2.81 → 1.2.83

package/package.json

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

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -61,6 +61,7 @@ import {
   changeFlowTicketLineTotalWithReceiptFloor,
   changeFlowFeeLineTotalWithReceiptFloor,
   changeFlowReturnLineTotalWithReceiptFloor,
+  reconcileTaxIncludedChangeFlowTicketLines,
   type ChangeFlowProtectedReceiptPricing,
   roundMoney,
 } from '../../lib/booking/change-flow-pricing';
@@ -3827,11 +3828,30 @@ 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. */
+  const taxIncludedReconciledCheckoutPriceSummaryLines = useMemo(() => {
+    if (!isTaxIncludedInPrice || !originalReceipt || showProviderPricingInlineEditor) {
+      return editableCheckoutPriceSummaryLines;
+    }
+    return reconcileTaxIncludedChangeFlowTicketLines(
+      editableCheckoutPriceSummaryLines,
+      displayChangeFlowProposedTotalWithEditableLines,
+      effectivePromoDiscountAmount,
+    );
+  }, [
+    isTaxIncludedInPrice,
+    originalReceipt,
+    showProviderPricingInlineEditor,
+    editableCheckoutPriceSummaryLines,
+    displayChangeFlowProposedTotalWithEditableLines,
+    effectivePromoDiscountAmount,
+  ]);
+
   const adminFeAuthoritativeReceipt = useMemo((): AdminFeAuthoritativeReceipt => {
-    const hasTaxLine = editableCheckoutPriceSummaryLines.some(
+    const hasTaxLine = taxIncludedReconciledCheckoutPriceSummaryLines.some(
       (line) => line.kind === 'line' && String(line.type ?? '').toUpperCase() === 'TAX'
     );
-    const lineItems = mapSummaryLinesToFeReceiptLineItems(editableCheckoutPriceSummaryLines);
+    const lineItems = mapSummaryLinesToFeReceiptLineItems(taxIncludedReconciledCheckoutPriceSummaryLines);
     if (!hasTaxLine && Math.abs(displayChangeFlowTax) >= 0.0005) {
       lineItems.push({
         label: t('booking.tax') !== 'booking.tax' ? t('booking.tax') : 'Taxes and fees',
@@ -3854,7 +3874,7 @@ export function AdminChangeBookingFlow({
       lineItems,
     };
   }, [
-    editableCheckoutPriceSummaryLines,
+    taxIncludedReconciledCheckoutPriceSummaryLines,
     displayChangeFlowTax,
     displayChangeFlowSubtotal,
     editableSummaryPreSubtotalDelta,
@@ -5014,8 +5034,11 @@ export function AdminChangeBookingFlow({
             }),
           )
         : totalPrice;
+      const ticketRowsForCheckoutBreakdown = taxIncludedReconciledCheckoutPriceSummaryLines.filter(
+        (l): l is Extract<PriceSummaryLine, { kind: 'ticket' }> => l.kind === 'ticket',
+      );
       const lines = [
-        ...ticketLineItemsForChangeFlowDisplay.map((line) => ({
+        ...ticketRowsForCheckoutBreakdown.map((line) => ({
           label: line.category,
           amount: line.itemTotal,
           type: 'TICKET' as const,
@@ -5158,7 +5181,7 @@ export function AdminChangeBookingFlow({
           availabilityProductOptionId,
           itineraryDisplay: itineraryDisplay ?? undefined,
           clientSecret: paymentIntent.clientSecret ?? '',
-          ticketLinesForModal: ticketLineItemsForChangeFlowDisplay.map((line) => {
+          ticketLinesForModal: ticketRowsForCheckoutBreakdown.map((line) => {
             const rate = pricing.find((r) => r.category === line.category);
             const breakdown = getPriceBreakdown(
               line.category,
@@ -5166,7 +5189,16 @@ export function AdminChangeBookingFlow({
               rate?.baseInDisplayCurrency,
               rate?.appliedAdjustments ?? []
             );
-            return { line, breakdown };
+            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,
+            };
           }),
           feeLineItems: feeLineItemsWithAddOns,
           returnPriceAdjustment: checkoutReturnLineAmount,
@@ -5185,7 +5217,7 @@ export function AdminChangeBookingFlow({
         return;
       }
 
-      const ticketLinesForModal: CheckoutModalLineItem[] = ticketLineItemsForChangeFlowDisplay.map((line) => {
+      const ticketLinesForModal: CheckoutModalLineItem[] = ticketRowsForCheckoutBreakdown.map((line) => {
         const rate = pricing.find((r) => r.category === line.category);
         const breakdown = getPriceBreakdown(
           line.category,
@@ -5193,7 +5225,16 @@ export function AdminChangeBookingFlow({
           rate?.baseInDisplayCurrency,
           rate?.appliedAdjustments ?? []
         );
-        return { line, breakdown };
+        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 ?? '');
@@ -5724,7 +5765,7 @@ export function AdminChangeBookingFlow({
           {selectedAvailability && (
             <>
             <CheckoutForm
-                priceSummaryLines={editableCheckoutPriceSummaryLines}
+                priceSummaryLines={taxIncludedReconciledCheckoutPriceSummaryLines}
                 replacePriceSummary={hasChangeSelection ? selfServeCheckoutPlaceholder : undefined}
                 totalPrice={changeFlowAmountDue}
                 totalSummaryLabel={

package/src/components/booking/ChangeBookingFlow.tsx

@@ -56,6 +56,7 @@ import {
   changeFlowTicketLineTotalWithReceiptFloor,
   changeFlowFeeLineTotalWithReceiptFloor,
   changeFlowReturnLineTotalWithReceiptFloor,
+  reconcileTaxIncludedChangeFlowTicketLines,
   type ChangeFlowProtectedReceiptPricing,
   roundMoney,
 } from '../../lib/booking/change-flow-pricing';
@@ -3535,6 +3536,34 @@ 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;
+
+  const taxIncludedSelfServeReconciledPriceSummaryLines = useMemo(() => {
+    if (!isTaxIncludedInPrice || !originalReceipt || !isCustomerSelfServeChange) {
+      return checkoutPriceSummaryLinesForCheckout;
+    }
+    if (selfServeSummaryUsesServerLines) {
+      return checkoutPriceSummaryLinesForCheckout;
+    }
+    return reconcileTaxIncludedChangeFlowTicketLines(
+      checkoutPriceSummaryLinesForCheckout,
+      displayChangeFlowProposedTotal,
+      effectivePromoDiscountAmount,
+    );
+  }, [
+    isTaxIncludedInPrice,
+    originalReceipt,
+    isCustomerSelfServeChange,
+    selfServeSummaryUsesServerLines,
+    checkoutPriceSummaryLinesForCheckout,
+    displayChangeFlowProposedTotal,
+    effectivePromoDiscountAmount,
+  ]);
+
   const changeFlowClientEstimateDue = (() => {
     if (!originalReceipt) return totalPrice;
     // Customer self-serve: amount due comes from POST .../change/quote (`amountDueCents` / priceDiff), not FE delta math.
@@ -4437,8 +4466,11 @@ 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 = [
-        ...ticketLineItemsForChangeFlowDisplay.map((line) => ({
+        ...ticketRowsForCheckoutBreakdown.map((line) => ({
           label: line.category,
           amount: line.itemTotal,
           type: 'TICKET' as const,
@@ -4523,7 +4555,7 @@ export function ChangeBookingFlow({
             })()
           );
 
-      const ticketLinesForModal: CheckoutModalLineItem[] = ticketLineItemsForChangeFlowDisplay.map((line) => {
+      const ticketLinesForModal: CheckoutModalLineItem[] = ticketRowsForCheckoutBreakdown.map((line) => {
         const rate = pricing.find((r) => r.category === line.category);
         const breakdown = getPriceBreakdown(
           line.category,
@@ -4531,7 +4563,16 @@ export function ChangeBookingFlow({
           rate?.baseInDisplayCurrency,
           rate?.appliedAdjustments ?? []
         );
-        return { line, breakdown };
+        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 ?? '');
@@ -4883,7 +4924,7 @@ export function ChangeBookingFlow({
           {selectedAvailability && (
             <>
             <CheckoutForm
-                priceSummaryLines={checkoutPriceSummaryLinesForCheckout}
+                priceSummaryLines={taxIncludedSelfServeReconciledPriceSummaryLines}
                 replacePriceSummary={selfServeCheckoutPlaceholder}
                 totalPrice={changeFlowAmountDue}
                 totalSummaryLabel={

package/src/lib/booking/change-flow-pricing.ts

@@ -46,6 +46,7 @@
  * **Provider** inline pricing may show a **signed** delta from cart or manual overrides.
  */
 import type { ChangeBookingQuoteResponse } from '../booking-api';
+import type { PriceSummaryLine } from '../../components/booking/PriceSummary';
 import { reconcileChangeBookingProposedTotal } from '../currency';
 
 /** Money in major units, rounded to cents (half-up). */
@@ -301,6 +302,77 @@ export function resolveChangeFlowDisplayedAmounts(input: {
   return { ...input.fromCart };
 }
 
+function isPromoSummaryLine(row: PriceSummaryLine): boolean {
+  if (row.kind !== 'line') return false;
+  const t = String(row.type ?? '').toUpperCase();
+  if (t === 'PROMO_CODE' || t === 'GIFT_CARD' || t === 'DISCOUNT' || t === 'VOUCHER') return true;
+  return row.amount < -0.005 && /promo|discount|voucher|gift/i.test(row.label);
+}
+
+/**
+ * Tax-included currencies (e.g. EUR): ticket rows from catalog + receipt floors can disagree with the
+ * authoritative **new booking total** (quote / display layer). Scale ticket `itemTotal` values so
+ * tickets + non-ticket lines + promo = `targetNewBookingTotal` without changing quantities or non-ticket rows.
+ */
+export function reconcileTaxIncludedChangeFlowTicketLines(
+  lines: PriceSummaryLine[],
+  targetNewBookingTotal: number,
+  promoDiscountAmountIfNotInLines: number,
+): PriceSummaryLine[] {
+  if (!Number.isFinite(targetNewBookingTotal) || lines.length === 0) return lines;
+
+  const ticketIndices: number[] = [];
+  let currentTicketTotal = 0;
+  for (let i = 0; i < lines.length; i++) {
+    const row = lines[i];
+    if (row.kind === 'ticket') {
+      ticketIndices.push(i);
+      currentTicketTotal += row.itemTotal;
+    }
+  }
+  if (ticketIndices.length === 0) return lines;
+
+  let nonTicketSum = 0;
+  let promoLineSum = 0;
+  for (const row of lines) {
+    if (row.kind === 'line') {
+      const t = String(row.type ?? '').toUpperCase();
+      if (t === 'TAX') continue;
+      if (isPromoSummaryLine(row)) {
+        promoLineSum += row.amount;
+        continue;
+      }
+      nonTicketSum += row.amount;
+    }
+  }
+
+  const desiredTicketTotal =
+    Math.abs(promoLineSum) >= 0.005
+      ? roundMoney(targetNewBookingTotal - nonTicketSum - promoLineSum)
+      : roundMoney(
+          targetNewBookingTotal - nonTicketSum + Math.max(0, promoDiscountAmountIfNotInLines),
+        );
+
+  if (currentTicketTotal <= 0 || Math.abs(desiredTicketTotal - currentTicketTotal) < 0.02) {
+    return lines;
+  }
+
+  const scale = desiredTicketTotal / currentTicketTotal;
+  const next = lines.slice() as PriceSummaryLine[];
+  let running = 0;
+  for (let k = 0; k < ticketIndices.length; k++) {
+    const i = ticketIndices[k];
+    const row = next[i] as Extract<PriceSummaryLine, { kind: 'ticket' }>;
+    const isLast = k === ticketIndices.length - 1;
+    const newTotal = isLast
+      ? roundMoney(desiredTicketTotal - running)
+      : roundMoney(row.itemTotal * scale);
+    running += newTotal;
+    next[i] = { ...row, itemTotal: newTotal };
+  }
+  return next;
+}
+
 /**
  * Product: **Main “total owed” number** should not show -0.00 or noise when the balance is effectively zero.
  */