@ticketboothapp/booking 1.2.138 → 1.2.140

package/package.json

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

package/src/components/booking/AdminChangeReceiptComparison.tsx

@@ -84,12 +84,17 @@ function amendmentDeltaLines(
 
   return proposedLines.flatMap((line): PriceSummaryLine[] => {
     const original = remainingOriginal.get(lineIdentity(line));
-    const amount = roundMoney(lineAmount(line) - (original?.amount ?? 0));
     const proposedQuantity = lineQuantity(line);
     const quantity =
       proposedQuantity == null && original?.quantity == null
         ? null
         : (proposedQuantity ?? 0) - (original?.quantity ?? 0);
+    const proposedAmount = lineAmount(line);
+    const amount = roundMoney(
+      quantity != null && quantity > 0 && proposedQuantity != null && proposedQuantity > 0
+        ? (proposedAmount / proposedQuantity) * quantity
+        : proposedAmount - (original?.amount ?? 0),
+    );
     if (Math.abs(amount) < 0.005 && (quantity == null || quantity === 0)) return [];
 
     if (line.kind === 'ticket') {
@@ -104,7 +109,9 @@ function amendmentDeltaLines(
     const isTax = String(line.type ?? '').toUpperCase() === 'TAX';
     return [{
       ...line,
-      label: isTax ? (amount >= 0 ? 'Additional tax' : 'Tax reduction') : line.label,
+      label: isTax
+        ? (amount >= 0 ? 'Additional tax' : 'Tax reduction')
+        : line.label.replace(/\s*\([^)]*(?:people|person|x\s*\d+)[^)]*\)\s*$/i, '').trim(),
       amount,
       quantity: quantity == null ? null : Math.abs(quantity),
       editable: false,
@@ -117,8 +124,6 @@ export function AdminChangeReceiptComparison({
   originalReceipt,
   newReceipt,
   newPriceSummaryLines,
-  newPriceSummaryLinesIncludeTaxRow,
-  amountDue,
   amountDueLabel,
   currency,
   locale,
@@ -136,7 +141,20 @@ export function AdminChangeReceiptComparison({
     () => amendmentDeltaLines(originalReceiptLines, newPriceSummaryLines),
     [newPriceSummaryLines, originalReceiptLines],
   );
-  const receiptTaxDelta = roundMoney(newReceipt.tax - originalReceipt.tax);
+  const nonTaxChangeSubtotal = roundMoney(
+    calculatedChangeLines.reduce(
+      (sum, line) =>
+        line.kind === 'line' && String(line.type ?? '').toUpperCase() === 'TAX'
+          ? sum
+          : sum + lineAmount(line),
+      0,
+    ),
+  );
+  const receiptTaxDelta = roundMoney(
+    taxRate != null && nonTaxChangeSubtotal > 0
+      ? nonTaxChangeSubtotal * taxRate
+      : newReceipt.tax - originalReceipt.tax,
+  );
   const changeLines = useMemo(() => {
     if (hasTaxLine(calculatedChangeLines) || Math.abs(receiptTaxDelta) < 0.005) {
       return calculatedChangeLines;
@@ -161,28 +179,35 @@ export function AdminChangeReceiptComparison({
       0,
     ),
   );
-  const changeSubtotal = roundMoney(amountDue - changeTax);
+  const displayedAmountDue = roundMoney(changeLines.reduce((sum, line) => sum + lineAmount(line), 0));
+  const displayedUpdatedTotal = roundMoney(originalReceipt.total + displayedAmountDue);
+  const displayedUpdatedSubtotal = roundMoney(originalReceipt.subtotal + nonTaxChangeSubtotal);
+  const displayedUpdatedTax = roundMoney(originalReceipt.tax + changeTax);
   const originalCurrency = originalReceipt.currency ?? currency;
-  const originalReceiptLinesWithUnitAmounts = useMemo(
+  const originalReceiptLinesWithComparableBreakdowns = useMemo(
     () =>
       originalReceiptLines.map((line) =>
         line.kind === 'ticket' && line.qty > 0
           ? {
               ...line,
-              unitAmountLabel: `${formatCurrencyAmount(
-                roundMoney(line.itemTotal / line.qty),
-                originalCurrency,
-                displayLocale,
-              )} each`,
+              breakdown: line.breakdown ?? {
+                lineItems: [],
+                subtotalAfterAdjustments: roundMoney(line.itemTotal / line.qty),
+                feeLines: [],
+                taxRate: 0,
+                taxAmount: 0,
+                isTaxIncluded: false,
+                finalPrice: roundMoney(line.itemTotal / line.qty),
+              },
             }
           : line,
       ),
-    [displayLocale, originalCurrency, originalReceiptLines],
+    [originalReceiptLines],
   );
   const amountDueClass =
-    amountDue < -0.005
+    displayedAmountDue < -0.005
       ? 'text-emerald-700'
-      : amountDue > 0.005
+      : displayedAmountDue > 0.005
         ? 'text-stone-900'
         : 'text-stone-700';
 
@@ -197,7 +222,7 @@ export function AdminChangeReceiptComparison({
             </span>
           </div>
           <PriceSummary
-            lines={originalReceiptLinesWithUnitAmounts}
+            lines={originalReceiptLinesWithComparableBreakdowns}
             total={originalReceipt.total}
             currency={originalCurrency}
             locale={displayLocale}
@@ -215,10 +240,10 @@ export function AdminChangeReceiptComparison({
               <p className="mt-0.5 text-xs text-stone-500">Only newly charged, credited, or repriced value</p>
             </div>
             <span className="shrink-0 text-xs font-medium text-stone-500">
-              {formatCurrencyAmount(amountDue, currency, displayLocale)}
+              {formatCurrencyAmount(displayedAmountDue, currency, displayLocale)}
             </span>
           </div>
-          {changeLines.length === 0 && Math.abs(amountDue) < 0.005 ? (
+          {changeLines.length === 0 && Math.abs(displayedAmountDue) < 0.005 ? (
             <div className="rounded-md border border-dashed border-stone-300 bg-white/70 px-3 py-4 text-center">
               <p className="text-sm font-medium text-stone-700">No pricing changes</p>
               <p className="mt-1 text-xs text-stone-500">The selected booking details match the existing purchase.</p>
@@ -226,10 +251,10 @@ export function AdminChangeReceiptComparison({
           ) : (
             <PriceSummary
               lines={changeLines}
-              total={amountDue}
+              total={displayedAmountDue}
               currency={currency}
               locale={displayLocale}
-              subtotal={changeSubtotal}
+              subtotal={nonTaxChangeSubtotal}
               taxAmount={!changeLinesIncludeTaxRow ? changeTax : 0}
               taxRate={taxRate}
               size="sm"
@@ -245,16 +270,16 @@ export function AdminChangeReceiptComparison({
             <p className="mt-0.5 text-xs text-stone-500">Read-only pricing result; historical and added cohorts remain separate when supplied by the server</p>
           </div>
           <span className="shrink-0 text-xs font-medium text-stone-500">
-            {formatCurrencyAmount(newReceipt.total, currency, displayLocale)}
+            {formatCurrencyAmount(displayedUpdatedTotal, currency, displayLocale)}
           </span>
         </div>
         <PriceSummary
-          lines={newPriceSummaryLines.map((line) => ({ ...line, editable: false, lineKey: undefined }))}
-          total={newReceipt.total}
+          lines={[...originalReceiptLines, ...changeLines].map((line) => ({ ...line, editable: false, lineKey: undefined }))}
+          total={displayedUpdatedTotal}
           currency={currency}
           locale={displayLocale}
-          subtotal={newReceipt.subtotal}
-          taxAmount={!newPriceSummaryLinesIncludeTaxRow ? newReceipt.tax : 0}
+          subtotal={displayedUpdatedSubtotal}
+          taxAmount={!hasTaxLine([...originalReceiptLines, ...changeLines]) ? displayedUpdatedTax : 0}
           taxRate={taxRate}
           size="sm"
           t={t}
@@ -272,7 +297,7 @@ export function AdminChangeReceiptComparison({
       <div className="flex flex-wrap items-center justify-between gap-2 rounded-lg border border-stone-200 bg-stone-50 px-3 py-2">
         <span className="text-sm font-semibold text-stone-900">{amountDueLabel}</span>
         <span className={`text-lg font-semibold tabular-nums ${amountDueClass}`}>
-          {formatCurrencyAmount(amountDue, currency, displayLocale)}
+          {formatCurrencyAmount(displayedAmountDue, currency, displayLocale)}
         </span>
       </div>
     </div>

package/src/components/booking/PriceBreakdown.tsx

@@ -12,7 +12,6 @@ export interface PriceBreakdownProps {
   category: string;
   qty: number;
   itemTotal: number;
-  unitAmountLabel?: string;
   breakdown: PriceBreakdownType | null;
   currency: Currency;
   locale: Locale;
@@ -60,7 +59,6 @@ export function PriceBreakdown({
   category,
   qty,
   itemTotal,
-  unitAmountLabel,
   breakdown,
   currency,
   locale,
@@ -98,7 +96,6 @@ export function PriceBreakdown({
         ) : (
           <span className="text-sm text-stone-600">
             {category} {qty > 1 ? `× ${qty}` : ''}
-            {unitAmountLabel ? <span className="ml-1 text-xs text-stone-400">· {unitAmountLabel}</span> : null}
           </span>
         )}
         {editable && onEditableChange ? (
@@ -160,7 +157,6 @@ export function PriceBreakdown({
           }
         >
           {category} {qty > 1 ? `× ${qty}` : ''}
-          {unitAmountLabel ? <span className="ml-1 text-xs text-stone-400">· {unitAmountLabel}</span> : null}
         </span>
       )}
       <div className="relative flex-shrink-0 whitespace-nowrap">

package/src/components/booking/PriceSummary.tsx

@@ -18,7 +18,6 @@ export type PriceSummaryLine =
       category: string;
       qty: number;
       itemTotal: number;
-      unitAmountLabel?: string;
       breakdown?: PriceBreakdownType | null;
     }
   | {
@@ -211,7 +210,6 @@ export function PriceSummary({
               category={row.category}
               qty={row.qty}
               itemTotal={row.itemTotal}
-              unitAmountLabel={row.unitAmountLabel}
               breakdown={row.breakdown ?? null}
               currency={currency}
               locale={locale}

package/src/components/booking/useAdminChangeQuotePreview.ts

@@ -8,14 +8,13 @@ import {
 } from 'react';
 import {
   quoteChangeBooking,
-  quoteChangeBookingAdminFeReceipt,
+  quoteAdminChangeBookingV2,
   type AdminFeAuthoritativeReceipt,
   type Availability,
   type ItineraryDisplayStep,
   type Product,
   type ReturnOption,
 } from '../../lib/booking-api';
-import { roundMoney } from '../../lib/booking/change-flow-pricing';
 import { getItineraryStepLabel } from '../../lib/booking/itinerary-display';
 import type { OrderSummaryTicketLine } from '../../lib/booking/pricing';
 import { formatCurrencyAmount } from '../../lib/currency';
@@ -423,18 +422,11 @@ export function useAdminChangeQuotePreview({
               previousReturnAvailabilityId: initialValues.returnAvailabilityId ?? null,
             },
           };
-          const deterministicClientProposedTotal = useAdminFeAuthoritativeQuote
-            ? adminFeAuthoritativeReceipt.total
-            : changeFlowNewBookingTotal;
-          const deterministicAmountDue = originalReceipt
-            ? roundMoney(adminFeAuthoritativeReceipt.total - originalReceipt.total)
-            : roundMoney(changeFlowClientEstimateDue);
           const quote = useAdminFeAuthoritativeQuote
-            ? await quoteChangeBookingAdminFeReceipt({
+            ? await quoteAdminChangeBookingV2({
                 ...quoteRequestBase,
-                feReceipt: adminFeAuthoritativeReceipt,
-                feAmountDueMajorUnits: deterministicAmountDue,
-                clientProposedTotal: deterministicClientProposedTotal,
+                // V2 is server-authoritative. Do not bind it to the outbound-only FE estimate.
+                clientProposedTotal: undefined,
               })
             : await quoteChangeBooking(quoteRequestBase);
           if (seq !== changeQuoteRequestSeq.current) return;

package/src/lib/booking-api.ts

@@ -1290,6 +1290,23 @@ export interface AdminChangeBookingQuoteRequest extends ChangeBookingQuoteReques
   feAmountDueMajorUnits?: number;
 }
 
+export interface AdminChangeBookingQuoteV2Data {
+  oldReceipt: {
+    currency?: string | null;
+    grossSubtotal?: number | null;
+    taxAmount?: number | null;
+    payableTotal?: number | null;
+    lines?: PricingV2QuoteLineSnapshot[] | null;
+  };
+  newQuote?: PricingV2QuoteSnapshot | null;
+  balanceDelta?: number | null;
+  amountToCharge?: number | null;
+  refundCandidate?: number | null;
+  canApply: boolean;
+  reasonIfBlocked?: string | null;
+  unsupportedFeatures?: string[];
+}
+
 export interface ChangeBookingQuoteReceipt {
   subtotal?: number;
   tax?: number;
@@ -1593,6 +1610,58 @@ export async function quoteChangeBookingAdminFeReceipt(
     data) as ChangeBookingQuoteResponse;
 }
 
+/** Server-authoritative Pricing V2 quote used by the provider-dashboard amendment preview. */
+export async function quoteAdminChangeBookingV2(
+  request: ChangeBookingQuoteRequest
+): Promise<ChangeBookingQuoteResponse> {
+  const { bookingReference, lastName: _lastName, ...payload } = request;
+  const res = await fetch(
+    `${API_BASE}/1/admin/bookings/${encodeURIComponent(bookingReference)}/change/quote-v2`,
+    {
+      method: 'POST',
+      headers: getAuthHeaders(),
+      body: JSON.stringify(payload),
+    }
+  );
+  if (!res.ok) {
+    const err = await parseJsonSafely(res);
+    const message = isApiErrorPayload(err)
+      ? err.errorMessage || err.error || 'Failed to quote admin booking change'
+      : 'Failed to quote admin booking change';
+    throw new Error(message);
+  }
+  const response = await parseJsonSafely(res);
+  const outer = (response as { data?: unknown } | null)?.data;
+  const data = ((outer as { data?: AdminChangeBookingQuoteV2Data } | null)?.data ??
+    outer) as AdminChangeBookingQuoteV2Data;
+  const oldReceipt = data.oldReceipt;
+  const newQuote = data.newQuote ?? null;
+  const currency = newQuote?.currency ?? oldReceipt.currency ?? undefined;
+  return {
+    pricingQuote: newQuote,
+    quote: newQuote,
+    balanceDelta: data.balanceDelta ?? newQuote?.balanceDelta ?? undefined,
+    amountToCharge: data.amountToCharge ?? newQuote?.amountToCharge ?? undefined,
+    refundCandidate: data.refundCandidate ?? newQuote?.refundCandidate ?? undefined,
+    priceDiff: data.balanceDelta ?? newQuote?.balanceDelta ?? 0,
+    currency: currency ?? undefined,
+    canProceed: data.canApply,
+    reasonIfBlocked: data.reasonIfBlocked ?? undefined,
+    originalReceipt: {
+      subtotal: oldReceipt.grossSubtotal ?? undefined,
+      tax: oldReceipt.taxAmount ?? undefined,
+      total: oldReceipt.payableTotal ?? 0,
+      currency: oldReceipt.currency ?? undefined,
+      lineItems: oldReceipt.lines?.map((line) => ({
+        label: line.label ?? undefined,
+        amount: line.amount ?? undefined,
+        type: line.type ?? undefined,
+        quantity: line.quantity ?? undefined,
+      })),
+    },
+  };
+}
+
 export async function createChangeBookingPaymentIntent(
   changeIntentId: string
 ): Promise<CreateChangePaymentIntentResponse> {