@ticketboothapp/booking 1.2.165 → 1.2.166

package/package.json

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

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -924,7 +924,7 @@ export function AdminChangeBookingFlow({
     checkoutModalData,
     showAdminPaymentChoice,
     adminChoiceData,
-    cancelPendingReservation,
+    handleCheckoutClose,
     handleCheckout,
     handleConfirmWithoutPayment,
     handlePayNow,
@@ -1022,7 +1022,7 @@ export function AdminChangeBookingFlow({
         ...{ pickupLocationId, pickupLocationSkipped, firstName, lastName, email, getSuccessUrl, t },
         onPayNow: handlePayNow,
         onConfirmWithoutPayment: handleConfirmWithoutPayment, onAdminPaymentChoiceCancel: handleAdminPaymentChoiceCancel,
-        onCheckoutClose: cancelPendingReservation, onPaymentSubmitStart: handlePaymentSubmitStart,
+        onCheckoutClose: handleCheckoutClose, onPaymentSubmitStart: handlePaymentSubmitStart,
         onPaymentSubmitError: handlePaymentSubmitError, onPaymentConfirmed: handlePaymentConfirmed,
         isPartialLaunch,
         checkoutVisible: selectedAvailability != null,

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

@@ -126,6 +126,18 @@ export function buildAdminChangePayNowCheckoutModalData(
   };
 }
 
+export function shouldRestoreAdminChangePaymentChoiceAfterCheckoutClose(
+  isProviderDashboardChange: boolean,
+  isChangeBookingContext: boolean,
+  adminChoiceData: Pick<AdminChangePaymentChoiceData, 'pricingQuoteId'> | null,
+): boolean {
+  return Boolean(
+    isProviderDashboardChange &&
+      isChangeBookingContext &&
+      adminChoiceData?.pricingQuoteId?.trim(),
+  );
+}
+
 export interface ConfirmAdminChangeBookingWithoutPaymentParams {
   adminChoiceData: AdminChangePaymentChoiceData;
   bookingSourceAttribution: Partial<BookingSourceMetadata>;

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

@@ -43,16 +43,3 @@ 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

@@ -59,6 +59,7 @@ import {
   buildAdminChangePaymentChoiceData,
   buildAdminChangePayNowCheckoutModalData,
   confirmAdminChangeBookingWithoutPayment,
+  shouldRestoreAdminChangePaymentChoiceAfterCheckoutClose,
   type AdminChangeCheckoutModalData,
   type AdminChangePaymentChoiceData,
 } from './admin-change-payment-choice-runner';
@@ -290,8 +291,28 @@ export function useAdminChangeCheckoutController({
     setShowCheckoutModal(false);
     setCheckoutModalData(null);
     setCheckoutClientSecret('');
+  }, []);
+
+  const handleCheckoutClose = useCallback(() => {
+    if (paymentSubmitInFlightRef.current) return;
+    cancelPendingReservation();
     setError('');
-  }, [setError]);
+    // An existing-booking Pay now attempt owns an immutable quote/payment-choice snapshot.
+    // Closing Stripe must return to that choice instead of making the user create a new quote.
+    if (shouldRestoreAdminChangePaymentChoiceAfterCheckoutClose(
+      isProviderDashboardChange,
+      isChangeBookingContext,
+      adminChoiceData,
+    )) {
+      setShowAdminPaymentChoice(true);
+    }
+  }, [
+    adminChoiceData?.pricingQuoteId,
+    cancelPendingReservation,
+    isChangeBookingContext,
+    isProviderDashboardChange,
+    setError,
+  ]);
 
   const cancelPendingReservationBestEffort = useCallback(() => {
     if (paymentSubmitInFlightRef.current) return;
@@ -324,6 +345,7 @@ export function useAdminChangeCheckoutController({
   const buildProviderChangePayload = (
     availabilityProductOptionId: string,
     bookingItems: AdminChangeBookingItem[],
+    authoritativeQuote: AdminChangeLatestQuote | null = latestChangeQuote,
   ): ProviderDashboardChangeBookingPayload | null => {
     return buildAdminChangeProviderPayload({
       selectedAvailability,
@@ -341,8 +363,8 @@ export function useAdminChangeCheckoutController({
       mergedProviderAdditionalAdjustments,
       adminStructuredAdjustments,
       refundDispositionsByOperationId,
-      pricingV2QuoteId: latestChangeQuote?.quoteId ?? null,
-      pricingV2QuotedTotal: latestChangeQuote?.quotedTotal ?? latestChangeQuote?.serverDisplay?.total ?? null,
+      pricingV2QuoteId: authoritativeQuote?.quoteId ?? null,
+      pricingV2QuotedTotal: authoritativeQuote?.quotedTotal ?? authoritativeQuote?.serverDisplay?.total ?? null,
       providerApplyAuthoritativeReceipt,
       previousPassengerCount: changeFlowInitialTicketCount,
       previousAvailabilityId: initialValues?.availabilityId ?? null,
@@ -437,6 +459,7 @@ export function useAdminChangeCheckoutController({
       let changeIntentIdForCheckout: string | undefined;
       let changeBookingReferenceForPaidFlow: string | undefined;
       let confirmedChangeAmountDueForCheckout: number | null = null;
+      let authoritativeChangeQuoteForCheckout = latestChangeQuote;
 
       if (isCustomerSelfServeChange) {
         const quoteResult = await quoteAdminCustomerChangeForCheckout({
@@ -465,11 +488,18 @@ export function useAdminChangeCheckoutController({
         });
         changeBookingReferenceForPaidFlow = quoteResult.bookingReference;
         setLatestChangeQuote(quoteResult.mergedQuote);
+        // React state is not updated synchronously. Everything in this checkout attempt must
+        // use the quote returned above, not the stale latestChangeQuote render closure.
+        authoritativeChangeQuoteForCheckout = quoteResult.mergedQuote;
         confirmedChangeAmountDueForCheckout = quoteResult.decision.amountDueForCheckout;
 
         if (quoteResult.decision.kind === 'free') {
           if (onChangeBooking) {
-            const providerPayload = buildProviderChangePayload(availabilityProductOptionId, bookingItems);
+            const providerPayload = buildProviderChangePayload(
+              availabilityProductOptionId,
+              bookingItems,
+              authoritativeChangeQuoteForCheckout,
+            );
             if (!providerPayload) {
               setError('No availability selected');
               setLoading(false);
@@ -502,7 +532,7 @@ export function useAdminChangeCheckoutController({
       const itineraryDisplay = computeItineraryDisplayForStorage() ?? computeItineraryDisplay();
       const taxForBreakdown = effectivePromoDiscountAmount > 0 ? effectiveTax : tax;
       const amountDueForCheckout = isProviderDashboardChange && isChangeBookingContext
-        ? Math.max(0, latestChangeQuote?.priceDiff ?? 0)
+        ? Math.max(0, authoritativeChangeQuoteForCheckout?.priceDiff ?? 0)
         : isCustomerSelfServeChange
         ? confirmedChangeAmountDueForCheckout ??
           Math.max(
@@ -547,14 +577,21 @@ export function useAdminChangeCheckoutController({
       // quote-bound Stripe authorization and applies only after that authorization succeeds.
       if (isProviderDashboardChange && isChangeBookingContext) {
         const bookingReference = initialValues?.bookingReference?.trim();
-        const quoteId = latestChangeQuote?.quoteId?.trim();
+        const quoteId = authoritativeChangeQuoteForCheckout?.quoteId?.trim();
         if (!bookingReference) throw new Error('Missing booking reference.');
-        if (!quoteId || latestChangeQuote?.canProceed === false) {
-          throw new Error(latestChangeQuote?.reasonIfBlocked || 'The authoritative change quote is not ready.');
+        if (!quoteId || authoritativeChangeQuoteForCheckout?.canProceed === false) {
+          throw new Error(
+            authoritativeChangeQuoteForCheckout?.reasonIfBlocked ||
+              'The authoritative change quote is not ready.',
+          );
         }
         if (amountDueForCheckout <= 0) {
           if (!onChangeBooking) throw new Error('Provider change handler is unavailable.');
-          const providerPayload = buildProviderChangePayload(availabilityProductOptionId, bookingItems);
+          const providerPayload = buildProviderChangePayload(
+            availabilityProductOptionId,
+            bookingItems,
+            authoritativeChangeQuoteForCheckout,
+          );
           if (!providerPayload) throw new Error('No availability selected');
           await onChangeBooking(providerPayload);
           onSuccess?.({ reservationReference: bookingReference });
@@ -591,7 +628,9 @@ 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?.serverDisplay?.total ?? latestChangeQuote?.quotedTotal,
+          newTotal:
+            authoritativeChangeQuoteForCheckout?.serverDisplay?.total ??
+            authoritativeChangeQuoteForCheckout?.quotedTotal,
           finalizeExistingChangeInline: true,
           preferConfirmWithoutPayment: true,
         }));
@@ -941,6 +980,7 @@ export function useAdminChangeCheckoutController({
     showAdminPaymentChoice,
     adminChoiceData,
     cancelPendingReservation,
+    handleCheckoutClose,
     handleCheckout,
     handleConfirmWithoutPayment,
     handlePayNow,

package/src/components/booking/useAdminChangeQuotePreview.ts

@@ -27,10 +27,7 @@ import {
 } from './change-booking-flow-helpers';
 import type { Currency } from './CurrencySwitcher';
 import type { AdminChangeLatestQuote } from './useAdminChangeCheckoutController';
-import {
-  buildAdminChangeQuoteRequestKey,
-  canReuseCompletedAdminChangeQuote,
-} from './admin-change-quote-request-key';
+import { buildAdminChangeQuoteRequestKey } from './admin-change-quote-request-key';
 import type { ProviderDashboardChangeBookingPayload } from './provider-dashboard-change-booking';
 
 type AddOnSelection = { addOnId: string; variantId?: string; quantity?: number };
@@ -170,7 +167,6 @@ 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,
@@ -212,14 +208,6 @@ 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';
@@ -227,8 +215,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 ?? latestChangeQuote?.priceDiff ?? 0;
-      const due = Math.round(serverDue * 100) / 100;
+      const serverDue = latestChangeQuote?.serverPreview?.amountDue;
+      const due = Math.round((serverDue ?? changeFlowClientEstimateDue) * 100) / 100;
       return due > 0
         ? `Change booking (${formatCurrencyAmount(due, currency, locale as 'en' | 'fr')})`
         : due < 0
@@ -410,15 +398,11 @@ export function useAdminChangeQuotePreview({
       return;
     }
 
-    if (changeQuoteInputsKey && inFlightQuoteInputsKeyRef.current === changeQuoteInputsKey) {
-      return;
-    }
-
-    if (canReuseCompletedAdminChangeQuote(
-      changeQuoteInputsKey,
-      lastCompletedQuoteInputsKeyRef.current,
-      hasPublishedChangeQuote,
-    )) {
+    if (
+      changeQuoteInputsKey &&
+      (inFlightQuoteInputsKeyRef.current === changeQuoteInputsKey ||
+        lastCompletedQuoteInputsKeyRef.current === changeQuoteInputsKey)
+    ) {
       setChangeQuoteLoading(false);
       return;
     }
@@ -509,13 +493,10 @@ 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,10 +13,7 @@ import {
   mapAdminChangeBookingQuoteV2Data,
   type ChangeBookingQuoteResponse,
 } from '../src/lib/booking-api';
-import {
-  buildAdminChangeQuoteRequestKey,
-  canReuseCompletedAdminChangeQuote,
-} from '../src/components/booking/admin-change-quote-request-key';
+import { buildAdminChangeQuoteRequestKey } from '../src/components/booking/admin-change-quote-request-key';
 import {
   noRefundRemovedValue,
   normalizeReturnPriceTreatment,
@@ -40,6 +37,7 @@ import { buildPublicChangeAmountDueSummary } from '../src/components/booking/cha
 import {
   buildAdminChangePaymentChoiceData,
   buildAdminChangePayNowCheckoutModalData,
+  shouldRestoreAdminChangePaymentChoiceAfterCheckoutClose,
 } from '../src/components/booking/admin-change-payment-choice-runner';
 
 function quote(overrides: Partial<ChangeBookingQuoteResponse>): ChangeBookingQuoteResponse {
@@ -120,6 +118,16 @@ test('admin existing-booking pay-now review keeps previous, updated, and exact d
   assert.equal(checkout.finalizeExistingChangeInline, true);
   assert.equal(choice.confirmWithoutPaymentLabel, 'Pay later');
   assert.equal(choice.preferConfirmWithoutPayment, true);
+  assert.equal(
+    shouldRestoreAdminChangePaymentChoiceAfterCheckoutClose(true, true, choice),
+    true,
+  );
+  assert.equal(
+    shouldRestoreAdminChangePaymentChoiceAfterCheckoutClose(true, true, {
+      pricingQuoteId: '   ',
+    }),
+    false,
+  );
   assert.equal(
     buildAdminChangePayNowCheckoutModalData(
       { ...choice, finalizeExistingChangeInline: undefined },
@@ -198,13 +206,6 @@ 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']