@ticketboothapp/booking 1.2.85 → 1.2.87

package/package.json

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

package/src/components/booking/ChangeBookingFlow.tsx

@@ -142,6 +142,41 @@ function omitZeroAmountPromoDiscountSummaryLines(lines: PriceSummaryLine[]): Pri
   });
 }
 
+/**
+ * `serverPreview.priceSummaryLines` tracks the last quote response; ticket row qty can lag the picker until debounced quote
+ * completes. Align ticket rows to live {@link quantities} and rescale line total proportionally (same idea as admin
+ * `mapSummaryLinesToFeReceiptLineItems`); tax-included reconcile then aligns euros to display total.
+ */
+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;
+}
+
+function mergePickerTicketQtyIntoPriceSummaryLines(
+  lines: PriceSummaryLine[],
+  quantities: Record<string, number>,
+): PriceSummaryLine[] {
+  return lines.map((line) => {
+    if (line.kind !== 'ticket') return line;
+    const uiQty = resolveTicketQtyFromQuantities(line.category, quantities);
+    const lineQty = Math.max(0, Number(line.qty) || 0);
+    const effectiveQty = uiQty != null && uiQty >= 0 ? Math.round(uiQty) : lineQty;
+    let itemTotal = roundMoney(line.itemTotal);
+    if (lineQty > 0 && effectiveQty !== lineQty) {
+      itemTotal = roundMoney((line.itemTotal * effectiveQty) / lineQty);
+    }
+    return { ...line, qty: Math.max(0, effectiveQty), itemTotal };
+  });
+}
+
 function formatTicketLineItemsForSummary(lines: Array<{ category: string; qty: number }>): string {
   const labels: Record<string, string> = {
     ADULT: 'adult',
@@ -2963,7 +2998,10 @@ export function ChangeBookingFlow({
     let raw: PriceSummaryLine[];
     if (suppressSelfServeCurrencyUi && selfServePricingConfirmed) {
       const serverLines = latestChangeQuote?.serverPreview?.priceSummaryLines;
-      raw = serverLines && serverLines.length > 0 ? serverLines : checkoutPriceSummaryLines;
+      raw =
+        serverLines && serverLines.length > 0
+          ? mergePickerTicketQtyIntoPriceSummaryLines(serverLines, quantities)
+          : checkoutPriceSummaryLines;
     } else {
       raw = checkoutPriceSummaryLines;
     }
@@ -2973,6 +3011,7 @@ export function ChangeBookingFlow({
     selfServePricingConfirmed,
     checkoutPriceSummaryLines,
     latestChangeQuote?.serverPreview?.priceSummaryLines,
+    quantities,
   ]);
 
   /** Receipt/server lines already include {@link PriceSummary}'s TAX row — do not also pass `taxAmount` or it duplicates. */
@@ -3536,19 +3575,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,7 +3593,6 @@ export function ChangeBookingFlow({
     isTaxIncludedInPrice,
     originalReceipt,
     isCustomerSelfServeChange,
-    selfServeSummaryUsesServerLines,
     checkoutPriceSummaryLinesForCheckout,
     displayChangeFlowProposedTotal,
     effectivePromoDiscountAmount,