@ticketboothapp/booking 1.2.180 → 1.2.182

package/src/components/booking/use-standard-booking-availability.ts

@@ -39,6 +39,11 @@ import {
   parseAvailabilityDateTime,
   shouldSyncSelectedAvailability,
 } from './standard-booking-availability';
+import { shouldRevalidateAvailabilityCache } from './availability-cache-policy';
+import {
+  resolvePartnerPricingProfileId,
+  type PartnerPricingProfileOverride,
+} from '../../lib/booking/partner-pricing-profile';
 
 interface UseStandardBookingAvailabilityParams {
   product: Product;
@@ -50,6 +55,7 @@ interface UseStandardBookingAvailabilityParams {
   companyTimezone: string;
   appliedPromoCode: string | null;
   pricingProfileIdForAvailabilities: string | null;
+  pricingProfileOverridesForAvailabilities?: readonly PartnerPricingProfileOverride[];
   cancellationPolicyProfileIdForAvailabilities: string | null;
   bookingCutoffNow: Date;
   bookingCutoffMinutes?: number | null;
@@ -151,7 +157,8 @@ export function useStandardBookingAvailability({
   isAdmin,
   companyTimezone,
   appliedPromoCode,
-  pricingProfileIdForAvailabilities,
+  pricingProfileIdForAvailabilities: fallbackPricingProfileIdForAvailabilities,
+  pricingProfileOverridesForAvailabilities,
   cancellationPolicyProfileIdForAvailabilities,
   bookingCutoffNow,
   bookingCutoffMinutes,
@@ -178,6 +185,21 @@ export function useStandardBookingAvailability({
   const selectedDateHydrationInFlightKeyRef = useRef<string | null>(null);
   const lastVisibleRangeRef = useRef<DateRange | null>(null);
   const activeOptionsLength = activeOptions.length;
+  const pricingProfileResolutionDate = selectedDate || (visibleRange
+    ? formatInTimeZone(visibleRange.start, companyTimezone, 'yyyy-MM-dd')
+    : formatInTimeZone(new Date(), companyTimezone, 'yyyy-MM-dd'));
+  const pricingProfileIdForAvailabilities = useMemo(
+    () => resolvePartnerPricingProfileId(
+      fallbackPricingProfileIdForAvailabilities,
+      pricingProfileOverridesForAvailabilities,
+      pricingProfileResolutionDate,
+    ),
+    [
+      fallbackPricingProfileIdForAvailabilities,
+      pricingProfileOverridesForAvailabilities,
+      pricingProfileResolutionDate,
+    ],
+  );
 
   const applyPricingConfig = useCallback((next?: PricingConfig | null) => {
     setPricingConfig((prev) => {
@@ -414,6 +436,14 @@ export function useStandardBookingAvailability({
     }
   }, [companyTimezone, visibleRange]);
 
+  useEffect(() => {
+    fetchedRangesRef.current = [];
+  }, [
+    appliedPromoCode,
+    pricingProfileIdForAvailabilities,
+    cancellationPolicyProfileIdForAvailabilities,
+  ]);
+
   useEffect(() => {
     if (isPartialLaunch) {
       setLoadingAvailabilities(false);
@@ -462,7 +492,10 @@ export function useStandardBookingAvailability({
         );
         const isStale = availabilitiesCache?.isStale(cached) ?? false;
         if (cacheCoversRange) {
-          shouldRevalidateCachedRange = true;
+          shouldRevalidateCachedRange = shouldRevalidateAvailabilityCache(
+            cacheCoversRange,
+            isStale,
+          );
           setAvailabilities(cached.availabilities);
           if (cached.availabilities.length > 0) {
             hasLoadedAvailabilitiesRef.current = true;
@@ -601,14 +634,6 @@ export function useStandardBookingAvailability({
     visibleRange,
   ]);
 
-  useEffect(() => {
-    fetchedRangesRef.current = [];
-  }, [
-    appliedPromoCode,
-    pricingProfileIdForAvailabilities,
-    cancellationPolicyProfileIdForAvailabilities,
-  ]);
-
   const handleVisibleRangeChange = useCallback((start: Date, end: Date) => {
     const lastRange = lastVisibleRangeRef.current;
     const rangeChanged =
@@ -793,6 +818,7 @@ export function useStandardBookingAvailability({
     selectedReturnOption,
     setSelectedReturnOption,
     selectedDate,
+    pricingProfileIdForAvailabilities,
     setSelectedDate,
     loadingAvailabilities,
     isFetchingMoreAvailabilities,

package/src/constants/pill-values.ts

@@ -7,7 +7,6 @@ const doubleCheckIconPath = '/pill-value-icons/double-check-icon.svg';
 const hikerIconPath = '/pill-value-icons/hiker-icon.svg';
 const waterIconPath = '/pill-value-icons/water-icon.svg';
 const lunchIconPath = '/pill-value-icons/lunch-icon.svg';
-const croissantIconPath = '/pill-value-icons/croissant-icon.svg';
 const locationPinIconPath = '/pill-value-icons/location-pin-icon.svg';
 const addTimeIconPath = '/pill-value-icons/add-time-icon.svg';
 const coffeeIconPath = '/pill-value-icons/coffee-icon.svg';
@@ -188,13 +187,6 @@ export const createLunchPillValue = (strings = defaultStrings): PillValue => {
     };
 }
 
-export const createCroissantPillValue = (strings = defaultStrings): PillValue => {
-    return {
-        icon: croissantIconPath,
-        label: strings.pillValues.croissant
-    };
-}
-
 export const createHotDrinksPillValue = (strings = defaultStrings): PillValue => {
     return {
         icon: coffeeIconPath,

package/src/constants/products.ts

@@ -1,5 +1,5 @@
 import { ImageData, IMAGES } from './images';
-import { PillValue, createDeparturePillValue, createDurationPillValue, createSunrisePillValue, createTwoLakesInOnePillValue, createHikePillValue, createCanoePillValue, createMoneyPillValue, createAddTimePillValue, createHotDrinksPillValue, createLunchPillValue, createCroissantPillValue, createemeraldLakeEscapeTourLocationsPillValues, createCozyBlanketsPillValue } from './pill-values';
+import { PillValue, createDeparturePillValue, createDurationPillValue, createSunrisePillValue, createTwoLakesInOnePillValue, createHikePillValue, createCanoePillValue, createMoneyPillValue, createAddTimePillValue, createHotDrinksPillValue, createLunchPillValue, createemeraldLakeEscapeTourLocationsPillValues, createCozyBlanketsPillValue } from './pill-values';
 export enum ProductTagStyle {
   MOST_POPULAR = 'most-popular',
   NEW = 'new',
@@ -149,7 +149,7 @@ export const getProducts = (strings: any): Record<string, Product> => ({
     description: strings.productThemePages.privateTours.description,
     path: '/private-shuttle',
     avgPrice: 1699,
-    pillValues: [createDeparturePillValue('private-tour', strings), createDurationPillValue('private-tour', strings), createCroissantPillValue(strings), createHotDrinksPillValue(strings), createMoneyPillValue('private-tour', strings)]
+    pillValues: [createDeparturePillValue('private-tour', strings), createDurationPillValue('private-tour', strings), createHotDrinksPillValue(strings), createMoneyPillValue('private-tour', strings)]
   }
 });
 

package/src/data/product-descriptions/private-tour.en.json

@@ -35,8 +35,7 @@
         "• Trailsnacks 🍫",
         "• Water to refills - bring your water bottle 💧",
         "• Complimentary hot chocolate, coffee & tea ☕️",
-        "• Fresh croissant from a local french-canadian bakery 🥐",
-        "• Lunch options available 🍽️",
+        "• Breakfast and Lunch options available 🍽️",
         "• Phone chargers 🔋 ",
         "• Moraine Lake Access Fee 🏞️",
         "• Banff National Park Pass 🏞️"

package/src/index.ts

@@ -10,6 +10,11 @@ export {
   type PublicPartnerAgent,
   type PublicStaffPortalSignInOption,
 } from './public-partners';
+export {
+  parsePartnerPricingProfileOverrides,
+  resolvePartnerPricingProfileId,
+  type PartnerPricingProfileOverride,
+} from './lib/booking/partner-pricing-profile';
 
 /** Canonical Via Via booking UI — same modules as `@/components/booking/*` on the site. */
 export { BookingFlow } from './components/booking/BookingFlow';

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

@@ -80,6 +80,7 @@
     "selectTimeAndTickets": "Please select a time and at least one ticket",
     "selectPickupLocation": "Please select a pickup location",
     "loadingTimes": "Loading available times...",
+    "confirmingAvailability": "Confirming availability...",
     "noAvailability": "No availability found for the next 30 days. Please check back later.",
     "seeFullTourDescription": "See full tour description",
     "seeFullAddOnDescription": "See full experience details",

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

@@ -80,6 +80,7 @@
     "selectTimeAndTickets": "Veuillez sélectionner une heure et au moins un billet",
     "selectPickupLocation": "Veuillez sélectionner un lieu de prise en charge",
     "loadingTimes": "Chargement des heures disponibles...",
+    "confirmingAvailability": "Confirmation des disponibilités...",
     "noAvailability": "Aucune disponibilité trouvée pour les 30 prochains jours. Veuillez réessayer plus tard.",
     "seeFullTourDescription": "Voir la description complète du circuit",
     "seeFullAddOnDescription": "Voir tous les détails de l'expérience",

package/src/lib/booking/partner-pricing-profile.ts

@@ -0,0 +1,74 @@
+export type PartnerPricingProfileOverride = {
+  pricingProfileId: string;
+  months?: number[];
+  startMonth?: number | null;
+  endMonth?: number | null;
+};
+
+function asRecord(value: unknown): Record<string, unknown> | null {
+  return value && typeof value === 'object' && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : null;
+}
+
+function validMonth(value: unknown): number | null {
+  return typeof value === 'number' && Number.isInteger(value) && value >= 1 && value <= 12
+    ? value
+    : null;
+}
+
+export function parsePartnerPricingProfileOverrides(
+  value: unknown,
+): PartnerPricingProfileOverride[] {
+  if (!Array.isArray(value)) return [];
+  return value.flatMap((row) => {
+    const record = asRecord(row);
+    const pricingProfileId =
+      typeof record?.pricingProfileId === 'string' ? record.pricingProfileId.trim() : '';
+    if (!pricingProfileId) return [];
+    const months = Array.isArray(record?.months)
+      ? record.months.map(validMonth).filter((month): month is number => month != null)
+      : [];
+    const startMonth = validMonth(record?.startMonth);
+    const endMonth = validMonth(record?.endMonth);
+    return [{
+      pricingProfileId,
+      ...(months.length > 0 ? { months } : {}),
+      ...(startMonth != null ? { startMonth } : {}),
+      ...(endMonth != null ? { endMonth } : {}),
+    }];
+  });
+}
+
+function bookingMonth(value: string | null | undefined): number | null {
+  const normalized = value?.trim();
+  if (!normalized) return null;
+  const match = /^(?:\d{4})-(\d{2})(?:-\d{2})?/.exec(normalized);
+  if (!match) return null;
+  const month = Number(match[1]);
+  return Number.isInteger(month) && month >= 1 && month <= 12 ? month : null;
+}
+
+function overrideMatchesMonth(override: PartnerPricingProfileOverride, month: number): boolean {
+  if (override.months?.length) return override.months.includes(month);
+  const start = override.startMonth;
+  const end = override.endMonth;
+  if (start == null || end == null) return false;
+  return start <= end ? month >= start && month <= end : month >= start || month <= end;
+}
+
+/** First matching seasonal override wins; the single profile remains the fallback. */
+export function resolvePartnerPricingProfileId(
+  fallbackPricingProfileId: string | null | undefined,
+  overrides: readonly PartnerPricingProfileOverride[] | null | undefined,
+  bookingDate: string | null | undefined,
+): string | null {
+  const fallback = fallbackPricingProfileId?.trim() || null;
+  const month = bookingMonth(bookingDate);
+  if (month == null) return fallback;
+  const matchingProfile = overrides
+    ?.find((override) => overrideMatchesMonth(override, month))
+    ?.pricingProfileId
+    ?.trim();
+  return matchingProfile || fallback;
+}

package/src/lib/booking/reservation-attempt.ts

@@ -0,0 +1,138 @@
+export interface ReservationAttemptStorage {
+  getItem(key: string): string | null;
+  setItem(key: string, value: string): void;
+  removeItem(key: string): void;
+}
+
+export interface ReservationAttemptContext<T extends object> {
+  idempotencyKey: string;
+  request: T & { idempotencyKey: string };
+  clear: () => void;
+}
+
+interface StoredReservationAttempt {
+  idempotencyKey: string;
+  createdAt: number;
+}
+
+export function reservationIdempotencyEnabled(
+  value: string | undefined = process.env.NEXT_PUBLIC_RESERVATION_IDEMPOTENCY_ENABLED
+): boolean {
+  return value?.trim().toLowerCase() === 'true';
+}
+
+export async function getOrCreateReservationAttempt<T extends object>(
+  request: T,
+  options: {
+    storage?: ReservationAttemptStorage | null;
+    now?: number;
+    createId?: () => string;
+    digest?: (value: string) => Promise<string>;
+  } = {}
+): Promise<ReservationAttemptContext<T>> {
+  const now = options.now ?? Date.now();
+  const requestWithoutKey = { ...request } as T & { idempotencyKey?: string };
+  delete requestWithoutKey.idempotencyKey;
+  const digest = options.digest ?? sha256Hex;
+  const fingerprint = await digest(stableStringify(requestWithoutKey));
+  const storageKey = `${STORAGE_PREFIX}${fingerprint}`;
+  const storage = options.storage === undefined ? browserSessionStorage() : options.storage;
+  const stored = readStoredAttempt(storage, storageKey, now);
+  const idempotencyKey = stored?.idempotencyKey ?? (options.createId ?? createAttemptId)();
+  if (!IDEMPOTENCY_KEY_PATTERN.test(idempotencyKey)) {
+    throw new Error('Could not create a valid reservation attempt identifier.');
+  }
+  if (!stored) {
+    writeStoredAttempt(storage, storageKey, { idempotencyKey, createdAt: now });
+  }
+  return {
+    idempotencyKey,
+    request: { ...requestWithoutKey, idempotencyKey },
+    clear: () => storage?.removeItem(storageKey),
+  };
+}
+
+function browserSessionStorage(): ReservationAttemptStorage | null {
+  try {
+    return typeof window !== 'undefined' ? window.sessionStorage : null;
+  } catch {
+    return null;
+  }
+}
+
+function readStoredAttempt(
+  storage: ReservationAttemptStorage | null,
+  key: string,
+  now: number
+): StoredReservationAttempt | null {
+  if (!storage) return null;
+  try {
+    const parsed = JSON.parse(storage.getItem(key) || '') as Partial<StoredReservationAttempt>;
+    if (
+      typeof parsed.idempotencyKey !== 'string' ||
+      !IDEMPOTENCY_KEY_PATTERN.test(parsed.idempotencyKey) ||
+      typeof parsed.createdAt !== 'number' ||
+      now - parsed.createdAt < 0 ||
+      now - parsed.createdAt > ATTEMPT_TTL_MS
+    ) {
+      storage.removeItem(key);
+      return null;
+    }
+    return { idempotencyKey: parsed.idempotencyKey, createdAt: parsed.createdAt };
+  } catch {
+    storage.removeItem(key);
+    return null;
+  }
+}
+
+function writeStoredAttempt(
+  storage: ReservationAttemptStorage | null,
+  key: string,
+  attempt: StoredReservationAttempt
+): void {
+  if (!storage) return;
+  try {
+    storage.setItem(key, JSON.stringify(attempt));
+  } catch {
+    // A storage failure reduces reload recovery but must not block a protected in-memory attempt.
+  }
+}
+
+function createAttemptId(): string {
+  const cryptoApi = globalThis.crypto;
+  if (typeof cryptoApi?.randomUUID === 'function') {
+    return `attempt_${cryptoApi.randomUUID().replaceAll('-', '')}`;
+  }
+  if (typeof cryptoApi?.getRandomValues === 'function') {
+    const bytes = cryptoApi.getRandomValues(new Uint8Array(16));
+    return `attempt_${Array.from(bytes, (value) => value.toString(16).padStart(2, '0')).join('')}`;
+  }
+  throw new Error('Secure random identifiers are unavailable in this browser.');
+}
+
+async function sha256Hex(value: string): Promise<string> {
+  if (!globalThis.crypto?.subtle) {
+    throw new Error('Secure request fingerprinting is unavailable in this browser.');
+  }
+  const digest = await globalThis.crypto.subtle.digest('SHA-256', new TextEncoder().encode(value));
+  return Array.from(new Uint8Array(digest), (byte) => byte.toString(16).padStart(2, '0')).join('');
+}
+
+function stableStringify(value: unknown): string {
+  if (Array.isArray(value)) {
+    return `[${value.map(stableStringify).join(',')}]`;
+  }
+  if (value && typeof value === 'object') {
+    const entries = Object.entries(value as Record<string, unknown>)
+      .filter(([, child]) => child !== undefined)
+      .sort(([left], [right]) => left.localeCompare(right));
+    return `{${entries
+      .map(([key, child]) => `${JSON.stringify(key)}:${stableStringify(child)}`)
+      .join(',')}}`;
+  }
+  return JSON.stringify(value);
+}
+
+const STORAGE_PREFIX = 'viavia:reservation-attempt:';
+const ATTEMPT_TTL_MS = 30 * 60 * 1000;
+const IDEMPOTENCY_KEY_PATTERN = /^[A-Za-z0-9_-]{16,128}$/;