@ticketboothapp/booking 1.2.159 → 1.2.160

package/package.json

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

package/src/components/booking/ChangeBookingFlow.tsx

@@ -60,6 +60,7 @@ import { useSeedPromoCodeInput } from './useSeedPromoCodeInput';
 import { useBookingQuantityCapTrim } from './useBookingQuantityCapTrim';
 import { useBookingViewItemAnalytics } from './useBookingViewItemAnalytics';
 import type { ChangeBookingMergedQuoteState } from './change-booking-quote-state';
+import { AdminChangeReceiptComparison } from './AdminChangeReceiptComparison';
 
 export type { ChangeBookingFlowProps } from './booking-flow-types';
 
@@ -504,7 +505,6 @@ export function ChangeBookingFlow({
     effectiveSubtotal,
     feeLineItemsWithAddOns,
     checkoutPriceSummaryLinesForCheckout,
-    priceSummaryLinesIncludeTaxRow,
     effectivePromoDiscountAmount,
     effectiveTax,
     totalPrice,
@@ -581,7 +581,7 @@ export function ChangeBookingFlow({
     displayChangeFlowProposedTotal,
     displayChangeFlowSubtotal,
     displayChangeFlowTax,
-    taxIncludedSelfServeReconciledPriceSummaryLines,
+    publicChangeAmountDueSummary,
     checkoutModalTicketLinesDisplay,
     changeFlowClientEstimateDue,
     changeFlowAmountDue,
@@ -600,6 +600,22 @@ export function ChangeBookingFlow({
     totalPrice,
   });
 
+  const publicReceiptComparison = originalReceipt ? (
+    <AdminChangeReceiptComparison
+      originalReceipt={originalReceipt}
+      amendmentLines={latestChangeQuote?.serverPreview?.priceSummaryLines ?? null}
+      amountDue={latestChangeQuote?.serverPreview?.amountDue ?? null}
+      updatedTotal={latestChangeQuote?.serverPreview?.totalNewBooking ?? null}
+      selectionChanged={hasEffectiveChangeSelection}
+      quoteError={changeQuoteFetchError}
+      amountDueLabel="Amount due now"
+      currency={currency}
+      locale={locale}
+      t={t}
+      taxRate={pricingConfig?.taxRate}
+    />
+  ) : null;
+
   const {
     missingRequiredReturnSelection,
     isChangeQuoteBlocked,
@@ -926,11 +942,11 @@ export function ChangeBookingFlow({
           {/* Total and Checkout — shared PriceSummary component */}
           {selectedAvailability && (
             <ChangeBookingCheckoutPanel
-              priceSummaryLines={taxIncludedSelfServeReconciledPriceSummaryLines}
-              replacePriceSummary={selfServeCheckoutPlaceholder}
+              priceSummaryLines={publicChangeAmountDueSummary.lines}
+              replacePriceSummary={selfServeCheckoutPlaceholder ?? publicReceiptComparison}
               totalPrice={changeFlowAmountDue}
-              subtotal={displayChangeFlowSubtotal}
-              taxAmount={displayChangeFlowTax}
+              subtotal={publicChangeAmountDueSummary.subtotal}
+              taxAmount={publicChangeAmountDueSummary.tax}
               taxRate={pricingConfig?.taxRate}
               currency={currency}
               locale={locale}
@@ -968,9 +984,9 @@ export function ChangeBookingFlow({
               attributionConfirmLabel={flowUi?.partnerAttributionConfirmLabel}
               attributionConfirmed={partnerAttributionConfirmed}
               onAttributionConfirmedChange={setPartnerAttributionConfirmed}
-              priceSummaryLinesIncludeTaxRow={priceSummaryLinesIncludeTaxRow}
+              priceSummaryLinesIncludeTaxRow={false}
               isTaxIncludedInPrice={isTaxIncludedInPrice}
-              displayChangeFlowTax={displayChangeFlowTax}
+              displayChangeFlowTax={publicChangeAmountDueSummary.tax}
             />
           )}
         </div>

package/src/components/booking/change-booking-flow-helpers.ts

@@ -112,6 +112,41 @@ export function mergePickerTicketQtyIntoPriceSummaryLines(
   });
 }
 
+/**
+ * Build the customer-facing amount-due summary from authoritative amendment
+ * lines. Change quotes contain only the incremental lines, so they must not be
+ * scaled to the booking's final picker quantities or mixed with the full new
+ * booking subtotal. Taxes are combined into the shared summary tax row to keep
+ * the preview auditable: charges, amendment subtotal, tax, amount due.
+ */
+export function buildPublicChangeAmountDueSummary(lines: PriceSummaryLine[]): {
+  lines: PriceSummaryLine[];
+  subtotal: number;
+  tax: number;
+} {
+  const isTaxLine = (line: PriceSummaryLine): boolean =>
+    line.kind === 'line' && String(line.type ?? '').trim().toUpperCase() === 'TAX';
+  const nonTaxLines = lines.filter((line) => !isTaxLine(line));
+  const ticketLines = nonTaxLines.filter((line) => line.kind === 'ticket');
+  const otherLines = nonTaxLines.filter((line) => line.kind !== 'ticket');
+
+  return {
+    lines: [...ticketLines, ...otherLines],
+    subtotal: roundMoney(
+      nonTaxLines.reduce(
+        (sum, line) => sum + (line.kind === 'ticket' ? line.itemTotal : line.amount),
+        0,
+      ),
+    ),
+    tax: roundMoney(
+      lines.reduce(
+        (sum, line) => sum + (isTaxLine(line) && line.kind === 'line' ? line.amount : 0),
+        0,
+      ),
+    ),
+  };
+}
+
 export function normalizeFeReceiptLineItemType(type: string | null | undefined): string | undefined {
   const normalized = String(type ?? '').trim().toUpperCase();
   if (!normalized) return undefined;

package/src/components/booking/useChangeBookingReceiptDerivation.ts

@@ -11,7 +11,10 @@ import type { ChangeBookingFlowProps } from './booking-flow-types';
 import type { ChangeBookingMergedQuoteState } from './change-booking-quote-state';
 import type { CheckoutModalLineItem } from './CheckoutModal';
 import type { PriceSummaryLine } from './PriceSummary';
-import type { PricingRate } from './change-booking-flow-helpers';
+import {
+  buildPublicChangeAmountDueSummary,
+  type PricingRate,
+} from './change-booking-flow-helpers';
 
 type GetPriceBreakdown = (
   category: string,
@@ -103,6 +106,13 @@ export function useChangeBookingReceiptDerivation({
       });
   }, [taxIncludedSelfServeReconciledPriceSummaryLines, pricing, getPriceBreakdown]);
 
+  const publicChangeAmountDueSummary = useMemo(() => {
+    const authoritativeAmendmentLines = latestChangeQuote?.serverPreview?.priceSummaryLines;
+    return buildPublicChangeAmountDueSummary(
+      authoritativeAmendmentLines ?? taxIncludedSelfServeReconciledPriceSummaryLines,
+    );
+  }, [latestChangeQuote, taxIncludedSelfServeReconciledPriceSummaryLines]);
+
   const changeFlowClientEstimateDue = (() => {
     if (!originalReceipt) return totalPrice;
     if (latestChangeQuote != null && !changeQuoteFetchError) {
@@ -121,6 +131,7 @@ export function useChangeBookingReceiptDerivation({
     displayChangeFlowSubtotal,
     displayChangeFlowTax,
     taxIncludedSelfServeReconciledPriceSummaryLines,
+    publicChangeAmountDueSummary,
     checkoutModalTicketLinesDisplay,
     changeFlowClientEstimateDue,
     changeFlowAmountDue,

package/test/change-booking-helpers.test.ts

@@ -33,6 +33,7 @@ import {
   reservationHoldSecondsRemaining,
 } from '../src/components/booking/reservation-hold';
 import { buildAdminChangeProviderPayload } from '../src/components/booking/admin-change-provider-payload';
+import { buildPublicChangeAmountDueSummary } from '../src/components/booking/change-booking-flow-helpers';
 
 function quote(overrides: Partial<ChangeBookingQuoteResponse>): ChangeBookingQuoteResponse {
   return {
@@ -186,6 +187,50 @@ test('admin no-charge provider payload carries the selected pickup itinerary', (
   assert.equal(payload?.travelerHotel, 'A Bear and Bison Inn');
 });
 
+test('public paid change preview shows amendment-only charges before combined tax', () => {
+  const summary = buildPublicChangeAmountDueSummary([
+    {
+      kind: 'line',
+      label: 'Moraine Lake Road Access Fee',
+      amount: 15.99,
+      type: 'FEE',
+    },
+    {
+      kind: 'line',
+      label: 'Tax · Moraine Lake Road Access Fee',
+      amount: 1.36,
+      type: 'TAX',
+    },
+    {
+      kind: 'ticket',
+      category: 'ADULT',
+      qty: 1,
+      itemTotal: 181.49,
+    },
+    {
+      kind: 'line',
+      label: 'Tax · ADULT',
+      amount: 15.43,
+      type: 'TAX',
+    },
+  ]);
+
+  assert.deepEqual(
+    summary.lines.map((line) =>
+      line.kind === 'ticket'
+        ? { label: line.category, quantity: line.qty, amount: line.itemTotal }
+        : { label: line.label, amount: line.amount },
+    ),
+    [
+      { label: 'ADULT', quantity: 1, amount: 181.49 },
+      { label: 'Moraine Lake Road Access Fee', amount: 15.99 },
+    ],
+  );
+  assert.equal(summary.subtotal, 197.48);
+  assert.equal(summary.tax, 16.79);
+  assert.equal(Number((summary.subtotal + summary.tax).toFixed(2)), 214.27);
+});
+
 test('admin removal quote preserves explicit release refund decisions for the preview', () => {
   const operation = {
     operationId: 'op_remove_adult',