@ticketboothapp/booking 1.2.83 → 1.2.84

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ticketboothapp/booking",
-  "version": "1.2.83",
+  "version": "1.2.84",
   "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;
@@ -3851,7 +3876,10 @@ export function AdminChangeBookingFlow({
     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 +3903,7 @@ export function AdminChangeBookingFlow({
     };
   }, [
     taxIncludedReconciledCheckoutPriceSummaryLines,
+    quantities,
     displayChangeFlowTax,
     displayChangeFlowSubtotal,
     editableSummaryPreSubtotalDelta,
@@ -5034,11 +5063,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,7 +5207,7 @@ export function AdminChangeBookingFlow({
           availabilityProductOptionId,
           itineraryDisplay: itineraryDisplay ?? undefined,
           clientSecret: paymentIntent.clientSecret ?? '',
-          ticketLinesForModal: ticketRowsForCheckoutBreakdown.map((line) => {
+          ticketLinesForModal: ticketLineItemsForChangeFlowDisplay.map((line) => {
             const rate = pricing.find((r) => r.category === line.category);
             const breakdown = getPriceBreakdown(
               line.category,
@@ -5189,16 +5215,7 @@ export function AdminChangeBookingFlow({
               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,
-            };
+            return { line, breakdown };
           }),
           feeLineItems: feeLineItemsWithAddOns,
           returnPriceAdjustment: checkoutReturnLineAmount,
@@ -5217,7 +5234,7 @@ export function AdminChangeBookingFlow({
         return;
       }
 
-      const ticketLinesForModal: CheckoutModalLineItem[] = ticketRowsForCheckoutBreakdown.map((line) => {
+      const ticketLinesForModal: CheckoutModalLineItem[] = ticketLineItemsForChangeFlowDisplay.map((line) => {
         const rate = pricing.find((r) => r.category === line.category);
         const breakdown = getPriceBreakdown(
           line.category,
@@ -5225,16 +5242,7 @@ export function AdminChangeBookingFlow({
           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,
-        };
+        return { line, breakdown };
       });
 
       setCheckoutClientSecret(paymentIntent.clientSecret ?? '');

package/src/components/booking/ChangeBookingFlow.tsx

@@ -4466,11 +4466,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,7 +4552,7 @@ export function ChangeBookingFlow({
             })()
           );
 
-      const ticketLinesForModal: CheckoutModalLineItem[] = ticketRowsForCheckoutBreakdown.map((line) => {
+      const ticketLinesForModal: CheckoutModalLineItem[] = ticketLineItemsForChangeFlowDisplay.map((line) => {
         const rate = pricing.find((r) => r.category === line.category);
         const breakdown = getPriceBreakdown(
           line.category,
@@ -4563,16 +4560,7 @@ export function ChangeBookingFlow({
           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,
-        };
+        return { line, breakdown };
       });
 
       setCheckoutClientSecret(paymentIntent.clientSecret ?? '');