@ticketboothapp/booking 1.2.62 → 1.2.64

package/src/components/booking/BookingFlow.tsx

@@ -1,6 +1,7 @@
 'use client';
 
 import type { BookingFlowProps } from './booking-flow-types';
+import { AdminChangeBookingFlow } from './AdminChangeBookingFlow';
 import { ChangeBookingFlow } from './ChangeBookingFlow';
 import { NewBookingFlow } from './NewBookingFlow';
 
@@ -13,12 +14,15 @@ export type {
 } from './booking-flow-types';
 
 /**
- * Routes to {@link NewBookingFlow} or {@link ChangeBookingFlow} — two duplicated implementations
- * so each flow can be refactored without coupling (no shared runtime core).
+ * Routes to {@link NewBookingFlow}, {@link ChangeBookingFlow}, or {@link AdminChangeBookingFlow}
+ * — duplicated implementations so each flow can be refactored without coupling (no shared runtime core).
  */
 export function BookingFlow(props: BookingFlowProps) {
   if (props.mode === 'change') {
-    const { mode: _mode, ...changeProps } = props;
+    const { mode: _mode, useAdminChangeBookingFlow, ...changeProps } = props;
+    if (useAdminChangeBookingFlow) {
+      return <AdminChangeBookingFlow {...changeProps} />;
+    }
     return <ChangeBookingFlow {...changeProps} />;
   }
   const { mode: _mode, ...newProps } = props;

package/src/components/booking/ChangeBookingFlow.tsx

@@ -64,10 +64,11 @@ import {
 } from '../../lib/booking/change-flow-pricing';
 import {
   mergePriceSummaryLinesForDrift,
+  mergeLineComparisonsWithFullDrift,
   normalizePricingDriftDetailFromQuote,
   normalizeTicketPricingTraceFromQuote,
   sumPriceSummaryLinesMajorUnits,
-  enrichLineComparisonsWithMergedRows,
+  computePricingDriftDelta,
 } from '../../lib/booking/change-booking-pricing-drift';
 import { ChangeBookingPricingDriftPanel } from './ChangeBookingPricingDriftPanel';
 import {
@@ -3229,7 +3230,45 @@ export function ChangeBookingFlow({
 
     const clientMappedFromApi = mapQuoteLineItemsToPriceSummaryLines(api?.clientLineItems);
     const useBeClientLines = clientMappedFromApi.length > 0;
-    const clientLinesForMerge = useBeClientLines ? clientMappedFromApi : checkoutPriceSummaryLines;
+    /**
+     * Checkout passes tax/discount via PriceSummary props, not always as `priceSummaryLines`. Include them here so
+     * drift rows and their sums align with `changeFlowNewBookingTotal` (subtotal + tax − promo).
+     */
+    const clientLinesForMerge: PriceSummaryLine[] = (() => {
+      if (useBeClientLines) return clientMappedFromApi;
+      const lines: PriceSummaryLine[] = [...checkoutPriceSummaryLines];
+      const hasTaxLine = lines.some(
+        (l) => l.kind === 'line' && String(l.type ?? '').toUpperCase() === 'TAX',
+      );
+      if (!hasTaxLine && !isTaxIncludedInPrice && Math.abs(effectiveTax) >= 0.005) {
+        lines.push({
+          kind: 'line',
+          label: t('booking.tax') !== 'booking.tax' ? t('booking.tax') : 'Taxes and fees',
+          amount: effectiveTax,
+          type: 'TAX',
+        });
+      }
+      const hasPromoSummaryLine = lines.some(
+        (l) =>
+          l.kind === 'line' &&
+          (/PROMO|DISCOUNT|VOUCHER|GIFT/i.test(String(l.type ?? '')) ||
+            (l.amount < -0.005 && /promo|discount/i.test(l.label))),
+      );
+      if (!hasPromoSummaryLine && Math.abs(effectivePromoDiscountAmount) >= 0.005) {
+        const trimmedPromoCode = appliedPromoCode?.trim() ?? '';
+        const promoLabel =
+          trimmedPromoCode.length > 0
+            ? `Promo: ${trimmedPromoCode}`
+            : originalReceipt?.promoLabel?.trim() || 'Discount';
+        lines.push({
+          kind: 'line',
+          label: promoLabel,
+          amount: -effectivePromoDiscountAmount,
+          type: 'PROMO_CODE',
+        });
+      }
+      return lines;
+    })();
 
     const serverMappedFromApi = mapQuoteLineItemsToPriceSummaryLines(api?.serverLineItems);
     const useBeServerLines = serverMappedFromApi.length > 0;
@@ -3273,14 +3312,35 @@ export function ChangeBookingFlow({
     }
 
     const mergedForDrift = mergePriceSummaryLinesForDrift(clientLinesForMerge, serverLinesForMerge);
-    let rows =
+    const rows =
       api?.lineComparisons && api.lineComparisons.length > 0
-        ? enrichLineComparisonsWithMergedRows(api.lineComparisons, mergedForDrift)
+        ? mergeLineComparisonsWithFullDrift(api.lineComparisons, mergedForDrift)
         : mergedForDrift;
 
+    const receiptAnchoring = api?.receiptAnchoring;
+    let driftRows = rows;
+    if (receiptAnchoring) {
+      const adj = roundMoney(
+        receiptAnchoring.reconciledTotalMajorUnits -
+          receiptAnchoring.requestedCatalogLineSumMajorUnits,
+      );
+      if (Math.abs(adj) >= 0.005) {
+        driftRows = [
+          ...rows,
+          {
+            key: 'meta:receipt-anchoring',
+            label: 'Receipt anchoring adjustment (BE only — not included in app total)',
+            clientAmount: null,
+            serverAmount: adj,
+            delta: computePricingDriftDelta(null, adj),
+          },
+        ];
+      }
+    }
+
     const hasTotalDelta = totalDelta != null && Math.abs(totalDelta) >= 0.005;
 
-    if (rows.length === 0 && !hasTotalDelta) {
+    if (driftRows.length === 0 && !hasTotalDelta) {
       return null;
     }
 
@@ -3309,7 +3369,7 @@ export function ChangeBookingFlow({
 
     return (
       <ChangeBookingPricingDriftPanel
-        rows={rows}
+        rows={driftRows}
         clientTotal={clientTotalForDrift}
         serverTotal={serverTotalFromQuote}
         totalDelta={totalDelta}
@@ -3317,6 +3377,7 @@ export function ChangeBookingFlow({
         locale={locale}
         ticketCartDetail={ticketCartDetail.length > 0 ? ticketCartDetail : undefined}
         serverTicketPricingTrace={latestChangeQuote.ticketPricingTrace ?? undefined}
+        receiptAnchoring={receiptAnchoring}
         footnote={
           usesBeLinePayload
             ? 'Lines use pricingDriftDetail.clientLineItems / serverLineItems when the quote includes them; totals prefer explicit major-unit fields, then sums of those lines, then the live cart / receipt preview.'
@@ -3335,6 +3396,12 @@ export function ChangeBookingFlow({
     locale,
     ticketLineItemsForChangeFlowDisplay,
     pricingForTicketSelector,
+    isTaxIncludedInPrice,
+    effectiveTax,
+    effectivePromoDiscountAmount,
+    appliedPromoCode,
+    originalReceipt?.promoLabel,
+    t,
   ]);
 
   /** Replaces PriceSummary with non-numeric status until quote returns authoritative totals (no FE dollar amounts). */

package/src/components/booking/ChangeBookingPricingDriftPanel.tsx

@@ -4,7 +4,10 @@ import type { ReactNode } from 'react';
 import { formatCurrencyAmount } from '../../lib/currency';
 import { roundMoney } from '../../lib/booking/change-flow-pricing';
 import type { ChangeBookingPricingDriftRow } from '../../lib/booking/change-booking-pricing-drift';
-import type { ChangeBookingQuoteTicketPricingTrace } from '../../lib/booking-api';
+import type {
+  ChangeBookingQuoteReceiptAnchoringBreakdown,
+  ChangeBookingQuoteTicketPricingTrace,
+} from '../../lib/booking-api';
 import type { Currency } from './CurrencySwitcher';
 import type { Locale } from '../../lib/booking/i18n/config';
 
@@ -41,6 +44,8 @@ export function ChangeBookingPricingDriftPanel(props: {
   ticketCartDetail?: ChangeBookingDriftTicketCartRow[];
   /** Optional BE snapshot: locked vs live units and Rule A/B branch (when API sends `ticketPricingTrace`). */
   serverTicketPricingTrace?: ChangeBookingQuoteTicketPricingTrace | null;
+  /** BE breakdown for reconciled total vs sum(lines) (same-parent receipt anchoring). */
+  receiptAnchoring?: ChangeBookingQuoteReceiptAnchoringBreakdown | null;
 }): ReactNode {
   const {
     rows,
@@ -53,6 +58,7 @@ export function ChangeBookingPricingDriftPanel(props: {
     footnote,
     ticketCartDetail,
     serverTicketPricingTrace,
+    receiptAnchoring,
   } = props;
 
   const showTotals =
@@ -61,10 +67,35 @@ export function ChangeBookingPricingDriftPanel(props: {
     totalDelta != null &&
     Math.abs(totalDelta) >= 0.005;
 
-  if (rows.length === 0 && !showTotals) return null;
-
   const showTicketCols = rows.some((r) => r.key.startsWith('ticket:'));
 
+  const sumClientDisp = roundMoney(rows.reduce((acc, r) => acc + (r.clientAmount ?? 0), 0));
+  const sumServerDisp = roundMoney(rows.reduce((acc, r) => acc + (r.serverAmount ?? 0), 0));
+  const resClient =
+    clientTotal != null && Number.isFinite(clientTotal) ? roundMoney(clientTotal - sumClientDisp) : null;
+  const resServer =
+    serverTotal != null && Number.isFinite(serverTotal) ? roundMoney(serverTotal - sumServerDisp) : null;
+  const showResidual =
+    showTotals &&
+    ((resClient != null && Math.abs(resClient) >= 0.02) || (resServer != null && Math.abs(resServer) >= 0.02));
+
+  const anchoringMeta = receiptAnchoring
+    ? (() => {
+        const {
+          persistedReceiptTotalMajorUnits: receipt,
+          baselineCatalogTotalMajorUnits: baseline,
+          requestedCatalogLineSumMajorUnits: requestedSum,
+          reconciledTotalMajorUnits: reconciled,
+        } = receiptAnchoring;
+        const catalogDelta = roundMoney(requestedSum - baseline);
+        const carryGap = roundMoney(receipt - baseline);
+        const anchoringAdj = roundMoney(reconciled - requestedSum);
+        return { receipt, baseline, requestedSum, reconciled, catalogDelta, carryGap, anchoringAdj };
+      })()
+    : null;
+
+  if (rows.length === 0 && !showTotals) return null;
+
   function unitFmt(amount: number | null | undefined, qty: number | null | undefined): string {
     if (amount == null || qty == null || qty <= 0 || !Number.isFinite(amount)) return '—';
     return fmt(roundMoney(amount / qty), currency, locale);
@@ -73,6 +104,65 @@ export function ChangeBookingPricingDriftPanel(props: {
   return (
     <div className="mt-3 rounded-lg border border-stone-200 bg-white px-3 py-2 text-sm shadow-sm">
       <div className="mb-2 font-medium text-stone-800">{title}</div>
+      {anchoringMeta ? (
+        <div className="mb-4 rounded-md border border-violet-200 bg-violet-50/90 px-2.5 py-2 text-[11px] leading-snug text-stone-900">
+          <div className="mb-1.5 text-xs font-semibold text-violet-950">
+            Receipt anchoring (diagnostic — not used for the quote price check)
+          </div>
+          <p className="mb-2 text-[10px] leading-snug text-stone-700">
+            The live quote compares your cart to the <span className="font-semibold">catalog line sum</span> (same as
+            the table above). Values below are the legacy receipt−baseline formula kept for debugging when persisted
+            receipt and baseline catalog differ.
+          </p>
+          <p className="mb-2 font-mono text-[10px] leading-relaxed text-stone-800">
+            legacyReconciled = persistedReceipt + (requestedCatalogLineSum − baselineCatalog)
+          </p>
+          <div className="overflow-x-auto">
+            <table className="w-full min-w-[340px] border-collapse text-left text-[11px]">
+              <thead>
+                <tr className="border-b border-violet-200 text-[10px] uppercase tracking-wide text-violet-900/80">
+                  <th className="py-1 pr-2 font-medium">Term</th>
+                  <th className="py-1 text-right font-medium">Amount</th>
+                </tr>
+              </thead>
+              <tbody className="tabular-nums text-stone-800">
+                <tr className="border-t border-violet-100">
+                  <td className="py-1 pr-2">Persisted receipt total (booking on file)</td>
+                  <td className="py-1 text-right">{fmt(anchoringMeta.receipt, currency, locale)}</td>
+                </tr>
+                <tr className="border-t border-violet-100">
+                  <td className="py-1 pr-2">Baseline catalog total (current itinerary re-priced)</td>
+                  <td className="py-1 text-right">{fmt(anchoringMeta.baseline, currency, locale)}</td>
+                </tr>
+                <tr className="border-t border-violet-100">
+                  <td className="py-1 pr-2">Carry gap (receipt − baseline)</td>
+                  <td className="py-1 text-right">{fmt(anchoringMeta.carryGap, currency, locale)}</td>
+                </tr>
+                <tr className="border-t border-violet-100">
+                  <td className="py-1 pr-2">Requested change — catalog line sum (table above)</td>
+                  <td className="py-1 text-right">{fmt(anchoringMeta.requestedSum, currency, locale)}</td>
+                </tr>
+                <tr className="border-t border-violet-100">
+                  <td className="py-1 pr-2">Catalog delta (requestedSum − baseline)</td>
+                  <td className="py-1 text-right">{fmt(anchoringMeta.catalogDelta, currency, locale)}</td>
+                </tr>
+                <tr className="border-t border-violet-100 font-semibold text-violet-950">
+                  <td className="py-1 pr-2">Legacy reconciled total (old anchoring; not the price check)</td>
+                  <td className="py-1 text-right">{fmt(anchoringMeta.reconciled, currency, locale)}</td>
+                </tr>
+                <tr className="border-t border-violet-100 text-stone-700">
+                  <td className="py-1 pr-2">Legacy − catalog sum (would have changed the total by)</td>
+                  <td className="py-1 text-right">{fmt(anchoringMeta.anchoringAdj, currency, locale)}</td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+          <p className="mt-2 text-[10px] leading-snug text-stone-700">
+            <span className="font-semibold text-stone-900">Price check today:</span> server uses the same catalog line
+            sum as this table. The figures above are only for investigating historical receipt-vs-baseline gaps.
+          </p>
+        </div>
+      ) : null}
       <div className="mb-3 rounded-md border border-sky-100 bg-sky-50/80 px-2.5 py-2 text-[11px] leading-snug text-stone-800">
         <span className="font-semibold text-stone-900">Why these differ — </span>
         List = catalog for this slot; effective = per-seat charge after change rules (floors, date/option). When the API
@@ -238,6 +328,36 @@ export function ChangeBookingPricingDriftPanel(props: {
                 </tr>
               );
             })}
+            {showResidual ? (
+              <tr className="border-t border-stone-200 bg-violet-50/90 text-[11px] text-violet-950">
+                <td
+                  className="py-1.5 pr-2 align-top"
+                  title="Per column: footer total minus sum of line amounts above. This row’s Δ = (In app residual) − (Server residual). When In app residual is ~0, that Δ often equals the booking total Δ, but it is not the same quantity by definition."
+                >
+                  Residual (footer − sum of lines)
+                </td>
+                {showTicketCols ? (
+                  <>
+                    <td className="py-1.5 pr-2" />
+                    <td className="py-1.5 pr-2" />
+                    <td className="py-1.5 pr-2" />
+                  </>
+                ) : null}
+                <td className="py-1.5 pr-2 text-right tabular-nums font-medium">
+                  {fmt(resClient, currency, locale)}
+                </td>
+                <td className="py-1.5 pr-2 text-right tabular-nums font-medium">
+                  {fmt(resServer, currency, locale)}
+                </td>
+                <td className="py-1.5 text-right tabular-nums font-medium text-violet-950">
+                  {fmt(
+                    resClient != null && resServer != null ? roundMoney(resClient - resServer) : null,
+                    currency,
+                    locale,
+                  )}
+                </td>
+              </tr>
+            ) : null}
             {showTotals ? (
               <tr className="border-t-2 border-stone-300 bg-stone-50 font-semibold text-stone-900">
                 <td className="py-2 pr-2">New booking total</td>
@@ -257,8 +377,13 @@ export function ChangeBookingPricingDriftPanel(props: {
         </table>
       </div>
       <p className="mt-2 text-[11px] leading-snug text-stone-500">
-        Δ is <span className="font-medium">in app minus server</span>. Rows highlighted when the difference is at least
-        one cent.
+        Δ is <span className="font-medium">in app minus server</span>. A blank in-app or server cell counts as{' '}
+        <span className="font-medium">$0</span> for that row’s Δ so server-only (or app-only) lines still show how they
+        move the totals. Rows highlight when |Δ| ≥ 1¢.         If “Residual” appears, the summed lines do not yet match that
+        column’s footer (rounding, duplicate line keys from the API, or rows not mapped). When a{' '}
+        <span className="font-medium">Receipt anchoring adjustment</span> row is present, include it in the sum — the
+        server footer should then match. The booking total Δ is always the “New booking total” row, not the residual
+        cells alone.
       </p>
       {footnote ? (
         <p className="mt-1 text-[11px] leading-snug text-stone-600">{footnote}</p>

package/src/components/booking/booking-flow-types.ts

@@ -132,6 +132,11 @@ export interface ChangeBookingFlowProps extends BookingFlowBaseProps {
    * quote and payment (`quoteChangeBooking`, Stripe).
    */
   onChangeBooking?: (data: ProviderDashboardChangeBookingPayload) => Promise<void>;
+  /**
+   * Provider dashboard only: {@link BookingFlow} renders {@link AdminChangeBookingFlow} instead of
+   * {@link ChangeBookingFlow}. Same UI/behavior until admin-specific tweaks are added.
+   */
+  useAdminChangeBookingFlow?: boolean;
 }
 
 /**

package/src/index.ts

@@ -15,6 +15,7 @@ export {
 export { BookingFlow } from './components/booking/BookingFlow';
 export { NewBookingFlow } from './components/booking/NewBookingFlow';
 export { ChangeBookingFlow } from './components/booking/ChangeBookingFlow';
+export { AdminChangeBookingFlow } from './components/booking/AdminChangeBookingFlow';
 export type {
   BookingFlowBaseProps,
   BookingFlowProps,

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

@@ -2,6 +2,7 @@ import type { PriceSummaryLine } from '../../components/booking/PriceSummary';
 import type {
   ChangeBookingQuotePricingDriftDetail,
   ChangeBookingQuotePricingDriftLine,
+  ChangeBookingQuoteReceiptAnchoringBreakdown,
   ChangeBookingQuoteResponse,
   ChangeBookingQuoteTicketLineTrace,
   ChangeBookingQuoteTicketPricingTrace,
@@ -15,7 +16,7 @@ export interface ChangeBookingPricingDriftRow {
   clientAmount: number | null;
   /** Amount from the server price check (major units). */
   serverAmount: number | null;
-  /** client − server when both present. */
+  /** client − server; missing side treated as 0 so asymmetric rows still explain total drift. */
   delta: number | null;
   /** Ticket qty when row resolved to a ticket category (for unit math in UI). */
   clientQty?: number | null;
@@ -69,6 +70,29 @@ export function canonicalDriftKey(line: PriceSummaryLine): string {
   }
 
   const lab = normalizeDriftLabelKey(line.label);
+  const lowerRaw = labRaw.toLowerCase();
+
+  /**
+   * Receipts often use `FEE` / `LINE` for rows the app models as `cancellation` or `TAX`. Without this, drift merge
+   * creates duplicate “Flexible cancellation” / tax rows and the residual row misleads.
+   */
+  if (
+    type.includes('CANCELLATION') ||
+    type === 'CANCELLATION' ||
+    (/\bcancellation\b/i.test(labRaw) &&
+      !/moraine|parks|occupation|license|road\s*access|access\s*fee/i.test(lowerRaw))
+  ) {
+    return `line:CANCELLATION:${lab}`;
+  }
+
+  if (
+    type === 'TAX' ||
+    type.includes('TAX') ||
+    (/\btax(es)?\b|\bgst\b|\bhst\b|\bpst\b|\bvat\b/i.test(labRaw) && !/included/i.test(lowerRaw))
+  ) {
+    return `line:TAX:${lab}`;
+  }
+
   return `line:${type}:${lab}`;
 }
 
@@ -92,6 +116,20 @@ export function sumPriceSummaryLinesMajorUnits(lines: PriceSummaryLine[]): numbe
   return roundMoney(s);
 }
 
+/**
+ * Per-row drift for the debugger: treat a missing side as 0 so e.g. server-only tax still shows Δ = 0 − server.
+ * Returns null only when both inputs are null/undefined.
+ */
+export function computePricingDriftDelta(
+  clientAmount: number | null | undefined,
+  serverAmount: number | null | undefined,
+): number | null {
+  if (clientAmount == null && serverAmount == null) return null;
+  const c = clientAmount != null && Number.isFinite(Number(clientAmount)) ? Number(clientAmount) : 0;
+  const s = serverAmount != null && Number.isFinite(Number(serverAmount)) ? Number(serverAmount) : 0;
+  return roundMoney(c - s);
+}
+
 function num(v: unknown): number | undefined {
   if (v == null || v === '') return undefined;
   const n = Number(v);
@@ -130,6 +168,24 @@ export function normalizePricingDriftDetailFromQuote(
         })
       : undefined;
 
+  const raRaw = n.receiptAnchoring ?? n.receipt_anchoring;
+  let receiptAnchoring: ChangeBookingQuoteReceiptAnchoringBreakdown | undefined;
+  if (raRaw && typeof raRaw === 'object' && !Array.isArray(raRaw)) {
+    const ra = raRaw as Record<string, unknown>;
+    const pr = num(ra.persistedReceiptTotalMajorUnits ?? ra.persisted_receipt_total_major_units);
+    const bl = num(ra.baselineCatalogTotalMajorUnits ?? ra.baseline_catalog_total_major_units);
+    const rq = num(ra.requestedCatalogLineSumMajorUnits ?? ra.requested_catalog_line_sum_major_units);
+    const rc = num(ra.reconciledTotalMajorUnits ?? ra.reconciled_total_major_units);
+    if (pr != null && bl != null && rq != null && rc != null) {
+      receiptAnchoring = {
+        persistedReceiptTotalMajorUnits: pr,
+        baselineCatalogTotalMajorUnits: bl,
+        requestedCatalogLineSumMajorUnits: rq,
+        reconciledTotalMajorUnits: rc,
+      };
+    }
+  }
+
   const out: ChangeBookingQuotePricingDriftDetail = {
     clientTotalMajorUnits: num(n.clientTotalMajorUnits ?? n.client_total_major_units),
     serverTotalMajorUnits: num(n.serverTotalMajorUnits ?? n.server_total_major_units),
@@ -137,6 +193,7 @@ export function normalizePricingDriftDetailFromQuote(
     lineComparisons,
     serverLineItems: rawLines(n.serverLineItems ?? n.server_line_items),
     clientLineItems: rawLines(n.clientLineItems ?? n.client_line_items),
+    receiptAnchoring,
   };
 
   if (
@@ -145,7 +202,8 @@ export function normalizePricingDriftDetailFromQuote(
     out.deltaMajorUnits == null &&
     !out.lineComparisons?.length &&
     !out.serverLineItems?.length &&
-    !out.clientLineItems?.length
+    !out.clientLineItems?.length &&
+    !out.receiptAnchoring
   ) {
     return undefined;
   }
@@ -245,10 +303,7 @@ export function mergePriceSummaryLinesForDrift(
     const clientAmount = c?.amount ?? null;
     const serverAmount = s?.amount ?? null;
     const label = c?.label ?? s?.label ?? key;
-    let delta: number | null = null;
-    if (clientAmount != null && serverAmount != null) {
-      delta = roundMoney(clientAmount - serverAmount);
-    }
+    const delta = computePricingDriftDelta(clientAmount, serverAmount);
     const clientQty = c?.qty ?? null;
     const serverQty = s?.qty ?? null;
     rows.push({
@@ -279,6 +334,16 @@ function findMergedRowForApiLabel(
   hit = mergedRows.find((r) => normalizeDriftLabelKey(r.label) === norm);
   if (hit) return hit;
 
+  /** Substring match on normalized labels (e.g. BE "Taxes and fees" vs FE i18n). Guard short norms to reduce false positives. */
+  if (norm.length >= 5) {
+    hit = mergedRows.find((r) => {
+      const rn = normalizeDriftLabelKey(r.label);
+      if (!rn) return false;
+      return rn === norm || rn.includes(norm) || norm.includes(rn);
+    });
+    if (hit) return hit;
+  }
+
   /** Return rows: BE label is often English "Return option (N people)" while the app may use i18n. */
   if (/\breturn\b/i.test(trimmed) || norm.includes('return')) {
     hit = mergedRows.find(
@@ -290,6 +355,38 @@ function findMergedRowForApiLabel(
     if (hit) return hit;
   }
 
+  /** Tax / GST / HST — receipt type TAX or label wording. */
+  if (/\btax(es)?\b|\bgst\b|\bhst\b|\bpst\b|\bvat\b/i.test(trimmed) || norm.includes('tax')) {
+    hit = mergedRows.find(
+      (r) =>
+        r.key.startsWith('line:TAX') ||
+        String(r.key).includes(':TAX:') ||
+        /\btax(es)?\b|\bgst\b|\bhst\b/i.test(r.label),
+    );
+    if (hit) return hit;
+  }
+
+  /** Promo, discount, voucher — align BE "Promo: CODE" with FE discount rows. */
+  if (/promo|discount|voucher|gift\s*card/i.test(trimmed)) {
+    hit = mergedRows.find(
+      (r) =>
+        /promo|discount|voucher|gift/i.test(r.label) ||
+        /PROMO|DISCOUNT|VOUCHER|GIFT/i.test(r.key),
+    );
+    if (hit) return hit;
+  }
+
+  /** Cancellation / flexible upgrade lines. */
+  if (/cancellation|flexible|upgrade policy|policy fee/i.test(trimmed)) {
+    hit = mergedRows.find(
+      (r) =>
+        r.key.includes('CANCELLATION') ||
+        /cancellation|flexible/i.test(r.label) ||
+        String(r.key).includes(':cancellation:'),
+    );
+    if (hit) return hit;
+  }
+
   for (const cat of TICKET_CATEGORY_WORDS) {
     if (upper === cat || upper.startsWith(`${cat} `) || new RegExp(`\\b${cat}\\b`, 'i').test(trimmed)) {
       hit = mergedRows.find((r) => r.key === `ticket:${cat}`);
@@ -316,10 +413,9 @@ export function enrichLineComparisonsWithMergedRows(
       line.serverAmountMajorUnits != null && Number.isFinite(Number(line.serverAmountMajorUnits))
         ? Number(line.serverAmountMajorUnits)
         : base?.serverAmount ?? null;
-    const delta =
-      clientAmount != null && serverAmount != null ? roundMoney(clientAmount - serverAmount) : null;
+    const delta = computePricingDriftDelta(clientAmount, serverAmount);
     return {
-      key: `api-line:${i}`,
+      key: base?.key ?? `api-line:${i}`,
       label: line.label,
       clientAmount,
       serverAmount,
@@ -329,3 +425,55 @@ export function enrichLineComparisonsWithMergedRows(
     };
   });
 }
+
+/**
+ * When the quote sends `lineComparisons`, keep that ordering for matched rows, then append any
+ * {@link mergePriceSummaryLinesForDrift} rows the API omitted so the table can reconcile to footer totals.
+ */
+export function mergeLineComparisonsWithFullDrift(
+  apiLines: ChangeBookingQuotePricingDriftLine[] | undefined,
+  mergedRows: ChangeBookingPricingDriftRow[],
+): ChangeBookingPricingDriftRow[] {
+  if (!apiLines?.length) return mergedRows;
+
+  const consumedMergedKeys = new Set<string>();
+  const out: ChangeBookingPricingDriftRow[] = [];
+  const usedRowKeys = new Map<string, number>();
+
+  for (let i = 0; i < apiLines.length; i++) {
+    const line = apiLines[i];
+    const base = findMergedRowForApiLabel(mergedRows, line.label);
+    if (base) consumedMergedKeys.add(base.key);
+
+    const clientAmount =
+      line.clientAmountMajorUnits != null && Number.isFinite(Number(line.clientAmountMajorUnits))
+        ? Number(line.clientAmountMajorUnits)
+        : base?.clientAmount ?? null;
+    const serverAmount =
+      line.serverAmountMajorUnits != null && Number.isFinite(Number(line.serverAmountMajorUnits))
+        ? Number(line.serverAmountMajorUnits)
+        : base?.serverAmount ?? null;
+    const delta = computePricingDriftDelta(clientAmount, serverAmount);
+    const rawKey = base?.key ?? `api-line:${i}`;
+    const n = (usedRowKeys.get(rawKey) ?? 0) + 1;
+    usedRowKeys.set(rawKey, n);
+    const rowKey = n === 1 ? rawKey : `${rawKey}#${n}`;
+    out.push({
+      key: rowKey,
+      label: line.label,
+      clientAmount,
+      serverAmount,
+      delta,
+      clientQty: base?.clientQty ?? undefined,
+      serverQty: base?.serverQty ?? undefined,
+    });
+  }
+
+  for (const m of mergedRows) {
+    if (!consumedMergedKeys.has(m.key)) {
+      out.push(m);
+    }
+  }
+
+  return out;
+}

package/src/lib/booking-api.ts

@@ -874,6 +874,21 @@ export type ChangeBookingQuotePricingDriftReceiptLine = {
   quantity?: number;
 };
 
+/**
+ * Optional diagnostic: legacy receipt-anchored total vs catalog line sum (same-parent, settled receipt).
+ * Public quote **price check** uses `requestedCatalogLineSum` only; `reconciledTotalMajorUnits` is the old formula.
+ * reconciledTotal = persistedReceipt + (requestedCatalogLineSum − baselineCatalog).
+ */
+export interface ChangeBookingQuoteReceiptAnchoringBreakdown {
+  persistedReceiptTotalMajorUnits: number;
+  /** Catalog recompute for the booking’s current stored itinerary (party, option, date, return, add-ons). */
+  baselineCatalogTotalMajorUnits: number;
+  /** Sum of proposed receipt lines for the requested change (Rule A/B); this is what the price check uses. */
+  requestedCatalogLineSumMajorUnits: number;
+  /** Legacy receipt-anchored total (not used for `clientProposedTotal` verification). */
+  reconciledTotalMajorUnits: number;
+}
+
 export interface ChangeBookingQuotePricingDriftDetail {
   /** Mirror of the client-sent proposed total (major units). */
   clientTotalMajorUnits?: number;
@@ -893,6 +908,8 @@ export interface ChangeBookingQuotePricingDriftDetail {
    * When set, drift “In app” column uses this instead of the live FE checkout breakdown.
    */
   clientLineItems?: ChangeBookingQuotePricingDriftReceiptLine[];
+  /** When BE applies receipt anchoring on same parent product (settled receipt + baseline catalog). */
+  receiptAnchoring?: ChangeBookingQuoteReceiptAnchoringBreakdown;
 }
 
 /** BE ticket-line recipe for debugging drift vs FE change rules (optional on quote responses). */