@ticketboothapp/booking 1.2.166 → 1.2.168

package/src/lib/booking/booking-cutoffs.ts

@@ -55,6 +55,28 @@ export function filterAvailabilitiesAfterPublicBookingCutoff<T extends { dateTim
   );
 }
 
+/**
+ * Admin surfaces intentionally ignore the public advance-booking cutoff, but an
+ * availability whose actual start time has passed is no longer bookable by the
+ * API. Keep that narrower rule separate so admin and public behavior cannot
+ * accidentally inherit one another's cutoff policy.
+ */
+export function isAvailabilityAfterCurrentTime(
+  availability: { dateTime: string },
+  now: Date = new Date(),
+): boolean {
+  return isAvailabilityAfterPublicBookingCutoff(availability, now, 0);
+}
+
+export function filterAvailabilitiesAfterCurrentTime<T extends { dateTime: string }>(
+  availabilities: T[],
+  now: Date = new Date(),
+): T[] {
+  return availabilities.filter((availability) =>
+    isAvailabilityAfterCurrentTime(availability, now),
+  );
+}
+
 export function isDateWithinPublicPickupUnknownCutoff(date: Date, now: Date = new Date()): boolean {
   return date.getTime() <= now.getTime() + PUBLIC_PICKUP_UNKNOWN_CUTOFF_MS;
 }

package/src/lib/booking/change-booking-server-preview.ts

@@ -4,7 +4,10 @@
  *
  * See `CHANGE_BOOKING_BE_HANDOFF.md` in this package for fields the API should populate.
  */
-import type { ChangeBookingQuoteResponse } from '../booking-api';
+import type {
+  AdminAmendmentOperationSnapshot,
+  ChangeBookingQuoteResponse,
+} from '../booking-api';
 import type { PricingV2QuoteLineSnapshot } from '../booking-api';
 import type { PriceBasisSnapshot } from '../booking-api';
 import type { PriceSummaryLine } from '../../components/booking/PriceSummary';
@@ -24,6 +27,8 @@ export interface ChangeBookingServerPreview {
   completeness: ChangeBookingPreviewCompleteness;
   /** Rows for {@link PriceSummary} / checkout — from quote receipt line items + BE extensions. */
   priceSummaryLines: PriceSummaryLine[];
+  /** Full resulting receipt rows, when the amendment quote supplies them. */
+  resultingReceiptLines?: PriceSummaryLine[];
   /** From quote — per-category unit prices (major units) for ticket picker when BE sends them. */
   ticketUnitPriceByCategory?: Record<string, number>;
   cancellationPolicyFeeByPolicyId?: Record<string, number>;
@@ -207,6 +212,7 @@ export function mapQuoteLineItemsToPriceSummaryLines(
           : type;
       out.push({
         kind: 'ticket',
+        operationId: isPricingV2Line(item) ? item.metadata?.operationId : undefined,
         category,
         qty: qty > 0 ? qty : 1,
         itemTotal: amount,
@@ -228,6 +234,7 @@ export function mapQuoteLineItemsToPriceSummaryLines(
     ) {
       out.push({
         kind: 'ticket',
+        operationId: isPricingV2Line(item) ? item.metadata?.operationId : undefined,
         category: lettersOnly,
         qty,
         itemTotal: amount,
@@ -249,6 +256,74 @@ export function mapQuoteLineItemsToPriceSummaryLines(
   return out;
 }
 
+/** Clarify ticket deltas caused by moving a booking without changing receipt semantics. */
+export function labelAdminAmendmentPriceSummaryLines(
+  lines: PriceSummaryLine[],
+  operations: readonly AdminAmendmentOperationSnapshot[],
+  originalLines: readonly PriceSummaryLine[] = [],
+): PriceSummaryLine[] {
+  const movedServiceOperations = new Map(
+    operations
+      .filter((operation) => operation.type.trim().toUpperCase() === 'MOVE_SERVICE')
+      .map((operation) => [operation.operationId, operation] as const),
+  );
+  if (movedServiceOperations.size === 0) return lines;
+
+  const normalizedTicketCategory = (category: string) => category
+    .replace(/^refund\s*[·:-]\s*/i, '')
+    .replace(/\s*[—-]\s*(?:new date|tour) price difference\s*$/i, '')
+    .trim()
+    .toUpperCase();
+
+  return lines.map((line) => {
+    const moveOperation = line.kind === 'ticket' && line.operationId
+      ? movedServiceOperations.get(line.operationId)
+      : undefined;
+    if (
+      line.kind !== 'ticket' ||
+      !moveOperation ||
+      /(?:new date|tour) price difference/i.test(line.category)
+    ) {
+      return line;
+    }
+    const changesTour = moveOperation.changedFields?.some(
+      (field) => field.trim().toLowerCase() === 'productid',
+    ) ?? false;
+    const priceDifferenceLabel = changesTour
+      ? 'tour price difference'
+      : 'new date price difference';
+    const originalLine = originalLines.find(
+      (candidate) => candidate.kind === 'ticket' &&
+        normalizedTicketCategory(candidate.category) === normalizedTicketCategory(line.category),
+    );
+    const previousUnitAmount = originalLine?.kind === 'ticket' && originalLine.qty > 0
+      ? roundMoney(originalLine.itemTotal / originalLine.qty)
+      : null;
+    const differenceUnitAmount = line.qty > 0
+      ? roundMoney(line.itemTotal / line.qty)
+      : null;
+    const ticketLabel = normalizedTicketCategory(line.category).toLowerCase();
+    return {
+      ...line,
+      category: `${line.category} — ${priceDifferenceLabel}`,
+      ...(previousUnitAmount != null && differenceUnitAmount != null
+        ? {
+            unitPriceComparison: {
+              previousLabel: `Existing ${ticketLabel} price`,
+              updatedLabel: changesTour
+                ? `New-tour ${ticketLabel} price`
+                : `New-date ${ticketLabel} price`,
+              differenceLabel: `Difference per ${ticketLabel}`,
+              previousUnitAmount,
+              updatedUnitAmount: roundMoney(previousUnitAmount + differenceUnitAmount),
+              differenceUnitAmount,
+            },
+          }
+        : {}),
+    };
+  });
+}
+
 function signedAmountDueFromQuote(quote: ChangeBookingQuoteResponse): number {
   const pricingQuote = quote.pricingQuote ?? quote.quote;
   // Prefer explicit settlement fields over balanceDelta. Receipt-total math and balanceDelta
@@ -280,10 +355,21 @@ export function buildChangeBookingServerPreview(
   const paymentCreditTotal = pricingQuote?.paymentCreditTotal ?? quote.paymentCreditTotal;
 
   const rawLines = lineItemsForSummary(quote);
-  const priceSummaryLines =
-    rawLines && rawLines.length > 0
-      ? withPaymentCreditSummaryLine(mapQuoteLineItemsToPriceSummaryLines(rawLines), paymentCreditTotal)
-      : withPaymentCreditSummaryLine([], paymentCreditTotal);
+  const mappedLines = rawLines && rawLines.length > 0
+    ? mapQuoteLineItemsToPriceSummaryLines(rawLines)
+    : [];
+  const priceSummaryLines = withPaymentCreditSummaryLine(
+    labelAdminAmendmentPriceSummaryLines(
+      mappedLines,
+      pricingQuote?.amendment?.operations ?? [],
+      mapQuoteLineItemsToPriceSummaryLines(quote.originalReceipt?.lineItems),
+    ),
+    paymentCreditTotal,
+  );
+  const resultingReceiptLines = pricingQuote?.amendment?.updatedReceipt?.lineItems;
+  const resultingReceiptPriceSummaryLines = resultingReceiptLines?.length
+    ? mapQuoteLineItemsToPriceSummaryLines(resultingReceiptLines)
+    : undefined;
 
   const completeness: ChangeBookingPreviewCompleteness = priceSummaryLines.length > 0 ? 'full' : 'totals_only';
 
@@ -295,6 +381,7 @@ export function buildChangeBookingServerPreview(
     totalNewBooking: totals.total,
     completeness,
     priceSummaryLines,
+    resultingReceiptLines: resultingReceiptPriceSummaryLines,
     ticketUnitPriceByCategory: quote.ticketUnitPriceByCategory,
     cancellationPolicyFeeByPolicyId: quote.cancellationPolicyFeeByPolicyId,
     returnOptionPriceByReturnAvailabilityId: quote.returnOptionPriceByReturnAvailabilityId,

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

@@ -255,6 +255,12 @@ export interface ChangeQuoteUiSlice {
   quoteExpiresAt?: string;
   pricingVersion?: string;
   quotedTotal?: number;
+  /** Settled cash after completed refunds, calculated by the backend from payment records. */
+  amountPreviouslyPaid?: number;
+  /** Non-cash value allocated before and after this amendment. */
+  currentPaymentCreditTotal?: number;
+  projectedPaymentCreditTotal?: number;
+  refundCandidate?: number;
   paymentCreditTotal?: number;
   refundDecisionOperations?: ChangeBookingQuoteResponse['refundDecisionOperations'];
   returnPriceTreatmentOperations?: ChangeBookingQuoteResponse['returnPriceTreatmentOperations'];
@@ -296,6 +302,12 @@ export function sliceChangeQuoteForUi(
     quoteExpiresAt: pricingQuote?.expiresAt ?? quote.expiresAt,
     pricingVersion: pricingQuote?.pricingVersion ?? undefined,
     quotedTotal: pricingQuote?.payableTotal ?? pricingQuote?.totalAmount ?? quote.proposed?.total ?? quote.newReceipt?.total,
+    amountPreviouslyPaid:
+      pricingQuote?.amountPreviouslyPaid ?? quote.amountPreviouslyPaid ?? undefined,
+    currentPaymentCreditTotal: quote.originalReceipt?.paymentCreditTotal ?? 0,
+    projectedPaymentCreditTotal:
+      pricingQuote?.paymentCreditTotal ?? quote.paymentCreditTotal ?? 0,
+    refundCandidate: quote.refundCandidate ?? pricingQuote?.refundCandidate ?? 0,
     paymentCreditTotal: pricingQuote?.paymentCreditTotal ?? quote.paymentCreditTotal,
     refundDecisionOperations: quote.refundDecisionOperations,
     returnPriceTreatmentOperations: quote.returnPriceTreatmentOperations,

package/src/lib/booking/i18n/messages/en.json

@@ -119,6 +119,7 @@
     "rounding": "Rounding",
     "deposit": "Deposit",
     "totalOwedForBookingChange": "Total owed for booking difference",
+    "changeToBookingTotal": "Change to booking total",
     "subtotal": "Subtotal",
     "tax": "Taxes and fees",
     "returnOption": "Return Option",

package/src/lib/booking/i18n/messages/fr.json

@@ -119,6 +119,7 @@
     "rounding": "Arrondi",
     "deposit": "Acompte",
     "totalOwedForBookingChange": "Montant dû pour le changement de réservation",
+    "changeToBookingTotal": "Modification du total de la réservation",
     "subtotal": "Sous-total",
     "tax": "Taxes et frais",
     "returnOption": "Option de retour",

package/src/lib/booking-api.ts

@@ -1102,7 +1102,7 @@ export async function getPromoDiscount(
 
 export async function getAddOns(
   companyId: string,
-  options?: { productOptionId?: string; preCheckout?: boolean }
+  options?: { productOptionId?: string; preCheckout?: boolean; dateTime?: string }
 ): Promise<AddOn[]> {
   const params = new URLSearchParams({ companyId });
   if (options?.productOptionId) {
@@ -1110,6 +1110,7 @@ export async function getAddOns(
     if (po) params.set('productOptionId', po);
   }
   if (options?.preCheckout !== undefined) params.set('preCheckout', String(options.preCheckout));
+  if (options?.dateTime?.trim()) params.set('dateTime', options.dateTime.trim());
   const res = await fetchBookingGetWithRetry(`${API_BASE}/1/add-ons?${params}`);
   if (!res.ok) {
     const err = await res.json();
@@ -1251,6 +1252,8 @@ export type AdminAmendmentRefundDisposition =
   | 'PENDING_REFUND'
   | 'NO_REFUND';
 
+export type AdminPromoApplicationScope = 'CHANGE_ONLY' | 'ENTIRE_BOOKING';
+
 export interface AdminAmendmentOperationSnapshot {
   operationId: string;
   type: string;
@@ -1262,6 +1265,27 @@ export interface AdminAmendmentOperationSnapshot {
   metadata?: Record<string, string>;
 }
 
+export interface AdminAmendmentActiveAdjustmentSnapshot {
+  adjustmentId: string;
+  operationId: string;
+  mode: 'FIXED_AMOUNT' | 'PERCENTAGE_DISCOUNT' | 'PERCENTAGE_SURCHARGE';
+  scope:
+    | 'POSITIVE_AMENDMENT_VALUE'
+    | 'CURRENT_ACTIVE_TICKETS'
+    | 'CURRENT_ACTIVE_BOOKING'
+    | 'SELECTED_COMPONENTS';
+  basisCents: number;
+  percentageBasisPoints?: number | null;
+  amountCents: number;
+  taxDeltaCents: number;
+  affectedComponentIds: string[];
+  taxBehavior: 'NON_TAXABLE' | 'TAXABLE' | 'PRE_TAX_DISCOUNT' | 'POST_TAX_DISCOUNT';
+  reasonCode: string;
+  referenceCode?: string | null;
+  reason?: string | null;
+  createdAt: string;
+}
+
 export interface ChangeBookingQuoteRequest {
   bookingReference: string;
   lastName: string;
@@ -1276,6 +1300,9 @@ export interface ChangeBookingQuoteRequest {
   newReturnAvailabilityId?: string | null;
   newPassengerCounts?: Array<{ category: string; count: number }>;
   newAddOnSelections?: Array<{ addOnId: string; variantId?: string; quantity?: number }>;
+  /** Explicit promo intent for this amendment. Historical booking promos are never implied. */
+  promoCode?: string | null;
+  promoApplicationScope?: AdminPromoApplicationScope | null;
   /** Full new-booking total shown in the UI; server verifies within tolerance then uses this for the session so charge matches screen. */
   clientProposedTotal?: number;
   /**
@@ -1293,6 +1320,25 @@ export interface ChangeBookingQuoteRequest {
   } | null;
   /** Explicit admin treatment for server-classified removed paid value. Never defaulted by the client. */
   refundDispositionsByOperationId?: Record<string, AdminAmendmentRefundDisposition>;
+  /** Server-resolved admin adjustments to append to the immutable amendment ledger. */
+  structuredAdjustments?: Array<{
+    adjustmentId: string;
+    mode: 'FIXED_AMOUNT' | 'PERCENTAGE_DISCOUNT' | 'PERCENTAGE_SURCHARGE';
+    fixedAmount?: number | null;
+    percentageBasisPoints?: number | null;
+    scope:
+      | 'POSITIVE_AMENDMENT_VALUE'
+      | 'CURRENT_ACTIVE_TICKETS'
+      | 'CURRENT_ACTIVE_BOOKING'
+      | 'SELECTED_COMPONENTS';
+    selectedComponentIds?: string[];
+    taxBehavior: 'NON_TAXABLE' | 'TAXABLE' | 'PRE_TAX_DISCOUNT' | 'POST_TAX_DISCOUNT';
+    reasonCode: string;
+    referenceCode?: string | null;
+    reason?: string | null;
+  }>;
+  /** Existing immutable adjustment ids to reverse as part of this amendment. */
+  reverseAdjustmentIds?: string[];
 }
 
 /** FE-authored receipt payload for admin quote path (major units, booking currency). */
@@ -1323,6 +1369,7 @@ export interface AdminChangeBookingQuoteV2Data {
   oldReceipt: {
     currency?: string | null;
     grossSubtotal?: number | null;
+    paymentCreditTotal?: number | null;
     taxAmount?: number | null;
     payableTotal?: number | null;
     lines?: PricingV2QuoteLineSnapshot[] | null;
@@ -1342,6 +1389,7 @@ export interface AdminChangeBookingQuoteV2Data {
   returnPriceTreatmentOperations?: AdminAmendmentOperationSnapshot[];
   allowedRefundDispositionsByOperationId?: Record<string, AdminAmendmentRefundDisposition[]>;
   removedValueByOperationId?: Record<string, number>;
+  reversibleAdjustments?: AdminAmendmentActiveAdjustmentSnapshot[];
 }
 
 export interface ChangeBookingQuoteReceipt {
@@ -1349,11 +1397,18 @@ export interface ChangeBookingQuoteReceipt {
   tax?: number;
   total: number;
   currency?: string;
+  /** Non-cash value currently allocated to the booking, such as gift-card credit. */
+  paymentCreditTotal?: number;
   lineItems?: Array<{
     label?: string;
     amount?: number;
     type?: string;
     quantity?: number;
+    reference?: string | null;
+    identity?: {
+      componentId?: string | null;
+    } | null;
+    priceBasis?: PriceBasisSnapshot | null;
   }>;
 }
 
@@ -1446,6 +1501,7 @@ export interface ChangeBookingQuoteResponse {
   quote?: PricingV2QuoteSnapshot | null;
   paymentCreditTotal?: number;
   balanceDelta?: number;
+  amountPreviouslyPaid?: number;
   amountToCharge?: number;
   refundCandidate?: number;
   /**
@@ -1489,6 +1545,8 @@ export interface ChangeBookingQuoteResponse {
   allowedRefundDispositionsByOperationId?: Record<string, AdminAmendmentRefundDisposition[]>;
   /** Original paid basis plus allocated refundable tax for each removal operation. */
   removedValueByOperationId?: Record<string, number>;
+  /** Active immutable adjustments that an admin may edit (reverse + replace) or remove. */
+  reversibleAdjustments?: AdminAmendmentActiveAdjustmentSnapshot[];
   /** When price check fails / disagrees: optional breakdown for UI line-vs-line comparison. */
   pricingDriftDetail?: ChangeBookingQuotePricingDriftDetail;
   /** Optional BE debug: receipt-floor vs catalog ticket math (same-parent Rule A/B). */
@@ -1683,6 +1741,7 @@ export function mapAdminChangeBookingQuoteV2Data(
     pricingQuote: newQuote,
     quote: newQuote,
     balanceDelta: data.balanceDelta ?? newQuote?.balanceDelta ?? undefined,
+    amountPreviouslyPaid: newQuote?.amountPreviouslyPaid ?? undefined,
     amountToCharge: data.amountToCharge ?? newQuote?.amountToCharge ?? undefined,
     refundCandidate: data.refundCandidate ?? newQuote?.refundCandidate ?? undefined,
     priceDiff: data.balanceDelta ?? newQuote?.balanceDelta ?? 0,
@@ -1694,16 +1753,19 @@ export function mapAdminChangeBookingQuoteV2Data(
     allowedRefundDispositionsByOperationId:
       data.allowedRefundDispositionsByOperationId ?? {},
     removedValueByOperationId: data.removedValueByOperationId ?? {},
+    reversibleAdjustments: data.reversibleAdjustments ?? [],
     originalReceipt: {
       subtotal: oldReceipt.grossSubtotal ?? undefined,
       tax: oldReceipt.taxAmount ?? undefined,
       total: oldReceipt.payableTotal ?? 0,
       currency: oldReceipt.currency ?? undefined,
+      paymentCreditTotal: oldReceipt.paymentCreditTotal ?? 0,
       lineItems: oldReceipt.lines?.map((line) => ({
         label: line.label ?? undefined,
         amount: line.amount ?? undefined,
         type: line.type ?? undefined,
         quantity: line.quantity ?? undefined,
+        priceBasis: line.priceBasis ?? undefined,
       })),
     },
   };
@@ -2239,6 +2301,19 @@ export interface PricingV2QuoteSnapshot {
   bookingReference?: string | null;
   reservationReference?: string | null;
   relatedChangeIntentId?: string | null;
+  amendment?: {
+    operations?: AdminAmendmentOperationSnapshot[] | null;
+    updatedReceipt?: ChangeBookingQuoteReceipt | null;
+    targetState?: {
+      nonPriceState?: {
+        /**
+         * The amendment service stores the canonical itinerary as JSON in non-price state.
+         * Accept an array as well so clients remain compatible if the API stops stringifying it.
+         */
+        itinerary?: string | ItineraryDisplayStep[] | null;
+      } | null;
+    } | null;
+  } | null;
   metadata?: Record<string, string> | null;
   [key: string]: unknown;
 }