@ticketboothapp/booking 1.2.176 → 1.2.178

package/src/components/booking/useBookingAvailabilityAddOns.ts

@@ -1,15 +1,19 @@
 import { useEffect, useMemo, useRef, useState, type Dispatch, type SetStateAction } from 'react';
+import { formatInTimeZone } from 'date-fns-tz';
 import {
   getAddOns,
   type AddOn,
   type Availability,
 } from '../../lib/booking-api';
-import { getAvailabilityOptionId } from './change-booking-flow-helpers';
+import { getAvailabilityOptionId, parseAvailabilityDateTime } from './change-booking-flow-helpers';
 
 export interface UseBookingAvailabilityAddOnsParams {
   selectedAvailability: Availability | null;
   companyId?: string | null;
   onProductOptionChange?: () => void;
+  /** Ignore lead-time cutoffs for admin changes while continuing to honor blackout dates. */
+  ignoreCutoff?: boolean;
+  companyTimezone?: string;
 }
 
 export interface UseBookingAvailabilityAddOnsResult {
@@ -23,6 +27,8 @@ export function useBookingAvailabilityAddOns({
   selectedAvailability,
   companyId,
   onProductOptionChange,
+  ignoreCutoff = false,
+  companyTimezone,
 }: UseBookingAvailabilityAddOnsParams): UseBookingAvailabilityAddOnsResult {
   const [addOns, setAddOns] = useState<AddOn[]>([]);
   const [loadedProductOptionId, setLoadedProductOptionId] = useState<string | null>(null);
@@ -50,11 +56,20 @@ export function useBookingAvailabilityAddOns({
     getAddOns(companyId, {
       productOptionId: availabilityProductOptionId,
       preCheckout: true,
-      dateTime: availabilityDateTime ?? undefined,
+      dateTime: ignoreCutoff ? undefined : (availabilityDateTime ?? undefined),
     })
       .then((rows) => {
         if (cancelled) return;
-        setAddOns(rows);
+        let visibleRows = rows;
+        if (ignoreCutoff && availabilityDateTime && companyTimezone) {
+          const localDate = formatInTimeZone(
+            parseAvailabilityDateTime(availabilityDateTime),
+            companyTimezone,
+            'yyyy-MM-dd',
+          );
+          visibleRows = rows.filter((addOn) => !addOn.blackoutDates?.includes(localDate));
+        }
+        setAddOns(visibleRows);
         setLoadedProductOptionId(availabilityProductOptionId);
       })
       .catch(() => {
@@ -65,7 +80,14 @@ export function useBookingAvailabilityAddOns({
     return () => {
       cancelled = true;
     };
-  }, [availabilityProductOptionId, availabilityDateTime, companyId, onProductOptionChange]);
+  }, [
+    availabilityProductOptionId,
+    availabilityDateTime,
+    companyTimezone,
+    companyId,
+    ignoreCutoff,
+    onProductOptionChange,
+  ]);
 
   return {
     addOns,

package/src/components/booking/useChangeBookingProtectedPricing.ts

@@ -252,7 +252,7 @@ export function useChangeBookingProtectedPricing({
           : null;
         const name = variantLabel
           ? `${addOn.name} (${variantLabel})${qty > 1 ? ` \u00d7 ${qty}` : ''}`
-          : addOn.name;
+          : `${addOn.name}${qty > 1 ? ` \u00d7 ${qty}` : ''}`;
         return { name, totalAmount: amt, description: addOn.description ?? undefined };
       })
       .filter((x): x is NonNullable<typeof x> => x != null);

package/src/components/booking/usePrivateShuttlePriceSummary.ts

@@ -305,9 +305,12 @@ export function usePrivateShuttlePriceSummary({
         : null;
       const amount =
         ((addOn.price ?? 0) + (variant?.priceAdjustment ?? 0)) * (selection.quantity ?? 1);
+      const quantity = selection.quantity ?? 1;
       lineItems.push({
         type: 'FEE',
-        label: variant?.label ? `${addOn.name} (${variant.label})` : addOn.name,
+        label: variant?.label
+          ? `${addOn.name} (${variant.label})${quantity > 1 ? ` \u00d7 ${quantity}` : ''}`
+          : `${addOn.name}${quantity > 1 ? ` \u00d7 ${quantity}` : ''}`,
         amount: roundMoney(amount),
       });
     }
@@ -419,13 +422,17 @@ export function usePrivateShuttlePriceSummary({
         const hasVariant =
           (addOn.variantType === 'single_choice' || addOn.variantType === 'multi_quantity') &&
           selection.variantId;
-        const adjustment = hasVariant
-          ? (addOn.variants?.find((variant) => variant.id === selection.variantId)?.priceAdjustment ?? 0)
-          : 0;
+        const variant = hasVariant
+          ? addOn.variants?.find((candidate) => candidate.id === selection.variantId)
+          : null;
+        const adjustment = variant?.priceAdjustment ?? 0;
+        const quantity = selection.quantity ?? 1;
         return {
           kind: 'line',
-          label: addOn.name,
-          amount: (base + adjustment) * (selection.quantity ?? 1),
+          label: variant?.label
+            ? `${addOn.name} (${variant.label})${quantity > 1 ? ` \u00d7 ${quantity}` : ''}`
+            : `${addOn.name}${quantity > 1 ? ` \u00d7 ${quantity}` : ''}`,
+          amount: (base + adjustment) * quantity,
           type: 'fee',
         };
       })

package/src/components/booking/useStandardBookingPriceSummary.ts

@@ -267,7 +267,7 @@ export function useStandardBookingPriceSummary({
           : null;
         const name = variantLabel
           ? `${addOn.name} (${variantLabel})${quantity > 1 ? ` \u00d7 ${quantity}` : ''}`
-          : addOn.name;
+          : `${addOn.name}${quantity > 1 ? ` \u00d7 ${quantity}` : ''}`;
         return { name, totalAmount: amount, description: addOn.description ?? undefined };
       })
       .filter((line): line is NonNullable<typeof line> => line != null);

package/src/lib/booking-api.ts

@@ -808,13 +808,15 @@ export interface AddOn {
   addOnId: string;
   name: string;
   description?: string | null;
+  emoji?: string | null;
   price: number;
   currency: string;
   preCheckout: boolean;
-  postCheckout: boolean;
   variantType: 'none' | 'single_choice' | 'multi_quantity';
   variants: AddOnVariant[];
   productOptionIds: string[];
+  minHoursBeforeStart?: number | null;
+  blackoutDates?: string[];
 }
 
 export interface CompanySettings {

package/test/add-on-selection-helpers.test.ts

@@ -0,0 +1,24 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { selectedAddOnQuantity } from '../src/components/booking/add-on-selection-helpers';
+
+test('selectedAddOnQuantity totals variants and treats an omitted quantity as one', () => {
+  assert.equal(
+    selectedAddOnQuantity('addon_lunch', [
+      { addOnId: 'addon_lunch', quantity: 2 },
+      { addOnId: 'addon_lunch' },
+      { addOnId: 'addon_other', quantity: 9 },
+    ]),
+    3,
+  );
+});
+
+test('selectedAddOnQuantity ignores zero and negative quantities', () => {
+  assert.equal(
+    selectedAddOnQuantity('addon_lunch', [
+      { addOnId: 'addon_lunch', quantity: 0 },
+      { addOnId: 'addon_lunch', quantity: -2 },
+    ]),
+    0,
+  );
+});

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

@@ -114,6 +114,7 @@ import {
   resolveInitialPrivateShuttlePassengerCount,
 } from '../src/components/booking/private-shuttle-passenger-count';
 import { hasEffectiveAdminChangeSelection } from '../src/components/booking/useAdminProviderPricingAdjustments';
+import { buildPrivateShuttleCheckoutArtifacts } from '../src/components/booking/private-shuttle-checkout-builders';
 import {
   lineFromActiveAdjustment,
   reverseAdjustmentIdsForAdminCustomLines,
@@ -1903,7 +1904,6 @@ test('keeps an incompatible add-on visible until the admin explicitly removes it
     price: 28,
     currency: 'CAD',
     preCheckout: true,
-    postCheckout: false,
     variantType: 'multi_quantity' as const,
     variants: [
       {
@@ -2264,3 +2264,44 @@ test('exposes only authoritative selectable amendment components to admin adjust
     },
   ]);
 });
+
+test('private shuttle checkout receipt labels add-on variants and quantities', () => {
+  const artifacts = buildPrivateShuttleCheckoutArtifacts({
+    resourceCount: 1,
+    resourcePrice: 2199.99,
+    basePrice: 2199.99,
+    addOnSelections: [
+      { addOnId: 'addon_croissants', variantId: 'butter', quantity: 2 },
+    ],
+    addOns: [
+      {
+        addOnId: 'addon_croissants',
+        name: 'Croissants',
+        price: 5.99,
+        currency: 'CAD',
+        preCheckout: true,
+        variantType: 'multi_quantity',
+        variants: [{ id: 'butter', label: 'Butter Croissant', priceAdjustment: 0 }],
+        productOptionIds: [],
+      },
+    ],
+    additionalHoursAmount: 0,
+    additionalHoursCount: 0,
+    perBookingFeeLineItems: [],
+    cancellationPolicyFee: 0,
+    effectiveTaxAmount: 0,
+    taxLabel: 'Taxes and fees',
+    effectivePromoDiscountAmount: 0,
+    discountLabel: 'Discount',
+    promoLineType: 'PROMO_CODE',
+    depositInfo: null,
+    totalPrice: 2211.97,
+    currency: 'CAD',
+    pricingV2Quote: null,
+    roundingLabel: 'Rounding adjustment',
+  });
+
+  assert.deepEqual(artifacts.feeLineItemsForModal, [
+    { name: 'Croissants (Butter Croissant) \u00d7 2', totalAmount: 11.98 },
+  ]);
+});

package/test/private-shuttle-lunch-visibility.test.ts

@@ -0,0 +1,27 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import {
+  EMERALD_LAKE_LUNCH_ADD_ON_ID,
+  WILD_FLOUR_LUNCH_ADD_ON_ID,
+  privateShuttleHiddenLunchAddOnId,
+  privateShuttleLunchAddOnIsVisible,
+} from '../src/components/booking/private-shuttle-lunch-visibility';
+
+test('private shuttle shows only Emerald Lake lunch when Emerald Lake is selected', () => {
+  const destinations = ['moraine_lake', 'emerald_lake'];
+  assert.equal(privateShuttleLunchAddOnIsVisible(EMERALD_LAKE_LUNCH_ADD_ON_ID, destinations), true);
+  assert.equal(privateShuttleLunchAddOnIsVisible(WILD_FLOUR_LUNCH_ADD_ON_ID, destinations), false);
+  assert.equal(privateShuttleHiddenLunchAddOnId(destinations), WILD_FLOUR_LUNCH_ADD_ON_ID);
+});
+
+test('private shuttle shows only Wild Flour lunch without Emerald Lake', () => {
+  const destinations = ['moraine_lake', 'lake_louise'];
+  assert.equal(privateShuttleLunchAddOnIsVisible(EMERALD_LAKE_LUNCH_ADD_ON_ID, destinations), false);
+  assert.equal(privateShuttleLunchAddOnIsVisible(WILD_FLOUR_LUNCH_ADD_ON_ID, destinations), true);
+  assert.equal(privateShuttleHiddenLunchAddOnId(destinations), EMERALD_LAKE_LUNCH_ADD_ON_ID);
+});
+
+test('private shuttle leaves non-lunch add-ons visible', () => {
+  assert.equal(privateShuttleLunchAddOnIsVisible('addon_animals', ['emerald_lake']), true);
+  assert.equal(privateShuttleLunchAddOnIsVisible('addon_breakfast', []), true);
+});