@voyantjs/bookings-ui 0.80.18 → 0.81.5

package/dist/components/booking-create-dialog.d.ts

@@ -1,22 +1,4 @@
 import { type BookingRecord } from "@voyantjs/bookings-react";
-import { type OptionUnitsStepperUnit } from "./option-units-stepper-section.js";
-/**
- * Pick the unit for a traveler. Priorities:
- *   1. If we have an age (from DOB) and it falls into a unit's
- *      `[minAge, maxAge]` window, use that unit.
- *   2. Otherwise honor an explicit role hint (Child / Infant / Adult
- *      buttons) by mapping the hint to a representative age and
- *      matching the age band. This works for products whose units
- *      encode the band in the code (`child_0_5`, `child_6_12`) instead
- *      of bare `CHILD`/`INFANT`.
- *   3. Fall back to code/name matching for legacy products that don't
- *      configure min/max ages.
- *
- * `roleHint` covers the common case where the operator knows the
- * traveler is a child but doesn't have the exact DOB. Without it, a
- * roleless traveler would silently default to Adult pricing.
- */
-export declare function pickUnitForAge(units: OptionUnitsStepperUnit[], age: number | null, roleHint?: "adult" | "child" | "infant" | null): OptionUnitsStepperUnit | undefined;
 export interface BookingCreateDialogProps {
     open: boolean;
     onOpenChange: (open: boolean) => void;

package/dist/components/booking-create-dialog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"booking-create-dialog.d.ts","sourceRoot":"","sources":["../../src/components/booking-create-dialog.tsx"],"names":[],"mappings":"AASA,OAAO,EAML,KAAK,aAAa,EAGnB,MAAM,0BAA0B,CAAA;AAiCjC,OAAO,EAGL,KAAK,sBAAsB,EAE5B,MAAM,mCAAmC,CAAA;AA6J1C;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,sBAAsB,EAAE,EAC/B,GAAG,EAAE,MAAM,GAAG,IAAI,EAClB,QAAQ,GAAE,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,IAAW,GACnD,sBAAsB,GAAG,SAAS,CAoCpC;AA4JD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,OAAO,CAAA;IACb,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IACrC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAA;IAC5C,4EAA4E;IAC5E,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,+DAA+D;IAC/D,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAA;IAC5C,4EAA4E;IAC5E,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,+DAA+D;IAC/D,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,sEAAsE;IACtE,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;CACtB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,aAAa,GACd,EAAE,wBAAwB,2CAsB1B;AAED,wBAAgB,iBAAiB,CAAC,EAChC,SAAS,EACT,gBAAgB,EAChB,aAAa,EACb,OAAc,EACd,QAAQ,GACT,EAAE,sBAAsB,2CAo5BxB"}
+{"version":3,"file":"booking-create-dialog.d.ts","sourceRoot":"","sources":["../../src/components/booking-create-dialog.tsx"],"names":[],"mappings":"AAeA,OAAO,EAKL,KAAK,aAAa,EAInB,MAAM,0BAA0B,CAAA;AAkQjC,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,OAAO,CAAA;IACb,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IACrC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAA;IAC5C,4EAA4E;IAC5E,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,+DAA+D;IAC/D,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAA;IAC5C,4EAA4E;IAC5E,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,+DAA+D;IAC/D,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,sEAAsE;IACtE,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;CACtB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,aAAa,GACd,EAAE,wBAAwB,2CAsB1B;AAED,wBAAgB,iBAAiB,CAAC,EAChC,SAAS,EACT,gBAAgB,EAChB,aAAa,EACb,OAAc,EACd,QAAQ,GACT,EAAE,sBAAsB,2CA89BxB"}

package/dist/components/booking-create-dialog.js

@@ -2,7 +2,8 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useQueries, useQuery } from "@tanstack/react-query";
 import { getSlotQueryOptions, useSlots, useSlotUnitAvailability, useVoyantAvailabilityContext, } from "@voyantjs/availability-react";
-import { useBookingCreateMutation, useBookingTaxPreview, } from "@voyantjs/bookings-react";
+import { resolveBookingDraft, resolveBookingExtraLines, travelersToRows, } from "@voyantjs/bookings/pricing-assignment";
+import { useBookingCreateMutation, useBookingTaxPreview, VoyantApiError, } from "@voyantjs/bookings-react";
 import { useOrganization, usePerson } from "@voyantjs/crm-react";
 import { useProductExtras } from "@voyantjs/extras-react";
 import { useAddresses } from "@voyantjs/identity-react";
@@ -20,7 +21,7 @@ import { emptyPersonPickerValue, PersonPickerSection, } from "./person-picker-se
 import { PriceBreakdownSection } from "./price-breakdown-section.js";
 import { ProductPickerSection } from "./product-picker-section.js";
 import { emptySharedRoomValue, SharedRoomSection, } from "./shared-room-section.js";
-import { computeAgeYears, emptyTravelerListValue, TravelersSection, } from "./travelers-section.js";
+import { emptyTravelerListValue, TravelersSection, } from "./travelers-section.js";
 import { emptyVoucherPickerValue, VoucherPickerSection, } from "./voucher-picker-section.js";
 function generateBookingNumber() {
     const now = new Date();
@@ -117,186 +118,6 @@ function stripOptionPrefix(name) {
     const idx = name.indexOf(" - ");
     return idx > 0 ? name.slice(idx + 3) : name;
 }
-/**
- * Pick the unit for a traveler. Priorities:
- *   1. If we have an age (from DOB) and it falls into a unit's
- *      `[minAge, maxAge]` window, use that unit.
- *   2. Otherwise honor an explicit role hint (Child / Infant / Adult
- *      buttons) by mapping the hint to a representative age and
- *      matching the age band. This works for products whose units
- *      encode the band in the code (`child_0_5`, `child_6_12`) instead
- *      of bare `CHILD`/`INFANT`.
- *   3. Fall back to code/name matching for legacy products that don't
- *      configure min/max ages.
- *
- * `roleHint` covers the common case where the operator knows the
- * traveler is a child but doesn't have the exact DOB. Without it, a
- * roleless traveler would silently default to Adult pricing.
- */
-export function pickUnitForAge(units, age, roleHint = null) {
-    if (units.length === 0)
-        return undefined;
-    const personUnits = units.filter((u) => u.unitType == null || u.unitType === "person");
-    const pool = personUnits.length > 0 ? personUnits : units;
-    const sorted = [...pool].sort((a, b) => (a.minAge ?? 0) - (b.minAge ?? 0));
-    const matchByAge = (target) => sorted.find((u) => (u.minAge == null || target >= u.minAge) && (u.maxAge == null || target <= u.maxAge));
-    if (age != null) {
-        const match = matchByAge(age);
-        if (match)
-            return match;
-    }
-    if (roleHint) {
-        const HINT_AGE = { adult: 30, child: 8, infant: 1 };
-        const hintAge = HINT_AGE[roleHint];
-        // Only consider units with at least one explicit age bound. Without
-        // this, legacy units with null min/max (just bare ADULT/CHILD codes)
-        // would all match every hint age and collapse onto the first sorted
-        // entry (almost always Adult). Code-matching below handles those.
-        const banded = sorted.filter((u) => u.minAge != null || u.maxAge != null);
-        const match = banded.find((u) => (u.minAge == null || hintAge >= u.minAge) && (u.maxAge == null || hintAge <= u.maxAge));
-        if (match)
-            return match;
-    }
-    const findByCode = (code) => sorted.find((u) => (u.unitCode ?? "").toUpperCase() === code) ??
-        sorted.find((u) => new RegExp(`\\b${code}\\b`, "i").test(u.unitName));
-    if (roleHint === "child")
-        return findByCode("CHILD") ?? sorted[0];
-    if (roleHint === "infant")
-        return findByCode("INFANT") ?? sorted[0];
-    return findByCode("ADULT") ?? sorted[sorted.length - 1] ?? sorted[0];
-}
-/**
- * Take the operator-picked per-option quantities (which are tracked
- * against each option's primary "Adult" unit by the stepper) plus the
- * travelers list, and redistribute both so that:
- *   - each traveler's `roomUnitId` points at the age-banded unit
- *     matching their DOB (Adult / Child / Infant / etc.)
- *   - `quantities` reflects the per-unit counts after redistribution —
- *     a 3-pax "Standard double" with 2 adults + 1 child becomes
- *     `{ adultUnit: 2, childUnit: 1 }` instead of `{ adultUnit: 3 }`.
- *
- * Slots without a configured `dateOfBirth` keep the option's adult
- * default so partially-filled bookings still typecheck.
- */
-/**
- * Rebuild stepper quantities from per-traveler unit assignments.
- *
- * Each traveler's `roomUnitId` is now the operator's explicit choice
- * (DOB-pre-picked at attach, overridable via the dynamic category
- * buttons), so we count assignments directly and add any per-option
- * residual on the adult/primary unit when the stepper qty exceeds the
- * number of travelers actually assigned. Unlike the older
- * DOB-driven rewrite, this never moves a traveler off their chosen
- * unit — operator selection always wins.
- */
-function redistributeByAge(quantities, travelers, units) {
-    if (units.length === 0)
-        return { quantities, travelers };
-    const unitsByOption = new Map();
-    for (const unit of units) {
-        if (!unit.optionId)
-            continue;
-        const list = unitsByOption.get(unit.optionId);
-        if (list)
-            list.push(unit);
-        else
-            unitsByOption.set(unit.optionId, [unit]);
-    }
-    const unitToOption = new Map(units.map((u) => [u.optionUnitId, u.optionId]));
-    const unitById = new Map(units.map((u) => [u.optionUnitId, u]));
-    // Per-option total from the stepper. This is the count the operator
-    // committed to when picking rooms.
-    const totalByOption = new Map();
-    for (const [unitId, qty] of Object.entries(quantities)) {
-        if (qty <= 0)
-            continue;
-        const optionId = unitToOption.get(unitId);
-        if (!optionId)
-            continue;
-        totalByOption.set(optionId, (totalByOption.get(optionId) ?? 0) + qty);
-    }
-    const assignedForDefaulting = new Map();
-    for (const traveler of travelers) {
-        if (!traveler.roomUnitId)
-            continue;
-        const optionId = unitToOption.get(traveler.roomUnitId);
-        if (!optionId)
-            continue;
-        assignedForDefaulting.set(optionId, (assignedForDefaulting.get(optionId) ?? 0) + 1);
-    }
-    const optionDemand = Array.from(totalByOption.entries());
-    const nextTravelers = travelers.map((traveler) => {
-        if (traveler.roomUnitId && unitById.has(traveler.roomUnitId))
-            return traveler;
-        const optionId = optionDemand.find(([candidate, total]) => (assignedForDefaulting.get(candidate) ?? 0) < total)?.[0] ?? optionDemand[0]?.[0];
-        if (!optionId)
-            return traveler;
-        const age = computeAgeYears(traveler.dateOfBirth);
-        const roleHint = traveler.role === "adult" || traveler.role === "child" || traveler.role === "infant"
-            ? traveler.role
-            : null;
-        const unit = pickUnitForAge(unitsByOption.get(optionId) ?? [], age, roleHint);
-        if (!unit)
-            return traveler;
-        assignedForDefaulting.set(optionId, (assignedForDefaulting.get(optionId) ?? 0) + 1);
-        return { ...traveler, roomUnitId: unit.optionUnitId };
-    });
-    // Count actual traveler assignments per unit + per option.
-    const next = {};
-    const assignedByOption = new Map();
-    for (const t of nextTravelers) {
-        if (!t.roomUnitId)
-            continue;
-        const optionId = unitToOption.get(t.roomUnitId);
-        if (!optionId)
-            continue;
-        next[t.roomUnitId] = (next[t.roomUnitId] ?? 0) + 1;
-        assignedByOption.set(optionId, (assignedByOption.get(optionId) ?? 0) + 1);
-    }
-    // Residual = operator picked N rooms but only added M travelers; put
-    // the leftover on the option's adult/primary unit so the price total
-    // matches the stepper.
-    for (const [optionId, total] of totalByOption) {
-        const assigned = assignedByOption.get(optionId) ?? 0;
-        const residual = Math.max(0, total - assigned);
-        if (residual === 0)
-            continue;
-        const adult = pickUnitForAge(unitsByOption.get(optionId) ?? [], null);
-        if (!adult)
-            continue;
-        next[adult.optionUnitId] = (next[adult.optionUnitId] ?? 0) + residual;
-    }
-    return { quantities: next, travelers: nextTravelers };
-}
-function travelersToRows(value) {
-    return value.travelers.map((traveler) => {
-        // Age-derived category (DOB-driven). The `role` field still
-        // carries the `lead` flag separately for the booking primary; the
-        // demographic category comes from age, not from a manual select.
-        const age = computeAgeYears(traveler.dateOfBirth);
-        const ageCategory = age == null
-            ? traveler.role === "child" || traveler.role === "infant" || traveler.role === "adult"
-                ? traveler.role
-                : null
-            : age < 2
-                ? "infant"
-                : age < 18
-                    ? "child"
-                    : "adult";
-        return {
-            personId: traveler.personId,
-            firstName: traveler.firstName.trim(),
-            lastName: traveler.lastName.trim(),
-            email: traveler.email.trim() || null,
-            phone: traveler.phone.trim() || null,
-            preferredLanguage: traveler.preferredLanguage.trim() || null,
-            participantType: "traveler",
-            travelerCategory: ageCategory,
-            isPrimary: traveler.role === "lead",
-            roomUnitId: traveler.roomUnitId,
-        };
-    });
-}
 function sameRoomUnits(left, right) {
     if (left.length !== right.length)
         return false;
@@ -310,6 +131,37 @@ function sameRoomUnits(left, right) {
             unit.remaining === other.remaining);
     });
 }
+function isPayloadResolverMismatchBody(body) {
+    if (typeof body !== "object" || body === null)
+        return false;
+    const candidate = body;
+    return (candidate.code === "payload_resolver_mismatch" &&
+        Array.isArray(candidate.mismatches) &&
+        candidate.mismatches.every((mismatch) => {
+            if (typeof mismatch !== "object" || mismatch === null)
+                return false;
+            const item = mismatch;
+            return ((item.kind === "qty" || item.kind === "missing" || item.kind === "extra") &&
+                typeof item.optionUnitId === "string" &&
+                typeof item.submittedQuantity === "number" &&
+                typeof item.resolvedQuantity === "number");
+        }));
+}
+function formatPayloadResolverMismatchError(body, unitLabels, validationMessages) {
+    const details = body.mismatches
+        .map((mismatch) => {
+        const label = unitLabels[mismatch.optionUnitId] ?? mismatch.optionUnitId;
+        return formatMessage(validationMessages.payloadResolverMismatchLine, {
+            label,
+            resolvedQuantity: mismatch.resolvedQuantity,
+            submittedQuantity: mismatch.submittedQuantity,
+        });
+    })
+        .join("; ");
+    return details
+        ? formatMessage(validationMessages.payloadResolverMismatchDetails, { details })
+        : validationMessages.payloadResolverMismatchFallback;
+}
 /**
  * Operator booking-create dialog. Composes the booking-create picker
  * sections — product, departure, rooms, person, shared-room, travelers,
@@ -361,6 +213,7 @@ export function BookingCreateForm({ onCreated, defaultProductId, defaultSlotId,
     // bundle. Defaults on so the operator opts out, not in.
     const [notifyTraveler, setNotifyTraveler] = React.useState(true);
     const [error, setError] = React.useState(null);
+    const [payloadMismatchUnitIds, setPayloadMismatchUnitIds] = React.useState([]);
     const { formatDate } = useBookingsUiI18nOrDefault();
     const messages = useBookingsUiMessagesOrDefault();
     const availabilityClient = useVoyantAvailabilityContext();
@@ -392,6 +245,7 @@ export function BookingCreateForm({ onCreated, defaultProductId, defaultSlotId,
             setCreateAsDraft(false);
             setNotifyTraveler(true);
             setError(null);
+            setPayloadMismatchUnitIds([]);
         }
         else if (resolvedDefaultProductId) {
             setProduct((prev) => {
@@ -415,6 +269,7 @@ export function BookingCreateForm({ onCreated, defaultProductId, defaultSlotId,
         setRoomUnits([]);
         setSharedRoom(emptySharedRoomValue);
         setExtraLines([]);
+        setPayloadMismatchUnitIds([]);
     }, [product.productId, defaultSlotId]);
     const [slotsFromIso, setSlotsFromIso] = React.useState(() => new Date().toISOString());
     React.useEffect(() => {
@@ -443,6 +298,7 @@ export function BookingCreateForm({ onCreated, defaultProductId, defaultSlotId,
     }, [slotsData?.data, slotsFromIso, product.optionId, allOpenSlots]);
     const selectedSlot = React.useMemo(() => slots.find((slot) => slot.id === slotId) ?? (defaultSlot?.id === slotId ? defaultSlot : null), [slots, slotId, defaultSlot]);
     const setSelectedSlot = React.useCallback((nextSlotId) => {
+        setPayloadMismatchUnitIds([]);
         const selectedSlot = nextSlotId ? allOpenSlots.find((slot) => slot.id === nextSlotId) : null;
         if (selectedSlot?.optionId && selectedSlot.optionId !== product.optionId) {
             setProduct((prev) => ({ ...prev, optionId: selectedSlot.optionId }));
@@ -452,6 +308,7 @@ export function BookingCreateForm({ onCreated, defaultProductId, defaultSlotId,
     React.useEffect(() => {
         setRooms(emptyOptionUnitsStepperValue);
         setRoomUnits([]);
+        setPayloadMismatchUnitIds([]);
         if (!slotId || !product.optionId)
             return;
         const selectedDeparture = allOpenSlots.find((slot) => slot.id === slotId) ??
@@ -482,29 +339,25 @@ export function BookingCreateForm({ onCreated, defaultProductId, defaultSlotId,
     const handleRoomUnitsChange = React.useCallback((units) => {
         setRoomUnits((prev) => (sameRoomUnits(prev, units) ? prev : units));
     }, []);
-    // Room choices presented to the traveler row are *options* (e.g.
-    // "Standard double", "Junior suite upgrade") — NOT option-units
-    // (Adult / Child / Senior). The age-band lives separately on the
-    // traveler and only affects pricing; both an adult and a child sit
-    // in the same Standard double room. Each entry's `unitId` is set to
-    // the option's primary unit so existing `roomUnitId`-keyed plumbing
-    // (assignment, redistribution) keeps working — `redistributeByAge`
-    // moves the traveler to the matching age-banded unit at submit.
+    // Room choices presented to the traveler row are inventory options
+    // (e.g. "Standard double", "Junior suite upgrade"). The age-band
+    // lives separately on the traveler as a pricing unit.
     const roomUnitOptions = React.useMemo(() => {
-        const units = getTravelerAssignableStepperUnits(roomUnits.length > 0 ? roomUnits : (slotUnitAvailability.data?.data ?? []));
+        const sourceUnits = roomUnits.length > 0 ? roomUnits : (slotUnitAvailability.data?.data ?? []);
+        const quantityByOption = new Map();
+        for (const unit of sourceUnits) {
+            const key = unit.optionId ?? unit.optionUnitId;
+            quantityByOption.set(key, (quantityByOption.get(key) ?? 0) + (rooms.quantities[unit.optionUnitId] ?? 0));
+        }
+        const units = sourceUnits.filter((unit) => unit.unitType === "room" || unit.unitType === "vehicle");
         if (units.length === 0)
             return [];
         const optionGroups = new Map();
         for (const unit of units) {
             const key = unit.optionId ?? unit.optionUnitId;
-            // Prefer an ADULT-coded primary; the stepper routes per-option
-            // qty through the same unit so seat math stays consistent.
-            const isAdult = (unit.unitCode ?? "").toUpperCase() === "ADULT";
             const existing = optionGroups.get(key);
             if (existing) {
                 existing.units.push(unit);
-                if (isAdult)
-                    existing.primaryUnitId = unit.optionUnitId;
             }
             else {
                 optionGroups.set(key, {
@@ -518,15 +371,17 @@ export function BookingCreateForm({ onCreated, defaultProductId, defaultSlotId,
         }
         return Array.from(optionGroups.values())
             .filter((group) => {
-            const totalQty = group.units.reduce((sum, u) => sum + (rooms.quantities[u.optionUnitId] ?? 0), 0);
+            const optionKey = group.units[0]?.optionId ?? group.primaryUnitId;
+            const totalQty = quantityByOption.get(optionKey) ?? 0;
             return totalQty > 0;
         })
             .map((group) => {
-            const totalQty = group.units.reduce((sum, u) => sum + (rooms.quantities[u.optionUnitId] ?? 0), 0);
+            const optionKey = group.units[0]?.optionId ?? group.primaryUnitId;
+            const totalQty = quantityByOption.get(optionKey) ?? 0;
             const occupancyMax = Math.max(1, ...group.units.map((u) => u.occupancyMax ?? 1));
             const seats = totalQty * occupancyMax;
             const optionUnitIds = new Set(group.units.map((u) => u.optionUnitId));
-            const assigned = travelers.travelers.filter((traveler) => traveler.roomUnitId && optionUnitIds.has(traveler.roomUnitId)).length;
+            const assigned = travelers.travelers.filter((traveler) => traveler.inventoryUnitId && optionUnitIds.has(traveler.inventoryUnitId)).length;
             return {
                 unitId: group.primaryUnitId,
                 unitName: group.optionName,
@@ -540,14 +395,14 @@ export function BookingCreateForm({ onCreated, defaultProductId, defaultSlotId,
     // `roomUnitOptions` but exposes every unit instead of collapsing
     // to one primary.
     const roomGroups = React.useMemo(() => {
-        const travelerUnits = getTravelerAssignableStepperUnits(roomUnits);
-        if (travelerUnits.length === 0)
+        if (roomUnits.length === 0)
             return [];
         const groups = new Map();
-        for (const u of travelerUnits) {
+        for (const u of roomUnits) {
             if (!u.optionId)
                 continue;
             const groupKey = u.optionId;
+            const isInventory = u.unitType === "room" || u.unitType === "vehicle";
             const isAdultCoded = (u.unitCode ?? "").toUpperCase() === "ADULT";
             const unit = {
                 unitId: u.optionUnitId,
@@ -563,8 +418,12 @@ export function BookingCreateForm({ onCreated, defaultProductId, defaultSlotId,
             const existing = groups.get(groupKey);
             if (existing) {
                 existing.units.push(unit);
-                if (isAdultCoded)
+                if (isInventory)
                     existing.primaryUnitId = u.optionUnitId;
+                else if (isAdultCoded &&
+                    !existing.units.some((candidate) => candidate.unitType === "room" || candidate.unitType === "vehicle")) {
+                    existing.primaryUnitId = u.optionUnitId;
+                }
             }
             else {
                 groups.set(groupKey, {
@@ -577,12 +436,20 @@ export function BookingCreateForm({ onCreated, defaultProductId, defaultSlotId,
         }
         return Array.from(groups.values());
     }, [roomUnits]);
-    // Apply the same age-banded redistribution we use at submit so the
-    // live price preview matches what the operator will actually be
-    // billed. Without this, the breakdown sees only the option's primary
-    // (Adult) unit qty from the stepper, missing the per-traveler split
-    // between adult / child / infant tiers.
-    const displayQuantities = React.useMemo(() => redistributeByAge(rooms.quantities, travelers.travelers, getTravelerAssignableStepperUnits(roomUnits)).quantities, [rooms.quantities, travelers.travelers, roomUnits]);
+    // Apply the same draft resolver we use at submit so live pricing
+    // and persisted item lines cannot drift. Person-priced options
+    // (excursions) derive line quantities from the traveler list;
+    // accommodation options preserve operator-picked stepper quantities.
+    const displayDraft = React.useMemo(() => resolveBookingDraft({
+        quantities: rooms.quantities,
+        travelers: travelers.travelers,
+        units: roomUnits,
+    }), [rooms.quantities, travelers.travelers, roomUnits]);
+    const displayQuantities = displayDraft.quantities;
+    const displayExtraLines = React.useMemo(() => resolveBookingExtraLines({
+        extraLines,
+        travelerCount: travelers.travelers.length,
+    }), [extraLines, travelers.travelers.length]);
     // Currency placeholder — used for voucher + payment schedule display.
     // Consumers hooking in real product data should override this by wrapping
     // the component or swapping in their own currency-aware hook.
@@ -622,6 +489,7 @@ export function BookingCreateForm({ onCreated, defaultProductId, defaultSlotId,
     const hasSelectedUnits = React.useMemo(() => Object.values(rooms.quantities).some((qty) => qty > 0), [rooms.quantities]);
     const handleSubmit = async () => {
         setError(null);
+        setPayloadMismatchUnitIds([]);
         if (!product.productId) {
             setError(messages.bookingCreateDialog.validation.selectProduct);
             return;
@@ -683,17 +551,40 @@ export function BookingCreateForm({ onCreated, defaultProductId, defaultSlotId,
                 return;
             }
             const paymentSchedules = paymentScheduleToRows(paymentSchedule, pricingCurrency, confirmedSellAmountCents);
-            // Age-banded redistribution: turn the operator's per-option
-            // quantities + raw traveler list into per-unit quantities + each
-            // traveler's matching unit assignment, driven by DOB.
+            // Resolve the draft once, then derive every shape the wire
+            // format needs from the result. Person-priced options get
+            // per-band quantities (1 adult + 1 child + 1 infant, not
+            // "3 x Adult"); accommodation options keep operator-picked
+            // room quantities. Server gets `clientLineKey` + `travelerKeys`
+            // on each line so it can write `booking_item_travelers` rows.
             const submitUnits = roomUnits.length > 0
-                ? getTravelerAssignableStepperUnits(roomUnits)
+                ? roomUnits
                 : getTravelerAssignableStepperUnits((slotUnitAvailability.data?.data ?? []).map((unit) => ({
                     ...unit,
                     optionId: product.optionId,
                 })));
-            const redistributed = redistributeByAge(rooms.quantities, travelers.travelers, submitUnits);
-            const itemLines = itemLinesToRows(redistributed.quantities, submitUnits, pricing);
+            const redistributed = resolveBookingDraft({
+                quantities: rooms.quantities,
+                travelers: travelers.travelers,
+                units: submitUnits,
+            });
+            const travelerKeysByUnitId = Object.fromEntries(Object.entries(redistributed.travelerIndexesByUnitId).map(([unitId, indexes]) => [
+                unitId,
+                indexes.every((index) => Boolean(redistributed.travelers[index]?.clientTravelerKey))
+                    ? indexes
+                        .map((index) => redistributed.travelers[index]?.clientTravelerKey)
+                        .filter((key) => Boolean(key))
+                    : [],
+            ]));
+            const travelerKeys = redistributed.travelers
+                .map((traveler) => traveler.clientTravelerKey)
+                .filter((key) => Boolean(key));
+            const itemLines = itemLinesToRows(redistributed.quantities, submitUnits, pricing, redistributed.travelerIndexesByUnitId, travelerKeysByUnitId);
+            const resolvedExtraLines = resolveBookingExtraLines({
+                extraLines,
+                travelerCount: travelers.travelers.length,
+                travelerKeys: travelerKeys.length === redistributed.travelers.length ? travelerKeys : undefined,
+            });
             const travelerRows = travelersToRows({ travelers: redistributed.travelers });
             const voucherRedemption = voucher.picked && voucher.picked.remainingAmountCents != null
                 ? {
@@ -773,7 +664,7 @@ export function BookingCreateForm({ onCreated, defaultProductId, defaultSlotId,
                 confirmedSellAmountCents,
                 priceOverrideReason: priceOverrideReason || null,
                 itemLines: itemLines.length > 0 ? itemLines : undefined,
-                extraLines: extraLines.length > 0 ? extraLines : undefined,
+                extraLines: resolvedExtraLines.length > 0 ? resolvedExtraLines : undefined,
                 travelers: travelerRows.length > 0 ? travelerRows : undefined,
                 paymentSchedules: paymentSchedules.length > 0 ? paymentSchedules : undefined,
                 voucherRedemption,
@@ -792,15 +683,26 @@ export function BookingCreateForm({ onCreated, defaultProductId, defaultSlotId,
             onCreated?.(booking);
         }
         catch (err) {
+            if (err instanceof VoyantApiError && isPayloadResolverMismatchBody(err.body)) {
+                setPayloadMismatchUnitIds(Array.from(new Set(err.body.mismatches.map((mismatch) => mismatch.optionUnitId))));
+                setError(formatPayloadResolverMismatchError(err.body, roomUnitLabels, messages.bookingCreateDialog.validation));
+                return;
+            }
             setError(err instanceof Error ? err.message : messages.bookingCreateDialog.validation.createFailed);
         }
     };
     const isSubmitting = createBookingMutation.isPending;
-    return (_jsxs("div", { className: "grid min-h-0 flex-1 gap-6 lg:grid-cols-12", children: [_jsxs("div", { className: "flex min-h-0 min-w-0 flex-col lg:col-span-8", children: [_jsxs("div", { className: "flex flex-1 flex-col gap-4 overflow-y-auto px-1 pb-2", children: [_jsx(ProductPickerSection, { value: product, onChange: setProduct, enabled: enabled, lockProduct: Boolean(defaultProductId || defaultSlotId), labels: {
+    return (_jsxs("div", { className: "grid min-h-0 flex-1 gap-6 lg:grid-cols-12", children: [_jsxs("div", { className: "flex min-h-0 min-w-0 flex-col lg:col-span-8", children: [_jsxs("div", { className: "flex flex-1 flex-col gap-4 overflow-y-auto px-1 pb-2", children: [_jsx(ProductPickerSection, { value: product, onChange: (next) => {
+                                    setPayloadMismatchUnitIds([]);
+                                    setProduct(next);
+                                }, enabled: enabled, lockProduct: Boolean(defaultProductId || defaultSlotId), labels: {
                                     optionNone: messages.bookingCreateDialog.labels.noSpecificOption,
-                                }, showOptionPicker: false }), product.productId ? (_jsxs("div", { className: "flex flex-col gap-1", children: [_jsx(Label, { children: messages.bookingCreateDialog.fields.departure }), _jsx(AsyncCombobox, { value: slotId, onChange: (v) => setSelectedSlot(v), items: slots, selectedItem: selectedSlot, getKey: (slot) => slot.id, getLabel: (slot) => formatSlotLabel(slot), placeholder: messages.bookingCreateDialog.placeholders.departure, emptyText: messages.bookingCreateDialog.placeholders.departureEmpty, triggerClassName: "w-full", disabled: Boolean(defaultSlotId), clearable: !defaultSlotId })] })) : null, product.productId && slotId ? (_jsx(OptionUnitsStepperSection, { value: rooms, onChange: setRooms, productId: product.productId, slotId: slotId, optionId: product.optionId, enabled: enabled, onUnitsChange: handleRoomUnitsChange, slotHasFiniteCapacity: Boolean(selectedSlot) &&
+                                }, showOptionPicker: false }), product.productId ? (_jsxs("div", { className: "flex flex-col gap-1", children: [_jsx(Label, { children: messages.bookingCreateDialog.fields.departure }), _jsx(AsyncCombobox, { value: slotId, onChange: (v) => setSelectedSlot(v), items: slots, selectedItem: selectedSlot, getKey: (slot) => slot.id, getLabel: (slot) => formatSlotLabel(slot), placeholder: messages.bookingCreateDialog.placeholders.departure, emptyText: messages.bookingCreateDialog.placeholders.departureEmpty, triggerClassName: "w-full", disabled: Boolean(defaultSlotId), clearable: !defaultSlotId })] })) : null, product.productId && slotId ? (_jsx(OptionUnitsStepperSection, { value: rooms, onChange: (next) => {
+                                    setPayloadMismatchUnitIds([]);
+                                    setRooms(next);
+                                }, productId: product.productId, slotId: slotId, optionId: product.optionId, enabled: enabled, onUnitsChange: handleRoomUnitsChange, slotHasFiniteCapacity: Boolean(selectedSlot) &&
                                     !selectedSlot?.unlimited &&
-                                    typeof selectedSlot?.remainingPax === "number", labels: {
+                                    typeof selectedSlot?.remainingPax === "number", invalidOptionUnitIds: payloadMismatchUnitIds, labels: {
                                     heading: messages.bookingCreateDialog.labels.roomsHeading,
                                     noOption: messages.bookingCreateDialog.labels.roomsNoOption,
                                     noSlot: messages.bookingCreateDialog.labels.roomsNoSlot,
@@ -825,7 +727,10 @@ export function BookingCreateForm({ onCreated, defaultProductId, defaultSlotId,
                                     noGroups: messages.bookingCreateDialog.labels.sharedRoomNoGroups,
                                     createHint: messages.bookingCreateDialog.labels.sharedRoomCreateHint,
                                     remove: messages.bookingCreateDialog.labels.sharedRoomRemove,
-                                } })) : null, product.productId && slotId ? (_jsx(TravelersSection, { value: travelers, onChange: setTravelers, roomUnits: roomUnitOptions.length > 0 ? roomUnitOptions : undefined, roomGroups: roomGroups.length > 0 ? roomGroups : undefined, billingPersonId: (person.billTo ?? "person") === "person" ? person.personId : null, labels: {
+                                } })) : null, product.productId && slotId ? (_jsx(TravelersSection, { value: travelers, onChange: (next) => {
+                                    setPayloadMismatchUnitIds([]);
+                                    setTravelers(next);
+                                }, roomUnits: roomUnitOptions.length > 0 ? roomUnitOptions : undefined, roomGroups: roomGroups.length > 0 ? roomGroups : undefined, billingPersonId: (person.billTo ?? "person") === "person" ? person.personId : null, labels: {
                                     heading: messages.bookingCreateDialog.labels.travelerHeading,
                                     addTraveler: messages.bookingCreateDialog.labels.addTraveler,
                                     person: messages.bookingCreateDialog.labels.travelerPerson,
@@ -858,7 +763,7 @@ export function BookingCreateForm({ onCreated, defaultProductId, defaultSlotId,
                                             : messages.bookingCreateDialog.actions.createAwaitingPaymentBooking] })] })] }), _jsxs("div", { className: "flex flex-col gap-4 lg:col-span-4", children: [_jsx(BookingPreviewCard, { productId: product.productId, optionId: product.optionId, slotId: slotId, slotLabel: (() => {
                             const slot = slots.find((s) => s.id === slotId);
                             return slot ? formatSlotLabel(slot) : null;
-                        })(), unitQuantities: displayQuantities, unitLabels: roomUnitLabels, extraLines: extraLines, travelers: travelers.travelers, messages: messages, onPricingChange: setPricing }), product.productId && slotId ? (_jsx(VoucherPickerSection, { value: voucher, onChange: setVoucher, currency: currency, labels: {
+                        })(), unitQuantities: displayQuantities, unitLabels: roomUnitLabels, extraLines: displayExtraLines, travelers: travelers.travelers, messages: messages, onPricingChange: setPricing }), product.productId && slotId ? (_jsx(VoucherPickerSection, { value: voucher, onChange: setVoucher, currency: currency, labels: {
                             heading: messages.bookingCreateDialog.labels.voucherHeading,
                             codePlaceholder: messages.bookingCreateDialog.labels.voucherCodePlaceholder,
                             apply: messages.bookingCreateDialog.labels.voucherApply,

package/dist/components/booking-create-utils.d.ts

@@ -42,7 +42,7 @@ export declare function getBookableDepartureSlots<TSlot extends DepartureSlotSea
     nowIso: string;
     optionId: string | null;
 }): TSlot[];
-export declare function itemLinesToRows(quantities: Record<string, number>, units: BookingCreateUnitLineRecord[], pricing: BookingCreatePricingRecord | null): BookingCreateItemLineInput[];
+export declare function itemLinesToRows(quantities: Record<string, number>, units: BookingCreateUnitLineRecord[], pricing: BookingCreatePricingRecord | null, travelerIndexesByUnitId?: Record<string, number[]>, travelerKeysByUnitId?: Record<string, string[]>): BookingCreateItemLineInput[];
 export declare function getSelectedSharedRoomUnitId(quantities: Record<string, number>): string | null;
 export {};
 //# sourceMappingURL=booking-create-utils.d.ts.map

package/dist/components/booking-create-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"booking-create-utils.d.ts","sourceRoot":"","sources":["../../src/components/booking-create-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAA;AAC1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAE7D,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAAC,aAAa,EAAE,aAAa,GAAG,MAAM,GAAG,cAAc,CAAC,CAAA;AAEpG,MAAM,WAAW,yBAAyB;IACxC,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,8BAA8B;IAC7C,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAA;CAChC;AAED,MAAM,WAAW,0BAA0B;IACzC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAA;IACnC,KAAK,EAAE,8BAA8B,EAAE,CAAA;CACxC;AAED,KAAK,4BAA4B,GAC7B,QAAQ,GACR,OAAO,GACP,MAAM,GACN,SAAS,GACT,SAAS,GACT,OAAO,GACP,IAAI,CAAA;AAER,MAAM,WAAW,yCAAyC;IACxD,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,4BAA4B,CAAA;CACxC;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAMhE;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAIjG;AAED,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,yBAAyB,GAAG,IAAI,GAAG,SAAS,EACrD,KAAK,EAAE,MAAM,GACZ,OAAO,CAKT;AAED,MAAM,MAAM,oCAAoC,GAAG,OAAO,GAAG,iBAAiB,GAAG,eAAe,CAAA;AAEhG,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAI5E;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,GAC3E,oCAAoC,CAOtC;AAED,wBAAgB,iCAAiC,CAC/C,KAAK,SAAS,yCAAyC,EACvD,KAAK,EAAE,SAAS,KAAK,EAAE,GAAG,KAAK,EAAE,CAclC;AAED,wBAAgB,yBAAyB,CAAC,KAAK,SAAS,yBAAyB,EAC/E,KAAK,EAAE,SAAS,KAAK,EAAE,EACvB,OAAO,EAAE;IACP,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;CACxB,GACA,KAAK,EAAE,CAST;AAED,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,KAAK,EAAE,2BAA2B,EAAE,EACpC,OAAO,EAAE,0BAA0B,GAAG,IAAI,GACzC,0BAA0B,EAAE,CAyC9B;AAED,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,GAAG,IAAI,CAE7F"}
+{"version":3,"file":"booking-create-utils.d.ts","sourceRoot":"","sources":["../../src/components/booking-create-utils.ts"],"names":[],"mappings":"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"}

package/dist/components/booking-create-utils.js

@@ -32,20 +32,26 @@ export function validateBillingPersonContact(contact) {
     return "valid";
 }
 export function getTravelerAssignableStepperUnits(units) {
-    const hasRoomUnitByOption = new Map();
+    // "Inventory" units (rooms, vehicles) are containers a traveler is
+    // placed into. When an option configures one, person-typed
+    // pricing-tier units on the same option are hidden from the
+    // stepper since their pricing folds into the container's per-pax
+    // accounting at submit time.
+    const isInventoryType = (unit) => unit.unitType === "room" || unit.unitType === "vehicle";
+    const hasInventoryByOption = new Map();
     for (const unit of units) {
         const optionKey = unit.optionId ?? unit.optionUnitId;
-        if (unit.unitType === "room")
-            hasRoomUnitByOption.set(optionKey, true);
-        else if (!hasRoomUnitByOption.has(optionKey))
-            hasRoomUnitByOption.set(optionKey, false);
+        if (isInventoryType(unit))
+            hasInventoryByOption.set(optionKey, true);
+        else if (!hasInventoryByOption.has(optionKey))
+            hasInventoryByOption.set(optionKey, false);
     }
     return units.filter((unit) => {
-        if (unit.unitType === "room")
+        if (isInventoryType(unit))
             return true;
         if (unit.unitType !== "person")
             return false;
-        return !hasRoomUnitByOption.get(unit.optionId ?? unit.optionUnitId);
+        return !hasInventoryByOption.get(unit.optionId ?? unit.optionUnitId);
     });
 }
 export function getBookableDepartureSlots(slots, options) {
@@ -59,7 +65,7 @@ export function getBookableDepartureSlots(slots, options) {
     })
         .sort((left, right) => left.startsAt.localeCompare(right.startsAt));
 }
-export function itemLinesToRows(quantities, units, pricing) {
+export function itemLinesToRows(quantities, units, pricing, travelerIndexesByUnitId = {}, travelerKeysByUnitId = {}) {
     const unitsById = new Map(units.map((unit) => [unit.optionUnitId, unit]));
     const unitNames = new Map(units.map((unit) => [unit.optionUnitId, unit.unitName]));
     const pricedLines = new Map((pricing?.lines ?? []).map((line) => [line.unitId, line]));
@@ -86,13 +92,25 @@ export function itemLinesToRows(quantities, units, pricing) {
         }
         const unitSellAmountCents = pricedLine?.unitAmountCents ??
             (totalSellAmountCents != null ? Math.floor(totalSellAmountCents / quantity) : null);
+        const travelerIndexes = travelerIndexesByUnitId[optionUnitId];
+        const travelerKeys = travelerKeysByUnitId[optionUnitId];
+        const hasTravelerLinks = Boolean(travelerKeys?.length || travelerIndexes?.length);
         return {
+            // Server uses `clientLineKey` to look up this item after insert
+            // and link it to travelers via `booking_item_travelers`. Only
+            // stamp when there's an actual traveler mapping to write.
+            clientLineKey: hasTravelerLinks ? `unit:${optionUnitId}` : undefined,
             optionId: unitsById.get(optionUnitId)?.optionId ?? null,
             optionUnitId,
             quantity,
             title: pricedLine?.label ?? unitNames.get(optionUnitId) ?? null,
             unitSellAmountCents,
             totalSellAmountCents,
+            ...(travelerKeys?.length
+                ? { travelerKeys }
+                : travelerIndexes?.length
+                    ? { travelerIndexes }
+                    : {}),
         };
     });
 }