@ticketboothapp/booking 1.2.164 → 1.2.166

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ticketboothapp/booking",
-  "version": "1.2.164",
+  "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/useAdminChangeCheckoutController.ts

@@ -59,6 +59,7 @@ import {
   buildAdminChangePaymentChoiceData,
   buildAdminChangePayNowCheckoutModalData,
   confirmAdminChangeBookingWithoutPayment,
+  shouldRestoreAdminChangePaymentChoiceAfterCheckoutClose,
   type AdminChangeCheckoutModalData,
   type AdminChangePaymentChoiceData,
 } from './admin-change-payment-choice-runner';
@@ -292,6 +293,27 @@ export function useAdminChangeCheckoutController({
     setCheckoutClientSecret('');
   }, []);
 
+  const handleCheckoutClose = useCallback(() => {
+    if (paymentSubmitInFlightRef.current) return;
+    cancelPendingReservation();
+    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;
     const pending = pendingReservationRef.current;
@@ -323,6 +345,7 @@ export function useAdminChangeCheckoutController({
   const buildProviderChangePayload = (
     availabilityProductOptionId: string,
     bookingItems: AdminChangeBookingItem[],
+    authoritativeQuote: AdminChangeLatestQuote | null = latestChangeQuote,
   ): ProviderDashboardChangeBookingPayload | null => {
     return buildAdminChangeProviderPayload({
       selectedAvailability,
@@ -340,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,
@@ -436,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({
@@ -464,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);
@@ -501,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(
@@ -546,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 });
@@ -590,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,
         }));
@@ -940,6 +980,7 @@ export function useAdminChangeCheckoutController({
     showAdminPaymentChoice,
     adminChoiceData,
     cancelPendingReservation,
+    handleCheckoutClose,
     handleCheckout,
     handleConfirmWithoutPayment,
     handlePayNow,

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

@@ -37,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 {
@@ -117,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 },