@ticketboothapp/booking 1.2.187 → 1.2.189

package/package.json

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

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -897,6 +897,12 @@ export function AdminChangeBookingFlow({
     activeReturnPriceTreatmentOperations,
     refundDispositionsByOperationId,
   ]);
+  const initialSelectionHydratedForQuote = Boolean(
+    selectedAvailability &&
+      totalQuantity > 0 &&
+      addOnCatalogLoaded &&
+      ((selectedAvailability.returnOptions?.length ?? 0) === 0 || selectedReturnOption),
+  );
   const handleRefundDispositionChange = useCallback((
     operationId: string,
     disposition: AdminReleaseRefundDisposition | null,
@@ -918,8 +924,8 @@ export function AdminChangeBookingFlow({
   } = useAdminChangeQuotePreview({
     isCustomerSelfServeChange,
     isProviderDashboardChange,
-    hasChangeSelection,
     hasEffectiveChangeSelection,
+    initialSelectionHydrated: initialSelectionHydratedForQuote,
     selectedAvailability,
     selectedReturnOption,
     initialValues,

package/src/components/booking/AdminChangeReceiptComparison.tsx

@@ -363,7 +363,7 @@ export function AdminChangeReceiptComparison({
         </section>
 
         <section className="min-w-0 overflow-visible rounded-lg border border-sky-200 bg-sky-50/50 p-3">
-          <div className="mb-3 flex items-center justify-between gap-3">
+          <div className="mb-3">
             <div>
               <h3 className="text-sm font-semibold text-stone-900">
                 {isProductFamilyConversion ? 'New purchase' : 'Current change'}
@@ -374,29 +374,20 @@ export function AdminChangeReceiptComparison({
                 </p>
               ) : null}
             </div>
-            <div className="flex shrink-0 items-center gap-2">
-              {onPreserveExistingReceiptChange ? (
-                <button
-                  type="button"
-                  aria-pressed={preserveExistingReceipt}
-                  className={`rounded-md border px-2.5 py-1.5 text-xs font-semibold transition ${
-                    preserveExistingReceipt
-                      ? 'border-sky-700 bg-sky-700 text-white'
-                      : 'border-stone-300 bg-white text-stone-700 hover:border-sky-500 hover:text-sky-800'
-                  }`}
-                  onClick={() => onPreserveExistingReceiptChange(!preserveExistingReceipt)}
-                >
-                  Keep receipt unchanged
-                </button>
-              ) : null}
-              <span className="text-xs font-medium text-stone-500">
-              {isProductFamilyConversion
-                ? formatCurrencyAmount(updatedTotal ?? 0, currency, displayLocale)
-                : bookingTotalChange == null
-                  ? '—'
-                  : formatCurrencyAmount(bookingTotalChange, currency, displayLocale)}
-              </span>
-            </div>
+            {onPreserveExistingReceiptChange ? (
+              <button
+                type="button"
+                aria-pressed={preserveExistingReceipt}
+                className={`mt-1.5 inline-flex text-sm font-semibold underline decoration-1 underline-offset-4 transition ${
+                  preserveExistingReceipt
+                    ? 'text-emerald-800 decoration-emerald-700 hover:text-emerald-950'
+                    : 'text-emerald-700 decoration-emerald-600 hover:text-emerald-900'
+                }`}
+                onClick={() => onPreserveExistingReceiptChange(!preserveExistingReceipt)}
+              >
+                Keep receipt unchanged
+              </button>
+            ) : null}
           </div>
           {preserveExistingReceipt ? (
             <div className="mb-3 rounded-md border border-sky-200 bg-white px-3 py-2">

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

@@ -24,6 +24,7 @@ interface AdminChangeQuoteRequestKeyInput {
 interface AdminChangeQuoteRequestGateInput {
   isCustomerSelfServeChange: boolean;
   hasEffectiveChangeSelection: boolean;
+  initialSelectionHydrated?: boolean;
   hasSelectedAvailability: boolean;
   bookingReference?: string | null;
   lastName: string;
@@ -45,6 +46,7 @@ export function canRequestAdminChangeQuote(input: AdminChangeQuoteRequestGateInp
   return Boolean(
     input.isCustomerSelfServeChange &&
       input.hasEffectiveChangeSelection &&
+      input.initialSelectionHydrated !== false &&
       input.hasSelectedAvailability &&
       input.bookingReference?.trim() &&
       input.lastName.trim() &&

package/src/components/booking/change-booking-error-message.ts

@@ -93,7 +93,7 @@ export function incompatibleAddOnChangeError(
 
 function errorCodeFromMessage(message: string): string | null {
   const match = message.match(
-    /\b(?:pricing_v2|apply_v2|promo|admin|amendment|booking_amendment|private_shuttle|quote|structured_adjustment)_[a-z0-9_]+/i,
+    /\b(?:(?:missing_(?:add|remove)_operation):[a-z0-9_]+|(?:pricing_v2|apply_v2|promo|admin|amendment|booking_amendment|private_shuttle|quote|structured_adjustment)_[a-z0-9_]+)/i,
   );
   return match?.[0]?.toLowerCase() ?? null;
 }
@@ -112,6 +112,10 @@ export function friendlyChangeBookingError(message: string | null | undefined):
   const exact = CHANGE_BOOKING_ERROR_MESSAGES[code];
   if (exact) return exact;
 
+  if (code.startsWith('missing_add_operation:return') || code.startsWith('missing_remove_operation:return')) {
+    return 'The return portion of this booking could not be priced. Re-select the return time and try again.';
+  }
+
   if (code.startsWith('admin_adjustment_refund_disposition_required')) {
     return 'Choose how to handle the removed adjustment value before continuing.';
   }

package/src/components/booking/useAdminChangeQuotePreview.ts

@@ -64,8 +64,8 @@ interface ChangeSelectionDetailsForPreview {
 export interface UseAdminChangeQuotePreviewParams {
   isCustomerSelfServeChange: boolean;
   isProviderDashboardChange: boolean;
-  hasChangeSelection: boolean;
   hasEffectiveChangeSelection: boolean;
+  initialSelectionHydrated: boolean;
   selectedAvailability: Availability | null;
   selectedReturnOption: ReturnOption | null;
   initialValues: ChangeBookingFlowProps['initialValues'];
@@ -129,8 +129,8 @@ export interface UseAdminChangeQuotePreviewResult {
 export function useAdminChangeQuotePreview({
   isCustomerSelfServeChange,
   isProviderDashboardChange,
-  hasChangeSelection,
   hasEffectiveChangeSelection,
+  initialSelectionHydrated,
   selectedAvailability,
   selectedReturnOption,
   initialValues,
@@ -194,37 +194,10 @@ export function useAdminChangeQuotePreview({
     (latestChangeQuote.refundDecisionOperations?.length ?? 0) === 0;
   const refundDecisionRequired = (latestChangeQuote?.refundDecisionOperations?.length ?? 0) > 0;
   const hasPublishedChangeQuote = latestChangeQuote !== null;
-  /**
-   * Existing admin adjustments must be discoverable before the operator makes a change.
-   * Initial selection hydration can briefly leave the live availability/return unset, so use
-   * the persisted booking identities for this read-only discovery quote instead of waiting for
-   * the editable target controls to become complete.
-   */
-  const quoteAvailability = useMemo<Availability | null>(() => {
-    if (selectedAvailability) return selectedAvailability;
-    if (!needsAdjustmentDiscovery || !initialValues?.dateTime?.trim()) return null;
-    const optionId = initialValues.productOptionId?.trim() || initialValues.productId?.trim();
-    if (!optionId) return null;
-    return {
-      dateTime: initialValues.dateTime.trim(),
-      availabilityId: initialValues.availabilityId?.trim() || undefined,
-      productOptionId: optionId,
-      vacancies: Math.max(totalQuantity, 1),
-      currency,
-    };
-  }, [
-    selectedAvailability,
-    needsAdjustmentDiscovery,
-    initialValues?.dateTime,
-    initialValues?.availabilityId,
-    initialValues?.productOptionId,
-    initialValues?.productId,
-    totalQuantity,
-    currency,
-  ]);
-  const quoteReturnAvailabilityId =
-    selectedReturnOption?.returnAvailabilityId ??
-    (needsAdjustmentDiscovery ? initialValues?.returnAvailabilityId?.trim() || null : null);
+  // Existing-adjustment discovery is still a real quote. Never send it with the temporary
+  // empty ticket/return state produced while the saved booking is being rehydrated.
+  const quoteAvailability = selectedAvailability;
+  const quoteReturnAvailabilityId = selectedReturnOption?.returnAvailabilityId ?? null;
   const changeQuoteInputsKey = useMemo(() => buildAdminChangeQuoteRequestKey({
     bookingReference: initialValues?.bookingReference,
     lastName,
@@ -264,15 +237,14 @@ export function useAdminChangeQuotePreview({
   ]);
   const destinationRequiresReturnSelection = Boolean(selectedAvailability?.returnOptions?.length);
   const missingRequiredReturnSelection = destinationRequiresReturnSelection && !selectedReturnOption;
-  const quoteMissingRequiredReturnSelection =
-    missingRequiredReturnSelection && !needsAdjustmentDiscovery;
   const canRequestChangeQuote = canRequestAdminChangeQuote({
     isCustomerSelfServeChange,
-    hasEffectiveChangeSelection,
+    hasEffectiveChangeSelection: hasEffectiveChangeSelection || needsAdjustmentDiscovery,
+    initialSelectionHydrated,
     hasSelectedAvailability: quoteAvailability != null,
     bookingReference: initialValues?.bookingReference,
     lastName,
-    missingRequiredReturnSelection: quoteMissingRequiredReturnSelection,
+    missingRequiredReturnSelection,
   });
   const changeFlowSubmitDisabled =
     missingRequiredReturnSelection ||

package/src/components/booking/useChangeBookingInitialHydration.ts

@@ -45,6 +45,16 @@ export interface UseChangeBookingInitialHydrationOptions {
   setError: Dispatch<SetStateAction<string>>;
 }
 
+export function initialPromoCodeToApply(
+  initialPromoCode: string | null | undefined,
+  lockedPromoCode: string | null,
+): string | null {
+  if (!lockedPromoCode) return null;
+  const normalizedInitial = initialPromoCode?.trim().toUpperCase() ?? '';
+  const normalizedLocked = lockedPromoCode.trim().toUpperCase();
+  return normalizedInitial && normalizedInitial === normalizedLocked ? normalizedInitial : null;
+}
+
 export function useChangeBookingInitialHydration({
   initialValues,
   lockedPromoCode,
@@ -84,7 +94,7 @@ export function useChangeBookingInitialHydration({
     const trimmedEmail = initialValues.customer?.email?.trim();
     const trimmedFirstName = initialValues.customer?.firstName?.trim();
     const trimmedLastName = initialValues.customer?.lastName?.trim();
-    const trimmedPromo = initialValues.promoCode?.trim().toUpperCase();
+    const initialPromoToApply = initialPromoCodeToApply(initialValues.promoCode, lockedPromoCode);
     if (trimmedEmail) setEmail(trimmedEmail);
     if (trimmedFirstName) setFirstName(trimmedFirstName);
     if (trimmedLastName) setLastName(trimmedLastName);
@@ -92,13 +102,16 @@ export function useChangeBookingInitialHydration({
       setPickupLocationId(initialValues.pickupLocationId.trim());
       setPickupLocationSkipped(false);
     }
-    if (trimmedPromo) {
-      setPromoCodeInput(trimmedPromo);
-      setAppliedPromoCode(trimmedPromo);
+    // Provider amendments show the historical code separately and require the operator to
+    // explicitly apply it again. Only public/self-serve flows pass a locked promo here.
+    if (initialPromoToApply) {
+      setPromoCodeInput(initialPromoToApply);
+      setAppliedPromoCode(initialPromoToApply);
     }
     hasAppliedInitialValuesRef.current = true;
   }, [
     initialValues,
+    lockedPromoCode,
     setAppliedPromoCode,
     setEmail,
     setFirstName,

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

@@ -35,6 +35,7 @@ import {
   canReuseCompletedAdminChangeQuote,
   isAdminRefundDecisionDiscoveryQuote,
 } from '../src/components/booking/admin-change-quote-request-key';
+import { initialPromoCodeToApply } from '../src/components/booking/useChangeBookingInitialHydration';
 import {
   authoritativeItineraryDisplayFromChangeQuote,
   sliceAndMergeChangeQuoteForUi,
@@ -762,6 +763,21 @@ test('admin quote gate allows adjustment-only changes', () => {
     lastName: 'Tauro',
     missingRequiredReturnSelection: false,
   }), false);
+
+  assert.equal(canRequestAdminChangeQuote({
+    isCustomerSelfServeChange: true,
+    hasEffectiveChangeSelection: true,
+    initialSelectionHydrated: false,
+    hasSelectedAvailability: true,
+    bookingReference: 'DIFG66OF',
+    lastName: 'Tauro',
+    missingRequiredReturnSelection: false,
+  }), false);
+});
+
+test('provider reopen does not automatically reapply the historical promo', () => {
+  assert.equal(initialPromoCodeToApply(' LOCKEDIN2026 ', null), null);
+  assert.equal(initialPromoCodeToApply(' LOCKEDIN2026 ', 'LOCKEDIN2026'), 'LOCKEDIN2026');
 });
 
 test('admin preview and checkout share the Pricing V2 request shape', () => {
@@ -2272,6 +2288,10 @@ test('translates booking-change reason codes into operator-facing messages', ()
     friendlyChangeBookingError('private_shuttle_itinerary_endpoints_required'),
     'The private-tour itinerary is incomplete. Reopen the change and select the pickup time and location again.',
   );
+  assert.equal(
+    friendlyChangeBookingError('missing_add_operation:return'),
+    'The return portion of this booking could not be priced. Re-select the return time and try again.',
+  );
   assert.equal(
     friendlyChangeBookingError('Remove the unavailable add-on before recalculating this amendment.'),
     'Remove the unavailable add-on before recalculating this amendment.',