@ticketboothapp/booking 1.2.163 → 1.2.165

package/package.json

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

package/src/components/booking/admin-change-payment-choice-runner.ts

@@ -16,10 +16,13 @@ import type { ChangeBookingPaidCheckoutModalData } from './change-booking-paymen
 
 export type AdminChangeCheckoutModalData = ChangeBookingPaidCheckoutModalData & {
   finalizeExistingChangeInline?: boolean;
+  pricingQuoteId?: string;
 };
 
 export interface AdminChangePaymentChoiceData {
   reservationReference: string;
+  /** Immutable quote snapshot used by both payment preparation and final apply. */
+  pricingQuoteId?: string;
   reservationExpiration?: string;
   checkoutBreakdown: CheckoutBreakdown;
   totalAmount: number;
@@ -51,6 +54,7 @@ export interface AdminChangePaymentChoiceData {
 
 export interface BuildAdminChangePaymentChoiceDataParams {
   reservationReference: string;
+  pricingQuoteId?: string;
   checkoutBreakdown: CheckoutBreakdown;
   totalAmount: number;
   datePart: string;
@@ -94,6 +98,7 @@ export function buildAdminChangePayNowCheckoutModalData(
 ): AdminChangeCheckoutModalData {
   return {
     reservationReference: adminChoiceData.reservationReference,
+    pricingQuoteId: adminChoiceData.pricingQuoteId,
     reservationExpiration: adminChoiceData.reservationExpiration,
     customerLastName: lastName.trim(),
     ticketLines: adminChoiceData.ticketLinesForModal,

package/src/components/booking/admin-change-quote-request-key.ts

@@ -43,3 +43,16 @@ export function buildAdminChangeQuoteRequestKey(input: AdminChangeQuoteRequestKe
     useAdminFeAuthoritativeQuote: input.useAdminFeAuthoritativeQuote,
   });
 }
+
+/**
+ * A completed request is reusable only while its authoritative quote is still published.
+ * Closing a nested payment dialog can clear transient quote state without changing the
+ * selection inputs; in that case the same input key must be eligible for a refetch.
+ */
+export function canReuseCompletedAdminChangeQuote(
+  inputKey: string,
+  lastCompletedInputKey: string | null,
+  hasPublishedQuote: boolean,
+): boolean {
+  return Boolean(inputKey) && lastCompletedInputKey === inputKey && hasPublishedQuote;
+}

package/src/components/booking/useAdminChangeCheckoutController.ts

@@ -290,7 +290,8 @@ export function useAdminChangeCheckoutController({
     setShowCheckoutModal(false);
     setCheckoutModalData(null);
     setCheckoutClientSecret('');
-  }, []);
+    setError('');
+  }, [setError]);
 
   const cancelPendingReservationBestEffort = useCallback(() => {
     if (paymentSubmitInFlightRef.current) return;
@@ -563,6 +564,7 @@ export function useAdminChangeCheckoutController({
         }
         setAdminChoiceData(buildAdminChangePaymentChoiceData({
           reservationReference: bookingReference,
+          pricingQuoteId: quoteId,
           checkoutBreakdown,
           totalAmount: amountDueForCheckout,
           datePart,
@@ -589,7 +591,7 @@ export function useAdminChangeCheckoutController({
             'Pay later to apply the change and add the amount to the booking balance, or collect a new card payment before applying it.',
           confirmWithoutPaymentLabel: 'Pay later',
           previousTotal: originalReceipt?.total,
-          newTotal: latestChangeQuote?.quotedTotal ?? latestChangeQuote?.serverDisplay?.total,
+          newTotal: latestChangeQuote?.serverDisplay?.total ?? latestChangeQuote?.quotedTotal,
           finalizeExistingChangeInline: true,
           preferConfirmWithoutPayment: true,
         }));
@@ -859,8 +861,8 @@ export function useAdminChangeCheckoutController({
       return;
     }
     if (isProviderDashboardChange && isChangeBookingContext) {
-      const bookingReference = initialValues?.bookingReference?.trim();
-      const quoteId = latestChangeQuote?.quoteId?.trim();
+      const bookingReference = adminChoiceData.reservationReference.trim();
+      const quoteId = adminChoiceData.pricingQuoteId?.trim();
       if (!bookingReference || !quoteId) {
         setError('The authoritative change quote is no longer available.');
         return;
@@ -893,8 +895,8 @@ export function useAdminChangeCheckoutController({
 
   const handlePaymentConfirmed = useCallback(async (paymentIntentId: string) => {
     if (!isProviderDashboardChange || !isChangeBookingContext) return;
-    const bookingReference = initialValues?.bookingReference?.trim();
-    const quoteId = latestChangeQuote?.quoteId?.trim();
+    const bookingReference = checkoutModalData?.reservationReference?.trim();
+    const quoteId = checkoutModalData?.pricingQuoteId?.trim();
     if (!bookingReference || !quoteId) {
       throw new Error('Payment was authorized, but the booking quote is no longer available.');
     }
@@ -910,10 +912,10 @@ export function useAdminChangeCheckoutController({
     onSuccess?.({ reservationReference: bookingReference });
     finishManageFlow(bookingReference);
   }, [
-    initialValues?.bookingReference,
+    checkoutModalData?.pricingQuoteId,
+    checkoutModalData?.reservationReference,
     isChangeBookingContext,
     isProviderDashboardChange,
-    latestChangeQuote?.quoteId,
     onSuccess,
   ]);
 

package/src/components/booking/useAdminChangeQuotePreview.ts

@@ -27,7 +27,10 @@ import {
 } from './change-booking-flow-helpers';
 import type { Currency } from './CurrencySwitcher';
 import type { AdminChangeLatestQuote } from './useAdminChangeCheckoutController';
-import { buildAdminChangeQuoteRequestKey } from './admin-change-quote-request-key';
+import {
+  buildAdminChangeQuoteRequestKey,
+  canReuseCompletedAdminChangeQuote,
+} from './admin-change-quote-request-key';
 import type { ProviderDashboardChangeBookingPayload } from './provider-dashboard-change-booking';
 
 type AddOnSelection = { addOnId: string; variantId?: string; quantity?: number };
@@ -167,6 +170,7 @@ export function useAdminChangeQuotePreview({
     latestChangeQuote?.canProceed === false &&
     (latestChangeQuote.refundDecisionOperations?.length ?? 0) === 0;
   const refundDecisionRequired = (latestChangeQuote?.refundDecisionOperations?.length ?? 0) > 0;
+  const hasPublishedChangeQuote = latestChangeQuote !== null;
   const changeQuoteInputsKey = useMemo(() => buildAdminChangeQuoteRequestKey({
     bookingReference: initialValues?.bookingReference,
     lastName,
@@ -208,6 +212,14 @@ export function useAdminChangeQuotePreview({
   const changeCheckoutButtonLabel = (() => {
     if (!hasEffectiveChangeSelection) return undefined;
     if (isProviderDashboardChange) {
+      if (changeQuoteLoading || (!latestChangeQuote && !changeQuoteFetchError)) {
+        const tr = t('booking.updatingPrice');
+        return tr !== 'booking.updatingPrice' ? tr : 'Updating price\u2026';
+      }
+      if (changeQuoteFetchError) {
+        const tr = t('booking.changeBookingRetry');
+        return tr !== 'booking.changeBookingRetry' ? tr : 'Change booking (retry)';
+      }
       if (isChangeQuoteBlocked) {
         const tr = t('booking.changeBookingNotAvailable');
         return tr !== 'booking.changeBookingNotAvailable' ? tr : 'Change not available';
@@ -215,8 +227,8 @@ export function useAdminChangeQuotePreview({
       // Prefer authoritative V2 signed due (charge positive / refund negative). Do not use the
       // FE cart estimate once a server quote exists — receipt total deltas can disagree with
       // floored/settlement amounts (DEFECT-PV2-018 follow-up).
-      const serverDue = latestChangeQuote?.serverPreview?.amountDue;
-      const due = Math.round((serverDue ?? changeFlowClientEstimateDue) * 100) / 100;
+      const serverDue = latestChangeQuote?.serverPreview?.amountDue ?? latestChangeQuote?.priceDiff ?? 0;
+      const due = Math.round(serverDue * 100) / 100;
       return due > 0
         ? `Change booking (${formatCurrencyAmount(due, currency, locale as 'en' | 'fr')})`
         : due < 0
@@ -284,8 +296,11 @@ export function useAdminChangeQuotePreview({
       hasChangesFromInitial: hasEffectiveChangeSelection,
       selectionTotal:
         originalReceipt
-          ? selfServePricingConfirmed && latestChangeQuote?.serverPreview?.totalNewBooking != null
-            ? latestChangeQuote.serverPreview.totalNewBooking
+          ? selfServePricingConfirmed && latestChangeQuote != null
+            ? latestChangeQuote.quotedTotal ??
+              latestChangeQuote.serverDisplay?.total ??
+              latestChangeQuote.serverPreview?.totalNewBooking ??
+              null
             : suppressSelfServeCurrencyUi
               ? null
               : displayChangeFlowProposedTotalWithEditableLines
@@ -306,6 +321,8 @@ export function useAdminChangeQuotePreview({
     displayChangeFlowProposedTotalWithEditableLines,
     suppressSelfServeCurrencyUi,
     selfServePricingConfirmed,
+    latestChangeQuote?.quotedTotal,
+    latestChangeQuote?.serverDisplay?.total,
     latestChangeQuote?.serverPreview?.totalNewBooking,
   ]);
 
@@ -393,11 +410,15 @@ export function useAdminChangeQuotePreview({
       return;
     }
 
-    if (
-      changeQuoteInputsKey &&
-      (inFlightQuoteInputsKeyRef.current === changeQuoteInputsKey ||
-        lastCompletedQuoteInputsKeyRef.current === changeQuoteInputsKey)
-    ) {
+    if (changeQuoteInputsKey && inFlightQuoteInputsKeyRef.current === changeQuoteInputsKey) {
+      return;
+    }
+
+    if (canReuseCompletedAdminChangeQuote(
+      changeQuoteInputsKey,
+      lastCompletedQuoteInputsKeyRef.current,
+      hasPublishedChangeQuote,
+    )) {
       setChangeQuoteLoading(false);
       return;
     }
@@ -488,10 +509,13 @@ export function useAdminChangeQuotePreview({
   }, [
     // Fetching is controlled by the canonical user-input identity. Do not add quote-derived
     // totals, receipt objects, or display lines here: a response must not trigger another quote.
+    // Quote presence is intentionally included so a cleared transient quote can be restored by
+    // refetching the same canonical input identity after a nested checkout is closed.
     isCustomerSelfServeChange,
     hasChangeSelection,
     missingRequiredReturnSelection,
     changeQuoteInputsKey,
+    hasPublishedChangeQuote,
   ]);
 
   return {

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

@@ -13,7 +13,10 @@ import {
   mapAdminChangeBookingQuoteV2Data,
   type ChangeBookingQuoteResponse,
 } from '../src/lib/booking-api';
-import { buildAdminChangeQuoteRequestKey } from '../src/components/booking/admin-change-quote-request-key';
+import {
+  buildAdminChangeQuoteRequestKey,
+  canReuseCompletedAdminChangeQuote,
+} from '../src/components/booking/admin-change-quote-request-key';
 import {
   noRefundRemovedValue,
   normalizeReturnPriceTreatment,
@@ -80,6 +83,7 @@ test('admin payment choice countdown expires exactly at the reservation deadline
 test('admin existing-booking pay-now review keeps previous, updated, and exact difference totals', () => {
   const choice = buildAdminChangePaymentChoiceData({
     reservationReference: 'KBRCIGCO',
+    pricingQuoteId: 'quote_exact_admin_change',
     checkoutBreakdown: { lineItems: [] },
     totalAmount: 256.58,
     datePart: '2026-07-31',
@@ -112,6 +116,7 @@ test('admin existing-booking pay-now review keeps previous, updated, and exact d
     differenceTotal: 256.58,
   });
   assert.equal(checkout.total, 256.58);
+  assert.equal(checkout.pricingQuoteId, 'quote_exact_admin_change');
   assert.equal(checkout.finalizeExistingChangeInline, true);
   assert.equal(choice.confirmWithoutPaymentLabel, 'Pay later');
   assert.equal(choice.preferConfirmWithoutPayment, true);
@@ -193,6 +198,13 @@ test('admin quote response display state cannot invalidate its request identity'
   assert.equal(keyAfterResponse, keyBeforeResponse);
 });
 
+test('admin quote dedupe refetches unchanged inputs after the published quote is cleared', () => {
+  const inputKey = 'same-admin-change-inputs';
+  assert.equal(canReuseCompletedAdminChangeQuote(inputKey, inputKey, true), true);
+  assert.equal(canReuseCompletedAdminChangeQuote(inputKey, inputKey, false), false);
+  assert.equal(canReuseCompletedAdminChangeQuote(inputKey, 'different-inputs', true), false);
+});
+
 test('admin no-charge provider payload carries the selected pickup itinerary', () => {
   const itineraryDisplay: NonNullable<
     Parameters<typeof buildAdminChangeProviderPayload>[0]['itineraryDisplay']