@riverbankcms/sdk 0.141.0 → 0.143.0

package/dist/client/bookings.mjs

@@ -3114,6 +3114,14 @@ function orderedLiveRunSessions(sessions) {
 	return sessions.filter((session) => session.status !== "cancelled" && Number.isFinite(sessionStartMs(session))).sort((left, right) => sessionStartMs(left) - sessionStartMs(right));
 }
 //#endregion
+//#region ../theme-core/src/footer/mode.ts
+const footerModeSchema = z.enum([
+	"default",
+	"blocks",
+	"default+blocks",
+	"none"
+]);
+//#endregion
 //#region ../theme-core/src/lib/media.ts
 const hotspotSchema = z.object({
 	x: z.number().min(0).max(1),
@@ -7447,12 +7455,6 @@ const footerVariant = z.enum([
 	"split"
 ]);
 const footerMaxWidth = z.enum(["container", "full"]);
-const footerMode = z.enum([
-	"default",
-	"blocks",
-	"default+blocks",
-	"none"
-]);
 const footerNavLayoutMode = z.enum([
 	"stack",
 	"inline",
@@ -7541,9 +7543,9 @@ const footerSchema = z.object({
 	/**
 	* SDK-only footer rendering mode.
 	*
-	* Backwards compatible: missing/undefined behaves as 'default'.
+	* Historical persisted field; SDK rendering mode now lives in layout.footerMode.
 	*/
-	mode: footerMode.optional(),
+	mode: footerModeSchema.optional(),
 	variant: footerVariant,
 	maxWidth: footerMaxWidth,
 	showLogoText: z.boolean().optional(),
@@ -8125,6 +8127,15 @@ const publicEventBaseSchema = z.object({
 	timeZone: z.string(),
 	pricing: publicEventPricingSchema,
 	paymentTerms: blockBookingPaymentTermsSchema,
+	cancellationPolicy: z.object({ refunds: z.object({
+		mode: z.enum([
+			"never",
+			"always",
+			"cutoff"
+		]),
+		cutoffHours: z.number(),
+		method: z.enum(["original_payment_method", "site_credit"])
+	}) }),
 	consent: blockBookingConsentSchema.nullable(),
 	accessRestriction: accessRestrictionSchema,
 	allowedCategoryIds: z.array(z.string()),
@@ -8349,6 +8360,10 @@ const EVENTS = {
 		method: "POST",
 		authScope: "portal"
 	},
+	registrationNextStep: {
+		path: "/public/sites/{siteId}/events/registration-next-step",
+		method: "POST"
+	},
 	registrationStatus: {
 		path: "/public/sites/{siteId}/events/registration-status",
 		method: "GET"
@@ -8953,6 +8968,13 @@ function createBlockApi(config) {
 				body: data
 			});
 		},
+		async checkRegistrationNextStep(data) {
+			const path = buildPath(EVENTS.registrationNextStep.path, { siteId: requireSiteId() });
+			return request(EVENTS.registrationNextStep, {
+				path,
+				body: data
+			});
+		},
 		async getEventRegistrationStatus(params) {
 			const sid = requireSiteId();
 			const path = buildPath(EVENTS.registrationStatus.path, { siteId: sid });
@@ -14900,188 +14922,15 @@ const BookingFormClient$1 = ({ siteId: siteIdProp, render }) => {
 	});
 };
 //#endregion
-//#region ../blocks/src/system/runtime/nodes/events/domain/capacity.ts
-/**
-* Compute remaining spots for an event from `availableSpots` with a fallback
-* to `capacity - registeredCount`. Returns `{ available: null, isFull: false }`
-* for uncapped events so call sites can render no capacity indicator at all.
-*
-* The single source of truth for capacity math across event cards, agenda
-* rows, and timetable cells — keep wording variations in the call sites.
-*/
-function getEventAvailability(event) {
-	if (event.capacity == null) return {
-		available: null,
-		isFull: false
-	};
-	const available = event.availableSpots ?? event.capacity - event.registeredCount;
-	if (available <= 0) return {
-		available: 0,
-		isFull: true
-	};
-	return {
-		available,
-		isFull: false
-	};
-}
-/**
-* Pick the capacity row a booking decision should read: the selected
-* attendance mode's availability when the visitor has chosen one and the
-* event publishes it, otherwise the event-level aggregate.
-*
-* The mode row is used wholesale. A mode with `capacity: null` on a capped
-* event is uncapped *by design*: the registration write path applies the
-* same rule via `getEffectiveOccurrenceCapacityForAttendanceMode`, so falling
-* back to the event's `availableSpots` here would block bookings the server
-* accepts. (Waitlist claims are still occurrence-scoped; see issue 1377.)
-*/
-function selectEventCapacitySource(event, attendanceMode) {
-	if (!attendanceMode) return event;
-	return (event.attendanceModes ?? []).find((mode) => mode.mode === attendanceMode) ?? event;
-}
-/**
-* Whether the visitor's next step is the waitlist: the source is full *and*
-* a waitlist is open. The one place this is decided — cards, rows, the
-* wizard's steps and its action bar all route through here so they agree,
-* including for producers that omit `availableSpots` and rely on the
-* `capacity - registeredCount` fallback.
-*/
-function canJoinEventWaitlist(event, options) {
-	const source = selectEventCapacitySource(event, options?.attendanceMode);
-	return getEventAvailability(source).isFull && source.waitlistEnabled === true;
-}
-//#endregion
-//#region ../blocks/src/system/runtime/nodes/events/domain/destination.ts
-function isRecord$1(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function isRuntimeEventDestination(value) {
-	if (!isRecord$1(value) || typeof value.kind !== "string") return false;
-	if (value.kind === "native") return (value.mode === "cms-managed" || value.mode === "system-managed") && typeof value.path === "string";
-	return value.kind === "external" && typeof value.url === "string" && typeof value.label === "string";
-}
-function resolveRuntimeEventDestination(event) {
-	if (isRuntimeEventDestination(event.destination)) return event.destination;
-	return {
-		kind: "native",
-		mode: event.eventDestinationMode === "system-managed" ? "system-managed" : "cms-managed",
-		path: typeof event.path === "string" ? event.path : ""
-	};
-}
-//#endregion
-//#region ../blocks/src/system/runtime/nodes/event-registration/checkoutRecovery.ts
-/** Recovery may select held places; checkout still owns admission and payment validation. */
-function checkoutRecoveryOptionAvailability(availability) {
-	if (availability.kind === "available" || availability.reason === "sold_out" || availability.reason === "overallCapacityUnavailable") return {
-		kind: "available",
-		remainingPlaces: null
-	};
-	return availability;
-}
-/**
-* A form-only projection for the explicit existing-checkout path. It permits
-* collecting the original selection without claiming a new place is available.
-* The public checkout service identifies the customer and remains the admission
-* authority; no reservation/customer data is exposed through this projection.
-*/
-function getCheckoutRecoveryFormEligibility(eligibility) {
-	if (!eligibility || eligibility.registration.kind !== "none" && eligibility.registration.kind !== "pending_payment" || eligibility.availability.kind === "unavailable" && eligibility.availability.reason !== "full" && eligibility.availability.reason !== "selectionRequired") return eligibility;
-	const amountCents = eligibility.price ?? 0;
-	if (amountCents <= 0 || !eligibility.currency || eligibility.availability.kind === "unavailable" && eligibility.availability.reason === "selectionRequired") return eligibility.registration.kind === "pending_payment" ? {
-		...eligibility,
-		registration: { kind: "none" },
-		ticketTypes: eligibility.ticketTypes.map((option) => ({
-			...option,
-			availability: checkoutRecoveryOptionAvailability(option.availability)
-		}))
-	} : eligibility;
-	const currency = eligibility.currency;
-	const paymentOptions = eligibility.paymentTerms.allowedOptions.map((option) => {
-		switch (option.kind) {
-			case "upfront": return {
-				kind: "payInFull",
-				amountCents,
-				currency
-			};
-			case "deferred_manual": return {
-				kind: "deferredManual",
-				amountCents,
-				currency
-			};
-			case "instalment_plan": return {
-				kind: "instalmentPlan",
-				amountCents,
-				currency
-			};
-			case "flexible_balance": return {
-				kind: "flexibleBalance",
-				amountCents,
-				currency
-			};
-		}
-	});
-	return {
-		...eligibility,
-		registration: { kind: "none" },
-		availability: {
-			kind: "available",
-			remainingPlaces: null,
-			waitlistEnabled: eligibility.waitlistEnabled
-		},
-		eligible: paymentOptions.length > 0,
-		isFull: false,
-		canJoinWaitlist: false,
-		isFree: false,
-		requiresPayment: true,
-		canPayDirectly: paymentOptions.length > 0,
-		paymentOptions,
-		eligiblePasses: [],
-		eligibleMemberships: [],
-		ticketTypes: eligibility.ticketTypes.map((option) => ({
-			...option,
-			availability: checkoutRecoveryOptionAvailability(option.availability)
-		}))
-	};
-}
-function canJoinWaitlistOutsideRecovery(event, attendanceMode, checkoutRecovery) {
-	return !checkoutRecovery && event !== null && canJoinEventWaitlist(event, { attendanceMode });
-}
-//#endregion
-//#region ../blocks/src/system/runtime/nodes/event-registration/useCheckoutRecovery.ts
-/** Recovery belongs to the selected booking subject; changing events resets its scope. */
-function useCheckoutRecovery(event, setStep) {
-	const [recoveryEventId, setRecoveryEventId] = useState(null);
-	return {
-		checkoutRecovery: event !== null && recoveryEventId === event.selectionId,
-		startCheckoutRecovery: useCallback(() => {
-			if (!event) return;
-			setRecoveryEventId(event.selectionId);
-			setStep("select-tickets");
-		}, [event, setStep])
-	};
-}
-/** Authenticated pending bookings enter the same form-only recovery path as guests. */
-function useCheckoutRecoveryEligibility(eligibility, step, checkoutRecovery, startCheckoutRecovery) {
-	const registrationKind = eligibility?.registration.kind;
-	useEffect(() => {
-		if ((step === "select-event" || step === "select-tickets" || step === "enter-details" || step === "select-payment") && registrationKind === "pending_payment" && !checkoutRecovery) startCheckoutRecovery();
-	}, [
-		registrationKind,
-		step,
-		checkoutRecovery,
-		startCheckoutRecovery
-	]);
-	return useMemo(() => checkoutRecovery ? getCheckoutRecoveryFormEligibility(eligibility) : eligibility, [checkoutRecovery, eligibility]);
-}
-//#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration/registrationErrorRecovery.ts
 function resolveRegistrationRecoveryAction(step, action) {
 	if (step === "payment-failed") return "payment-options";
-	if (step === "verifying-payment" || step === "verifying-timeout" || step === "redirecting") return "payment-status";
+	if (step === "payment-status") return "none";
+	if (step === "verifying-payment" || step === "verifying-timeout" || step === "redirecting") return "none";
 	return action;
 }
 function canRecoverToWaitlist(eligibility) {
-	return Boolean(eligibility?.isFull && eligibility.canJoinWaitlist);
+	return eligibility?.availability.kind === "waitlist" && eligibility.registration.kind !== "pending_payment";
 }
 function shouldRefreshAfterRegistrationError(step, action, enabled) {
 	return enabled || step === "error" && action === "places";
@@ -15098,19 +14947,19 @@ function resetRegistrationAfterExpiry(input) {
 	input.setErrorMessage("");
 	input.setPendingRegistrationReference(null);
 }
-/** Recovery never starts another payment. Unknown payment outcomes go to the portal. */
+/** Retry the retained submission in place; explicit payment uncertainty stays status-only. */
 function recoverRegistrationError(action, handlers) {
 	switch (action) {
 		case "none": return;
 		case "portal":
-		case "payment-status":
 			window.location.assign("/portal");
 			return;
 		case "event":
 			window.location.assign(window.location.pathname);
 			return;
 		case "retry":
-			window.location.reload();
+			handlers.clearError();
+			handlers.setStep("select-payment");
 			return;
 		case "details":
 			handlers.clearError();
@@ -15148,13 +14997,43 @@ function validateFormData(formData, requiresConsent = false) {
 	return errors;
 }
 //#endregion
+//#region ../blocks/src/system/runtime/nodes/event-registration/ticketSelectionLines.ts
+/** Ticket selection requests a quote; only the server admits a booking. */
+function canRequestTicketOption(availability) {
+	return availability.kind === "available" || availability.reason === "sold_out" || availability.reason === "overallCapacityUnavailable";
+}
+function normalizeTicketSelectionLines(lines) {
+	const quantitiesByTicketType = /* @__PURE__ */ new Map();
+	for (const line of lines) {
+		const quantity = Math.floor(line.quantity);
+		if (quantity <= 0) continue;
+		const key = line.pricingOptionId ?? null;
+		quantitiesByTicketType.set(key, (quantitiesByTicketType.get(key) ?? 0) + quantity);
+	}
+	return [...quantitiesByTicketType.entries()].map(([pricingOptionId, quantity]) => ({
+		pricingOptionId,
+		quantity
+	}));
+}
+function getTicketSelectionTotal(lines) {
+	return normalizeTicketSelectionLines(lines).reduce((total, line) => total + line.quantity, 0);
+}
+function getSingleSelectedPricingOptionId(lines) {
+	const normalized = normalizeTicketSelectionLines(lines);
+	return normalized.length === 1 ? normalized[0]?.pricingOptionId ?? null : null;
+}
+function hasValidPricingOptionSelection(input) {
+	if (!input.selectionRequired) return true;
+	if (input.lines.length === 0) return false;
+	const availableOptionIds = new Set(input.visibleOptions.filter((option) => canRequestTicketOption(option.availability)).map((option) => option.pricingOptionId));
+	return input.lines.every((line) => line.pricingOptionId !== null && availableOptionIds.has(line.pricingOptionId));
+}
+//#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration/utils.ts
 function getPortalSubjectEmail(profile) {
 	return profile?.email ?? null;
 }
 function transformRegistrationOptionsResponse(response) {
-	const canJoinWaitlist = response.availability.kind === "waitlist";
-	const isFull = response.availability.remainingPlaces === 0 || response.availability.kind === "unavailable" && response.availability.reason === "full";
 	const eligiblePasses = response.entitlements.passes.map((pass) => ({
 		id: pass.customerPassId,
 		passName: pass.passName,
@@ -15167,7 +15046,6 @@ function transformRegistrationOptionsResponse(response) {
 	const eventAcceptsPasses = response.entitlements.requiresLoginForPasses || eligiblePasses.length > 0 || response.entitlements.availableForPurchase.passes.length > 0;
 	const eventAcceptsMemberships = response.entitlements.requiresLoginForMemberships || eligibleMemberships.length > 0 || response.entitlements.availableForPurchase.memberships.length > 0;
 	const monetaryPaymentAvailable = hasMonetaryPaymentOption(response);
-	const registrationAvailable = response.availability.kind === "available" || response.availability.kind === "waitlist";
 	return {
 		availability: response.availability,
 		registration: response.registration,
@@ -15182,7 +15060,6 @@ function transformRegistrationOptionsResponse(response) {
 			},
 			transactions: []
 		} : null,
-		eligible: response.registration.kind === "none" && registrationAvailable,
 		requiresPayment: monetaryPaymentAvailable,
 		pricingStrategy: response.pricing.strategy,
 		paymentTerms: response.pricing.paymentTerms,
@@ -15197,16 +15074,12 @@ function transformRegistrationOptionsResponse(response) {
 			currency: response.pricing.currency
 		})),
 		ticketTypes: response.pricing.options,
-		isFull,
-		waitlistEnabled: response.availability.waitlistEnabled,
-		canJoinWaitlist,
 		price: response.pricing.subtotalCents,
 		currency: response.pricing.currency,
 		requiresAuthForPasses: response.entitlements.requiresLoginForPasses,
 		requiresAuthForMemberships: response.entitlements.requiresLoginForMemberships,
 		eligiblePasses,
 		eligibleMemberships,
-		canPayDirectly: monetaryPaymentAvailable,
 		eventAcceptsPasses,
 		eventAcceptsMemberships,
 		availablePasses: [...response.entitlements.availableForPurchase.passes],
@@ -15223,8 +15096,8 @@ function getVisibleTicketTypes(input) {
 	})) : [];
 	return (input.eligibility?.ticketTypes ?? eventTicketTypes).filter((ticketType) => ticketType.isActive && (!input.selectedAttendanceMode || (ticketType.attendanceScope ?? "both") === "both" || (ticketType.attendanceScope ?? "both") === input.selectedAttendanceMode));
 }
-function getImplicitSingleAvailableTicketType(ticketTypes) {
-	return ticketTypes.length === 1 && ticketTypes[0]?.availability.kind === "available" ? ticketTypes[0] : null;
+function getImplicitSingleTicketType(ticketTypes) {
+	return ticketTypes.length === 1 && ticketTypes[0] && canRequestTicketOption(ticketTypes[0].availability) ? ticketTypes[0] : null;
 }
 function findSelectedTicketType(input) {
 	if (!input.selectedPricingOptionId) return null;
@@ -15235,32 +15108,74 @@ function findSelectedTicketType(input) {
 	}).find((ticketType) => ticketType.pricingOptionId === input.selectedPricingOptionId) ?? null;
 }
 //#endregion
-//#region ../blocks/src/system/runtime/nodes/event-registration/ticketSelectionLines.ts
-function normalizeTicketSelectionLines(lines) {
-	const quantitiesByTicketType = /* @__PURE__ */ new Map();
-	for (const line of lines) {
-		const quantity = Math.floor(line.quantity);
-		if (quantity <= 0) continue;
-		const key = line.pricingOptionId ?? null;
-		quantitiesByTicketType.set(key, (quantitiesByTicketType.get(key) ?? 0) + quantity);
-	}
-	return [...quantitiesByTicketType.entries()].map(([pricingOptionId, quantity]) => ({
-		pricingOptionId,
-		quantity
+//#region ../blocks/src/system/runtime/nodes/event-registration/registrationDerivations.ts
+/** Public requests share subject identity without copying the run's display sessions. */
+function toRegistrationRequestSubject(subject, attendanceMode) {
+	return subject.kind === "occurrence" ? {
+		kind: "occurrence",
+		occurrenceId: subject.occurrenceId,
+		attendanceMode: attendanceMode ?? void 0
+	} : {
+		kind: "wholeSeries",
+		eventSeriesId: subject.eventSeriesId,
+		attendanceMode: attendanceMode ?? void 0
+	};
+}
+function eventMatchesOccurrenceId(event, occurrenceId) {
+	return event.registrationSubject.kind === "occurrence" && (event.registrationSubject.occurrenceId === occurrenceId || event.selectionId === occurrenceId);
+}
+function findEventByOccurrenceId(events, occurrenceId) {
+	return events.find((event) => eventMatchesOccurrenceId(event, occurrenceId)) ?? null;
+}
+function findPreSelectedEvent(input) {
+	const occurrenceContext = input.occurrenceContext;
+	if (!occurrenceContext) return input.scopedEvents.length === 1 ? input.scopedEvents[0] ?? null : null;
+	const contextDate = getBookingLocalDateKey(toScheduledBookingDateTime({
+		startsAt: occurrenceContext.startsAt,
+		timeZone: occurrenceContext.timeZone
 	}));
+	return input.scopedEvents.find((event) => eventMatchesOccurrenceId(event, occurrenceContext.id) || getBookingLocalDateKey(toScheduledBookingDateTime({
+		startsAt: event.startsAt,
+		timeZone: event.timeZone
+	})) === contextDate) ?? null;
 }
-function getTicketSelectionTotal(lines) {
-	return normalizeTicketSelectionLines(lines).reduce((total, line) => total + line.quantity, 0);
+function resolveRegistrationTarget(input) {
+	const subject = input.occurrenceContext ? {
+		kind: "occurrence",
+		occurrenceId: input.occurrenceContext.id
+	} : input.selectedEvent?.registrationSubject ?? null;
+	if (!subject) return null;
+	return {
+		subject,
+		selectedEventId: input.selectedEvent?.selectionId ?? null
+	};
 }
-function getSingleSelectedPricingOptionId(lines) {
-	const normalized = normalizeTicketSelectionLines(lines);
-	return normalized.length === 1 ? normalized[0]?.pricingOptionId ?? null : null;
+function resolveEventRequiresPayment(input) {
+	if (input.eligibility) return input.eligibility.requiresPayment;
+	if (input.selectedTicketType) return input.selectedTicketType.priceAmount > 0;
+	if (!input.event) return false;
+	return publicEventPricingType(input.event.pricing) === "paid";
 }
-function hasValidPricingOptionSelection(input) {
-	if (!input.selectionRequired) return true;
-	if (input.lines.length === 0) return false;
-	const availableOptionIds = new Set(input.visibleOptions.filter((option) => option.availability.kind === "available").map((option) => option.pricingOptionId));
-	return input.lines.every((line) => line.pricingOptionId !== null && availableOptionIds.has(line.pricingOptionId));
+function resolveDiscountContext(input) {
+	const selection = input.paymentSelection.method ? input.paymentSelection : null;
+	if (!input.event) return null;
+	if (selection?.method === "pass_bundle" && selection.bundlePassId) return {
+		type: "pass",
+		passId: selection.bundlePassId
+	};
+	if (selection?.method === "membership_bundle" && selection.bundleMembershipId) return {
+		type: "membership",
+		membershipId: selection.bundleMembershipId
+	};
+	if (!input.eventRequiresPayment) return null;
+	if (input.ticketsCount <= 0) return null;
+	if (selection?.method && selection.method !== "stripe") return null;
+	return {
+		type: "event",
+		eventSeriesId: input.event.seriesId,
+		eventCategoryId: input.event.eventCategory?.id ?? null,
+		ticketsCount: input.ticketsCount
+	};
 }
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration/hooks.state.ts
@@ -15380,17 +15295,6 @@ function usePortalAuthWithDeps(deps) {
 		logout
 	};
 }
-function toRegistrationOptionsSubject(subject, attendanceMode) {
-	return subject.kind === "occurrence" ? {
-		kind: "occurrence",
-		occurrenceId: subject.occurrenceId,
-		attendanceMode: attendanceMode ?? void 0
-	} : {
-		kind: "wholeSeries",
-		eventSeriesId: subject.eventSeriesId,
-		attendanceMode: attendanceMode ?? void 0
-	};
-}
 function useEligibility(params) {
 	return useEligibilityWithDeps(params, eventRegistrationHooksDeps);
 }
@@ -15431,7 +15335,7 @@ function useEligibilityWithDeps(params, deps) {
 			requestIdRef.current = requestId;
 			dispatch({ type: "loading-started" });
 			try {
-				const subject = toRegistrationOptionsSubject(params.subject, params.attendanceMode);
+				const subject = toRegistrationRequestSubject(params.subject, params.attendanceMode);
 				const result = await api.getRegistrationOptions({
 					subject,
 					selections: ticketSelections.map((selection) => ({
@@ -15635,7 +15539,6 @@ const STRIPE_COMMISSION_FREE_REASONS = [
 	"no_commission_plan",
 	"billing_evidence_invalid",
 	"fee_rounds_to_zero",
-	"non_commissionable_scope",
 	"payment_not_stripe"
 ];
 const historicalContext = {
@@ -15669,9 +15572,9 @@ const eventRegistrationErrors = {
 		message: "Booking is currently closed for this event. Please contact the organiser if you’d like to find out more.",
 		action: "none"
 	},
-	paymentUncertain: {
-		message: "We’re checking your booking and payment. Please don’t try to book again yet. If you’ve already paid, you don’t need to pay again.",
-		action: "payment-status"
+	paymentInvestigationRequired: {
+		message: "We still can’t confirm your payment. Please don’t make another payment. Contact the organiser so they can check your booking.",
+		action: "none"
 	},
 	paymentProviderUnavailable: {
 		message: "We couldn’t reach the payment provider. Please try again in a minute.",
@@ -16169,7 +16072,30 @@ function checkoutReturnCommand(params) {
 	};
 	return null;
 }
-async function handleCheckoutReturn(options, deps, checkoutAttemptIdRef) {
+function handleCheckoutReturnOutcome(options, deps, context, outcome) {
+	const { pending, params } = context;
+	if (outcome.kind === "resolved") {
+		deps.clearReturnParams();
+		options.setPendingRegistrationReference(outcome.reference);
+		options.setStep("verifying-payment");
+		return "settled";
+	}
+	if (outcome.kind === "abandoned") {
+		deps.clearReturnParams();
+		options.setErrorMessage("Your payment was cancelled. You can choose a payment option and try again.");
+		options.setStep("select-payment");
+		return "settled";
+	}
+	if (outcome.kind === "notFound" && params.registration === "cancelled" && (options.registrationSubject?.kind === "occurrence" || pending?.reference.scope === "occurrence")) {
+		deps.clearReturnParams();
+		options.setErrorMessage("Your payment was cancelled. You can choose a payment option and try again.");
+		options.setStep("select-payment");
+		return "settled";
+	}
+	showReturnReconciliation(options, "We’re checking your booking and payment. Please don’t try to book again yet. If you’ve already paid, you don’t need to pay again.");
+	return outcome.kind === "notFound" ? "settled" : "retryable";
+}
+async function handleCheckoutReturn(options, deps, returnContextRef) {
 	deps.cleanupStaleRegistrations();
 	const params = deps.readReturnParams();
 	if (params.registration !== "cancelled" && params.registration !== "success") return "settled";
@@ -16183,34 +16109,15 @@ async function handleCheckoutReturn(options, deps, checkoutAttemptIdRef) {
 	}
 	const { checkoutAttemptId } = command;
 	const pending = deps.getPendingRegistration(siteId, checkoutAttemptId);
-	checkoutAttemptIdRef.current = checkoutAttemptId;
+	returnContextRef.current = { checkoutAttemptId };
 	if (pending) restorePendingPresentation(options, pending);
 	options.setStep("verifying-payment");
 	try {
 		const outcome = await options.api.resolveEventCheckoutReturn(command);
-		switch (outcome.kind) {
-			case "resolved":
-				deps.clearReturnParams();
-				options.setPendingRegistrationReference(outcome.reference);
-				options.setStep("verifying-payment");
-				return "settled";
-			case "abandoned":
-				deps.clearReturnParams();
-				options.setErrorMessage("Your payment was cancelled. You can choose a payment option and try again.");
-				options.setStep("select-payment");
-				return "settled";
-			case "notFound":
-				if (params.registration === "cancelled" && (options.registrationSubject?.kind === "occurrence" || pending?.reference.scope === "occurrence")) {
-					deps.clearReturnParams();
-					options.setErrorMessage("Your payment was cancelled. You can choose a payment option and try again.");
-					options.setStep("select-payment");
-					return "settled";
-				}
-				showReturnReconciliation(options, "We’re checking your booking and payment. Please don’t try to book again yet. If you’ve already paid, you don’t need to pay again.");
-				return "settled";
-			case "reconciliationRequired": break;
-		}
-		showReturnReconciliation(options, "We’re checking your booking and payment. Please don’t try to book again yet. If you’ve already paid, you don’t need to pay again.");
+		return handleCheckoutReturnOutcome(options, deps, {
+			pending,
+			params
+		}, outcome);
 	} catch {
 		showReturnReconciliation(options, "We couldn’t check your payment just now. Please check again in a moment. Don’t make another booking while we’re checking.");
 	}
@@ -16219,9 +16126,16 @@ async function handleCheckoutReturn(options, deps, checkoutAttemptIdRef) {
 function useEventRegistrationStripeReturn(options) {
 	return useEventRegistrationStripeReturnWithDeps(options, eventRegistrationStripeReturnDeps);
 }
+function completeVerifiedRegistration(options, deps, returnContext) {
+	const siteId = options.api.config.siteId;
+	const checkoutAttemptId = returnContext?.checkoutAttemptId;
+	if (siteId && checkoutAttemptId) deps.clearPendingRegistration(siteId, checkoutAttemptId);
+	options.setRegistrationResult({ status: "confirmed" });
+	options.setStep("success");
+}
 function useEventRegistrationStripeReturnWithDeps(options, deps) {
 	const { api, pendingRegistrationReference, setErrorMessage, setRegistrationResult, setStep, step } = options;
-	const checkoutAttemptIdRef = useRef(null);
+	const returnContextRef = useRef(null);
 	const lookupInFlightRef = useRef(false);
 	const [lookupState, setLookupState] = useState("settled");
 	const resolveReturn = useCallback(async () => {
@@ -16229,7 +16143,7 @@ function useEventRegistrationStripeReturnWithDeps(options, deps) {
 		lookupInFlightRef.current = true;
 		setLookupState("loading");
 		try {
-			setLookupState(await handleCheckoutReturn(options, deps, checkoutAttemptIdRef));
+			setLookupState(await handleCheckoutReturn(options, deps, returnContextRef));
 		} finally {
 			lookupInFlightRef.current = false;
 		}
@@ -16252,13 +16166,8 @@ function useEventRegistrationStripeReturnWithDeps(options, deps) {
 		resolveReturn();
 	}, []);
 	useEffect(() => {
-		if (verification.status === "completed") {
-			const siteId = api.config.siteId;
-			const checkoutAttemptId = checkoutAttemptIdRef.current;
-			if (siteId && checkoutAttemptId) deps.clearPendingRegistration(siteId, checkoutAttemptId);
-			setRegistrationResult({ status: "confirmed" });
-			setStep("success");
-		} else if (verification.status === "failed") {
+		if (verification.status === "completed") completeVerifiedRegistration(options, deps, returnContextRef.current);
+		else if (verification.status === "failed") {
 			setErrorMessage("Please try again or choose another payment option. If this keeps happening, contact the organiser for help.");
 			setStep("payment-failed");
 		} else if (verification.status === "timeout") setStep("verifying-timeout");
@@ -16287,7 +16196,10 @@ function registrationErrorPresentation(error) {
 	const reason = error instanceof BlockApiError ? parseEventRegistrationErrorReason(error.tag) : null;
 	if (reason) return eventRegistrationErrors[reason];
 	if (error instanceof BlockApiError && error.status < 500) return eventRegistrationErrors.invalidCommitInput;
-	return eventRegistrationErrors.paymentUncertain;
+	return {
+		message: "Something went wrong. Please try again.",
+		action: "retry"
+	};
 }
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration/useEventRegistrationSubmit.ts
@@ -16316,26 +16228,6 @@ function useEventRegistrationSubmit(options) {
 * and the balance left, which the block's copy cannot. Every other method keeps
 * whatever success message the site configured.
 */
-function toRegistrationResult(result) {
-	if (result.alreadyRegistered) {
-		const waitlisted = result.status === "waitlist";
-		return {
-			status: result.status,
-			variant: "info",
-			title: waitlisted ? "Already waitlisted" : "Already registered",
-			message: result.message ?? (waitlisted ? "You are already on the waitlist for this event." : "You are already registered for this event.")
-		};
-	}
-	if (result.status === "waitlist") return {
-		status: "waitlist",
-		title: "Added to waitlist",
-		message: result.message ?? (typeof result.waitlistPosition === "number" ? `You've been added to the waitlist (position ${result.waitlistPosition}).` : "You've been added to the waitlist.")
-	};
-	return {
-		status: result.status,
-		message: result.paymentMethod === "pass" ? result.message : void 0
-	};
-}
 function useEventRegistrationSubmitWithDeps(options, deps) {
 	/**
 	* The command identity for the submission currently in progress.
@@ -16349,7 +16241,7 @@ function useEventRegistrationSubmitWithDeps(options, deps) {
 	* Identical retries retain the command after a lost response. Changed form
 	* details get a new command so the server applies the new booking intent.
 	*/
-	const commandRef = useRef(null);
+	const { commandRef } = options;
 	const inFlightRef = useRef(null);
 	const submit = async (method, passId, membershipId, selection, submitOptions) => {
 		const target = options.registrationTarget;
@@ -16362,19 +16254,15 @@ function useEventRegistrationSubmitWithDeps(options, deps) {
 		const registrationCommandId = commandRef.current?.id ?? deps.createClientCommandId();
 		try {
 			let prepared = prepareSubmitContext(options, registrationCommandId, target, method, passId, membershipId, selection);
-			if (prepared.subject.kind === "wholeSeries" && method === "stripe") {
-				commandRef.current = null;
-				return await submitWholeSeriesCheckout(options, deps, {
+			let request = buildRegistrationRequest(options, prepared, method, passId, membershipId);
+			const intentKey = registrationRequestIntentKey(request);
+			if (commandRef.current !== null && commandRef.current.intentKey !== intentKey) {
+				prepared = {
 					...prepared,
-					subject: prepared.subject
-				}, submitOptions);
+					registrationCommandId: deps.createClientCommandId()
+				};
+				request = buildRegistrationRequest(options, prepared, method, passId, membershipId);
 			}
-			const request = buildOccurrenceRegistrationRequest(options, prepared, method, passId, membershipId);
-			const intentKey = registrationRequestIntentKey(request);
-			if (commandRef.current !== null && commandRef.current.intentKey !== intentKey) prepared = {
-				...prepared,
-				registrationCommandId: deps.createClientCommandId()
-			};
 			commandRef.current = {
 				id: prepared.registrationCommandId,
 				intentKey
@@ -16383,8 +16271,7 @@ function useEventRegistrationSubmitWithDeps(options, deps) {
 				...request,
 				registrationCommandId: prepared.registrationCommandId
 			});
-			commandRef.current = null;
-			return await completeRegistrationSubmission(options, deps, prepared, result, method, submitOptions);
+			return await completeRegistrationSubmission(options, deps, prepared, result, submitOptions);
 		} catch (error) {
 			if (error instanceof BlockApiError && error.tag === "registrationPreparationChanged") commandRef.current = null;
 			const { message, action } = registrationErrorPresentation(error);
@@ -16408,9 +16295,40 @@ function useEventRegistrationSubmitWithDeps(options, deps) {
 		return pending;
 	};
 }
-async function completeRegistrationSubmission(options, deps, prepared, result, method, submitOptions) {
-	if (needsOccurrenceCheckout(result, method)) return await submitOccurrenceCheckout(options, deps, prepared, result, method, submitOptions);
-	options.setRegistrationResult(toRegistrationResult(result));
+async function completeRegistrationSubmission(options, deps, prepared, result, submitOptions) {
+	switch (result.kind) {
+		case "paymentStatusRequired":
+			options.setPaymentStatusRecovery({
+				kind: "ready",
+				subject: result.subject
+			});
+			options.setStep("payment-status");
+			return {
+				ok: true,
+				outcome: { kind: "payment_status" }
+			};
+		case "checkoutRequired":
+			options.setPendingRegistrationReference(result.reference);
+			savePendingCheckout(options, deps, prepared, result.submissionId, result.reference);
+			options.setStep("redirecting");
+			return redirectToCheckout(result.checkoutUrl, submitOptions);
+		case "waitlisted":
+			options.setRegistrationResult({
+				status: "waitlist",
+				title: "Added to waitlist",
+				message: result.waitlist.message
+			});
+			break;
+		case "bookingComplete":
+		case "paymentDeferred":
+			options.setPendingRegistrationReference(result.reference);
+			options.setRegistrationResult({
+				status: "confirmed",
+				message: result.summary.paymentMethod === "pass" ? result.summary.message : void 0
+			});
+			break;
+	}
+	options.commandRef.current = null;
 	options.setStep("success");
 	return {
 		ok: true,
@@ -16441,15 +16359,7 @@ function prepareSubmitContext(options, registrationCommandId, target, method, pa
 			email: guest.email?.trim().toLowerCase() || void 0,
 			phone: guest.phone?.trim() || void 0
 		})) : void 0,
-		subject: target.subject.kind === "occurrence" ? {
-			kind: "occurrence",
-			occurrenceId: target.subject.occurrenceId,
-			attendanceMode: options.selectedAttendanceMode ?? void 0
-		} : {
-			kind: "wholeSeries",
-			eventSeriesId: target.subject.eventSeriesId,
-			attendanceMode: options.selectedAttendanceMode ?? void 0
-		}
+		subject: toRegistrationRequestSubject(target.subject, options.selectedAttendanceMode)
 	};
 }
 function resolveSelectionSnapshot(method, passId, membershipId, bundleProductId, selection) {
@@ -16473,85 +16383,6 @@ function resolveSelectionSnapshot(method, passId, membershipId, bundleProductId,
 	if (method === "free") return { method };
 	throw new Error("Choose an available payment option.");
 }
-async function submitWholeSeriesCheckout(options, deps, prepared, submitOptions) {
-	options.setStep("redirecting");
-	if (prepared.selectionSnapshot.method !== "stripe") throw new Error("Choose an available payment option.");
-	const checkoutAttemptId = deps.createClientCommandId();
-	const urls = buildCheckoutReturnUrls("registration", EVENT_REGISTRATION_ANCHOR_ID, { [EVENT_REGISTRATION_CHECKOUT_ATTEMPT_PARAM]: checkoutAttemptId });
-	const result = await options.api.createEventCheckout({
-		subject: prepared.subject,
-		ticketSelections: toTicketSelectionRequests(prepared.ticketSelections),
-		selectedSlidingAmount: options.selectedSlidingAmount ?? void 0,
-		email: options.formData.email.trim().toLowerCase(),
-		name: options.formData.name.trim(),
-		phone: options.formData.phone.trim() || void 0,
-		formData: options.formData,
-		consentAccepted: options.formData.consentAccepted,
-		altchaSolution: options.altchaSolution,
-		guests: prepared.guestsPayload,
-		claimToken: options.claimToken ?? void 0,
-		waitlistEntryId: options.waitlistEntryId ?? void 0,
-		discountCode: options.discountCode.trim() || void 0,
-		collectionOptionKind: prepared.selectionSnapshot.collectionOptionKind,
-		checkoutAttemptId,
-		...urls
-	});
-	if (result.scope !== "wholeSeries") throw new Error("Unexpected registration scope for event checkout.");
-	if ("waitlistEntryId" in result) {
-		options.setRegistrationResult({
-			status: "waitlist",
-			variant: result.alreadyRegistered ? "info" : void 0,
-			title: result.alreadyRegistered ? "Already waitlisted" : "Added to waitlist",
-			message: result.alreadyRegistered ? "You are already on the waitlist for this event." : "You've been added to the waitlist."
-		});
-		options.setStep("success");
-		return {
-			ok: true,
-			outcome: { kind: "completed" }
-		};
-	}
-	if (result.bypassed) return completeBypassedCheckout(options);
-	if (!result.checkoutUrl) throw new Error("Checkout URL missing");
-	savePendingCheckout(options, deps, prepared, result.checkoutAttemptId, {
-		scope: "wholeSeries",
-		registrationId: result.registrationId
-	});
-	return redirectToCheckout(result.checkoutUrl, submitOptions);
-}
-function needsOccurrenceCheckout(result, method) {
-	return result.scope === "occurrence" && result.status === "confirmed" && result.pendingPayment && [
-		"stripe",
-		"pass_bundle",
-		"membership_bundle"
-	].includes(method);
-}
-async function submitOccurrenceCheckout(options, deps, prepared, registration, method, submitOptions) {
-	const reference = {
-		scope: "occurrence",
-		attendeeId: registration.attendeeId
-	};
-	options.setPendingRegistrationReference(reference);
-	options.setStep("redirecting");
-	const checkoutAttemptId = deps.createClientCommandId();
-	const urls = buildCheckoutReturnUrls("registration", EVENT_REGISTRATION_ANCHOR_ID, { [EVENT_REGISTRATION_CHECKOUT_ATTEMPT_PARAM]: checkoutAttemptId });
-	const result = await options.api.createEventCheckout({
-		subject: {
-			kind: "occurrence",
-			attendeeId: registration.attendeeId
-		},
-		registrationCommandId: prepared.registrationCommandId,
-		checkoutType: method === "pass_bundle" ? "pass_bundle" : method === "membership_bundle" ? "membership_bundle" : "event",
-		productId: prepared.bundleProductId,
-		discountCode: options.discountCode.trim() || void 0,
-		collectionOptionKind: prepared.selectionSnapshot.method === "stripe" ? prepared.selectionSnapshot.collectionOptionKind : void 0,
-		...urls
-	});
-	if (result.scope !== "occurrence") throw new Error("Unexpected registration scope for event checkout.");
-	if (result.bypassed) return completeBypassedCheckout(options);
-	if (!result.checkoutUrl) throw new Error("Checkout URL missing");
-	if (prepared.subject.kind === "occurrence") savePendingCheckout(options, deps, prepared, checkoutAttemptId, reference);
-	return redirectToCheckout(result.checkoutUrl, submitOptions);
-}
 function savePendingCheckout(options, deps, prepared, checkoutAttemptId, reference) {
 	const siteId = options.api.config.siteId;
 	if (!siteId) return;
@@ -16564,14 +16395,6 @@ function savePendingCheckout(options, deps, prepared, checkoutAttemptId, referen
 		paymentSelection: prepared.selectionSnapshot
 	});
 }
-function completeBypassedCheckout(options) {
-	options.setRegistrationResult({ status: "confirmed" });
-	options.setStep("success");
-	return {
-		ok: true,
-		outcome: { kind: "completed" }
-	};
-}
 function redirectToCheckout(checkoutUrl, submitOptions) {
 	if (submitOptions?.redirect !== "manual") window.location.href = checkoutUrl;
 	return {
@@ -16583,12 +16406,23 @@ function redirectToCheckout(checkoutUrl, submitOptions) {
 	};
 }
 function registrationRequestIntentKey(request) {
-	const { registrationCommandId: _command, altchaSolution: _proof, ...intent } = request;
-	return JSON.stringify(intent);
+	const { registrationCommandId: _command, altchaSolution: _proof, checkout, ...intent } = request;
+	return JSON.stringify({
+		...intent,
+		checkout: checkout ? {
+			discountCode: checkout.discountCode,
+			collectionOptionKind: checkout.collectionOptionKind
+		} : void 0
+	});
 }
-function buildOccurrenceRegistrationRequest(options, prepared, method, passId, membershipId) {
+function buildRegistrationRequest(options, prepared, method, passId, membershipId) {
 	return {
 		registrationCommandId: prepared.registrationCommandId,
+		checkout: {
+			...buildCheckoutReturnUrls("registration", EVENT_REGISTRATION_ANCHOR_ID, { [EVENT_REGISTRATION_CHECKOUT_ATTEMPT_PARAM]: prepared.registrationCommandId }),
+			discountCode: options.discountCode.trim() || void 0,
+			collectionOptionKind: prepared.selectionSnapshot.method === "stripe" ? prepared.selectionSnapshot.collectionOptionKind : void 0
+		},
 		subject: prepared.subject,
 		ticketSelections: toTicketSelectionRequests(prepared.ticketSelections),
 		selectedSlidingAmount: options.selectedSlidingAmount ?? void 0,
@@ -16608,64 +16442,6 @@ function buildOccurrenceRegistrationRequest(options, prepared, method, passId, m
 	};
 }
 //#endregion
-//#region ../blocks/src/system/runtime/nodes/event-registration/registrationDerivations.ts
-function eventMatchesOccurrenceId(event, occurrenceId) {
-	return event.registrationSubject.kind === "occurrence" && (event.registrationSubject.occurrenceId === occurrenceId || event.selectionId === occurrenceId);
-}
-function findEventByOccurrenceId(events, occurrenceId) {
-	return events.find((event) => eventMatchesOccurrenceId(event, occurrenceId)) ?? null;
-}
-function findPreSelectedEvent(input) {
-	const occurrenceContext = input.occurrenceContext;
-	if (!occurrenceContext) return input.scopedEvents.length === 1 ? input.scopedEvents[0] ?? null : null;
-	const contextDate = getBookingLocalDateKey(toScheduledBookingDateTime({
-		startsAt: occurrenceContext.startsAt,
-		timeZone: occurrenceContext.timeZone
-	}));
-	return input.scopedEvents.find((event) => eventMatchesOccurrenceId(event, occurrenceContext.id) || getBookingLocalDateKey(toScheduledBookingDateTime({
-		startsAt: event.startsAt,
-		timeZone: event.timeZone
-	})) === contextDate) ?? null;
-}
-function resolveRegistrationTarget(input) {
-	const subject = input.occurrenceContext ? {
-		kind: "occurrence",
-		occurrenceId: input.occurrenceContext.id
-	} : input.selectedEvent?.registrationSubject ?? null;
-	if (!subject) return null;
-	return {
-		subject,
-		selectedEventId: input.selectedEvent?.selectionId ?? null
-	};
-}
-function resolveEventRequiresPayment(input) {
-	if (input.eligibility) return input.eligibility.requiresPayment;
-	if (input.selectedTicketType) return input.selectedTicketType.priceAmount > 0;
-	if (!input.event) return false;
-	return publicEventPricingType(input.event.pricing) === "paid";
-}
-function resolveDiscountContext(input) {
-	const selection = input.paymentSelection.method ? input.paymentSelection : null;
-	if (!input.event) return null;
-	if (selection?.method === "pass_bundle" && selection.bundlePassId) return {
-		type: "pass",
-		passId: selection.bundlePassId
-	};
-	if (selection?.method === "membership_bundle" && selection.bundleMembershipId) return {
-		type: "membership",
-		membershipId: selection.bundleMembershipId
-	};
-	if (!input.eventRequiresPayment) return null;
-	if (input.ticketsCount <= 0) return null;
-	if (selection?.method && selection.method !== "stripe") return null;
-	return {
-		type: "event",
-		eventSeriesId: input.event.seriesId,
-		eventCategoryId: input.event.eventCategory?.id ?? null,
-		ticketsCount: input.ticketsCount
-	};
-}
-//#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration/useSettledCommerceView.ts
 function buildCandidate(input) {
 	if (!input.eligibilityIsSettled || !input.eligibility || !input.currentEvent) return null;
@@ -16886,7 +16662,7 @@ function computeAutoSelection(input) {
 	return { method: null };
 }
 function computeDirectPaymentSelection(eligibility) {
-	if (!eligibility?.canPayDirectly) return { method: null };
+	if (!eligibility?.requiresPayment) return { method: null };
 	const approvedKinds = getApprovedDirectPaymentCollectionOptionKinds(eligibility.paymentOptions);
 	const collectionOptionKind = approvedKinds.includes("upfront") ? "upfront" : approvedKinds[0];
 	return collectionOptionKind ? {
@@ -16900,7 +16676,7 @@ function isSelectionValid(input) {
 	if (!eligibility) return selection.method === "stripe" || selection.method === "pass_bundle" || selection.method === "membership_bundle";
 	switch (selection.method) {
 		case "free": return eligibility.isFree;
-		case "stripe": return Boolean(eligibility.canPayDirectly && eligibility.price);
+		case "stripe": return Boolean(eligibility.requiresPayment && eligibility.price);
 		case "pass": return isAuthenticated && ticketsCount === 1 && !!selection.passId && eligibility.eligiblePasses.some((pass) => pass.id === selection.passId);
 		case "membership": return isAuthenticated && ticketsCount === 1 && !!selection.membershipId && eligibility.eligibleMemberships.some((membership) => membership.id === selection.membershipId);
 		case "pass_bundle": return ticketsCount === 1 && !!selection.bundlePassId && eligibility.availablePasses.some((pass) => pass.id === selection.bundlePassId);
@@ -16919,7 +16695,7 @@ function normalizeRegistrationFlowState(state) {
 		ticketsCount: state.ticketsCount,
 		passOptOut: nextPassOptOut
 	});
-	const canKeepManualSelection = state.step === "select-payment" && state.selectionSource === "manual" && isSelectionValid({
+	const canKeepManualSelection = state.step !== "select-tickets" && state.selectionSource === "manual" && isSelectionValid({
 		selection: state.paymentSelection,
 		isAuthenticated: state.isAuthenticated,
 		eligibility: state.eligibility,
@@ -16985,6 +16761,24 @@ function requiresPaymentStep(params) {
 	if (!params.eventRequiresPayment) return false;
 	return !isEntitlementSelection(params.paymentSelection);
 }
+//#endregion
+//#region ../blocks/src/system/runtime/nodes/events/domain/destination.ts
+function isRecord$1(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isRuntimeEventDestination(value) {
+	if (!isRecord$1(value) || typeof value.kind !== "string") return false;
+	if (value.kind === "native") return (value.mode === "cms-managed" || value.mode === "system-managed") && typeof value.path === "string";
+	return value.kind === "external" && typeof value.url === "string" && typeof value.label === "string";
+}
+function resolveRuntimeEventDestination(event) {
+	if (isRuntimeEventDestination(event.destination)) return event.destination;
+	return {
+		kind: "native",
+		mode: event.eventDestinationMode === "system-managed" ? "system-managed" : "cms-managed",
+		path: typeof event.path === "string" ? event.path : ""
+	};
+}
 const unsupportedEventRegistrationPageSurfaceSubjectSchema = z.object({
 	kind: z.literal("unsupported"),
 	reason: z.enum([
@@ -17227,7 +17021,7 @@ function resolveEventRegistrationSubmitPlan(input) {
 	const selection = input.paymentSelection.method ? input.paymentSelection : void 0;
 	if (input.canJoinWaitlist) return {
 		ok: true,
-		args: withOptionalSelection({ method: "free" }, selection)
+		args: { method: "free" }
 	};
 	switch (input.paymentSelection.method) {
 		case "pass": return input.paymentSelection.passId ? {
@@ -17278,6 +17072,10 @@ function resolveHeadlessEventRegistrationStatus(wizard) {
 		case "redirecting": return { tag: "redirecting" };
 		case "verifying-payment": return { tag: "verifying-payment" };
 		case "verifying-timeout": return { tag: "verifying-timeout" };
+		case "payment-status": return wizard.paymentStatusRecovery ? {
+			tag: "payment-status",
+			state: wizard.paymentStatusRecovery
+		} : { tag: "ready" };
 		case "payment-failed": return {
 			tag: "payment-failed",
 			message: wizard.errorMessage
@@ -17324,6 +17122,10 @@ function resolveHeadlessEventRegistrationView(wizard) {
 			kind: "verifying",
 			message: "Your booking is not confirmed yet. Please don’t make another booking while we check. You can check your payment status again in a moment."
 		};
+		case "payment-status": return wizard.paymentStatusRecovery ? {
+			kind: "payment-status",
+			state: wizard.paymentStatusRecovery
+		} : { kind: "form" };
 		case "select-event":
 		case "select-tickets":
 		case "enter-details":
@@ -17590,20 +17392,124 @@ function useWaitlistClaimRestoration(input) {
 }
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration/registrationCompletion.ts
+function isSelectionSoldOut(availability) {
+	return availability?.kind === "unavailable" && availability.reason === "full";
+}
 function resolveRegistrationAvailabilityBlocker(input) {
 	if (input.hasWaitlistClaim) return null;
 	if (input.eligibilityError) return input.eligibilityError;
 	if (!input.eligibility) return "Registration is not available for this event.";
+	if (input.eligibility.registration.kind === "pending_payment") return null;
+	if (isSelectionSoldOut(input.eligibility.availability)) return null;
 	if (input.eligibility.availability.kind === "unavailable" && input.eligibility.availability.reason === "paymentUnavailable") return "Payment options are not available for this event.";
-	if (input.eligibility.availability.kind === "unavailable" || !input.eligibility.eligible) return "Registration is not available for this event.";
+	if (input.eligibility.availability.kind === "unavailable" || input.eligibility.registration.kind === "waitlisted") return "Registration is not available for this event.";
 	return null;
 }
 function resolvePricingSelectionBlocker(input) {
 	if (input.selectionRequired && !input.hasValidSelection) return "Choose at least one available ticket to continue.";
 	return input.slidingScaleSelectionMessage;
 }
-function isSoldOutWithoutWaitlist(input) {
-	return Boolean(!input.hasWaitlistClaim && input.eligibility?.isFull && !input.eligibility.canJoinWaitlist);
+//#endregion
+//#region ../blocks/src/system/runtime/nodes/event-registration/usePaymentStatusRecovery.ts
+function isCheckableRecovery(state) {
+	return state.kind === "ready" || state.kind === "processing" || state.kind === "temporarilyUnavailable";
+}
+function assistanceRequired(recovery) {
+	return {
+		kind: "assistanceRequired",
+		subject: recovery.subject
+	};
+}
+function applyStatusOutcome(outcome, recovery, setters, setRecovery) {
+	if (outcome.kind === "resolved") {
+		setters.setPendingRegistrationReference(outcome.reference);
+		setters.setRegistrationResult({ status: "confirmed" });
+		setRecovery(null);
+		setters.setStep("success");
+		return;
+	}
+	switch (outcome.kind) {
+		case "paymentProcessing":
+			setRecovery({
+				...recovery,
+				kind: "processing"
+			});
+			return;
+		case "paymentAvailable":
+			setRecovery({
+				...recovery,
+				kind: "paymentAvailable",
+				checkoutUrl: outcome.checkoutUrl
+			});
+			return;
+		case "paymentCheckUnavailable":
+			setRecovery({
+				...recovery,
+				kind: "temporarilyUnavailable"
+			});
+			return;
+		case "paymentRetryAvailable":
+			setRecovery({
+				...recovery,
+				kind: "retryAvailable"
+			});
+			return;
+		case "abandoned":
+		case "notFound":
+		case "reconciliationRequired":
+		case "paymentAssistanceRequired":
+			setRecovery(assistanceRequired(recovery));
+			return;
+	}
+}
+function usePaymentStatusRecovery(options) {
+	const [recovery, setRecovery] = useState(null);
+	const checkRef = useRef(null);
+	return {
+		recovery,
+		showRecovery: useCallback((next) => setRecovery(next), []),
+		check: useCallback(() => {
+			if (!recovery || !isCheckableRecovery(recovery) || checkRef.current) return;
+			const pending = (async () => {
+				setRecovery({
+					...recovery,
+					kind: "checking"
+				});
+				try {
+					applyStatusOutcome(await options.api.resolveEventCheckoutReturn({
+						kind: "checkStatus",
+						subject: recovery.subject
+					}), recovery, options, setRecovery);
+				} catch {
+					setRecovery({
+						...recovery,
+						kind: "temporarilyUnavailable"
+					});
+				}
+			})();
+			checkRef.current = pending;
+			pending.finally(() => {
+				if (checkRef.current === pending) checkRef.current = null;
+			});
+		}, [options, recovery]),
+		continuePayment: useCallback(() => {
+			if (recovery?.kind === "paymentAvailable") window.location.assign(recovery.checkoutUrl);
+		}, [recovery]),
+		returnToPayment: useCallback(() => {
+			if (recovery?.kind !== "retryAvailable") return;
+			options.beginNewSubmission();
+			setRecovery(null);
+			options.setOptionsRefreshKey((value) => value + 1);
+			options.setStep("select-payment");
+		}, [options, recovery]),
+		returnToBooking: useCallback(() => {
+			if (recovery?.kind !== "assistanceRequired") return;
+			options.beginNewSubmission();
+			setRecovery(null);
+			options.setOptionsRefreshKey((value) => value + 1);
+			options.setStep("select-tickets");
+		}, [options, recovery])
+	};
 }
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration/useEventRegistrationWizard.ts
@@ -17661,6 +17567,7 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 	const [errorAction, setErrorAction] = useState("retry");
 	const [optionsRefreshKey, setOptionsRefreshKey] = useState(0);
 	const [altchaSolution, setAltchaSolution] = useState(null);
+	const [checkingNextStep, setCheckingNextStep] = useState(false);
 	const { authState: portalAuthState, profile: portalProfile } = deps.usePortalAuth();
 	const waitlistClaim = deps.useWaitlistClaim();
 	const [showMagicLinkModal, setShowMagicLinkModal] = useState(false);
@@ -17687,28 +17594,29 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 	}), [options.occurrenceContext, selectedEvent]);
 	const registrationOccurrenceId = getRegistrationOccurrenceId(registrationTarget);
 	const currentEvent = selectedEvent ?? preSelectedEvent;
+	const commandRef = useRef(null);
 	const setStep = useCallback((nextStep) => {
 		dispatchFlow({
 			type: "set-step",
 			step: nextStep
 		});
 	}, []);
-	const { checkoutRecovery, startCheckoutRecovery } = useCheckoutRecovery(currentEvent, setStep);
-	const currentEventUsesTicketTypes = usesTieredPricing(currentEvent);
-	const currentCanJoinWaitlist = canJoinWaitlistOutsideRecovery(currentEvent, selectedAttendanceMode, checkoutRecovery);
-	const usesTicketTypeSelections = currentEventUsesTicketTypes && !currentCanJoinWaitlist;
+	const { recovery: paymentStatusRecovery, showRecovery: setPaymentStatusRecovery, check: handleCheckPaymentStatus, continuePayment: handleContinueExistingPayment, returnToPayment: handleReturnToPayment, returnToBooking: handleReturnToBooking } = usePaymentStatusRecovery({
+		api,
+		beginNewSubmission: () => {
+			commandRef.current = null;
+		},
+		setPendingRegistrationReference,
+		setRegistrationResult,
+		setOptionsRefreshKey,
+		setStep
+	});
+	const usesTicketTypeSelections = usesTieredPricing(currentEvent);
 	const eventTicketTypesForSelection = useMemo(() => getVisibleTicketTypes({
 		event: currentEvent,
 		eligibility: null,
 		selectedAttendanceMode
-	}).map((option) => checkoutRecovery ? {
-		...option,
-		availability: checkoutRecoveryOptionAvailability(option.availability)
-	} : option), [
-		currentEvent,
-		selectedAttendanceMode,
-		checkoutRecovery
-	]);
+	}), [currentEvent, selectedAttendanceMode]);
 	const normalizedSelectedTicketLines = useMemo(() => normalizeTicketSelectionLines(selectedTicketLines), [selectedTicketLines]);
 	const ticketTypeSelectionTotal = useMemo(() => getTicketSelectionTotal(normalizedSelectedTicketLines), [normalizedSelectedTicketLines]);
 	const ticketsCount = usesTicketTypeSelections ? ticketTypeSelectionTotal : flowState.ticketsCount;
@@ -17746,7 +17654,7 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		isAuthenticated: portalAuthState === "authenticated",
 		occurrenceId: registrationOccurrenceId
 	});
-	const eligibility = useCheckoutRecoveryEligibility(eligibilityResult.eligibility, step, checkoutRecovery, startCheckoutRecovery);
+	const eligibility = eligibilityResult.eligibility;
 	const eligibilityLoading = eligibilityResult.isLoading;
 	const eligibilityError = eligibilityResult.error;
 	const portalCreditState = eligibilityResult.creditState;
@@ -17858,14 +17766,10 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		event: currentEvent,
 		eligibility,
 		selectedAttendanceMode
-	}).map((option) => checkoutRecovery ? {
-		...option,
-		availability: checkoutRecoveryOptionAvailability(option.availability)
-	} : option), [
+	}), [
 		currentEvent,
 		selectedAttendanceMode,
-		eligibility,
-		checkoutRecovery
+		eligibility
 	]);
 	const singleSelectedPricingOptionId = getSingleSelectedPricingOptionId(normalizedSelectedTicketLines);
 	const selectedTicketType = useMemo(() => findSelectedTicketType({
@@ -17889,12 +17793,8 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		const event = currentEvent;
 		if (!usesTieredPricing(event)) return false;
 		if ((event.deliveryMode ?? "in_person") === "hybrid" && !selectedAttendanceMode) return false;
-		return checkoutRecovery || !canJoinEventWaitlist(event, { attendanceMode: selectedAttendanceMode });
-	}, [
-		currentEvent,
-		selectedAttendanceMode,
-		checkoutRecovery
-	]);
+		return true;
+	}, [currentEvent, selectedAttendanceMode]);
 	const hasValidTicketSelection = hasValidPricingOptionSelection({
 		selectionRequired: ticketTypeSelectionRequired,
 		lines: normalizedSelectedTicketLines,
@@ -17905,8 +17805,8 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 			if (selectedTicketLines.length > 0) setSelectedTicketLines([]);
 			return;
 		}
-		const availableTicketTypes = eventTicketTypesForSelection.filter((ticketType) => ticketType.availability.kind === "available");
-		const implicitTicketType = getImplicitSingleAvailableTicketType(eventTicketTypesForSelection);
+		const availableTicketTypes = eventTicketTypesForSelection.filter((ticketType) => canRequestTicketOption(ticketType.availability));
+		const implicitTicketType = getImplicitSingleTicketType(eventTicketTypesForSelection);
 		if (implicitTicketType && normalizedSelectedTicketLines.length === 0) {
 			setSelectedTicketLines([{
 				pricingOptionId: implicitTicketType.pricingOptionId,
@@ -17973,6 +17873,26 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		selectedEventSlidingScale,
 		selectedSlidingAmount
 	]);
+	const checkDetailsNextStep = async () => {
+		if (portalAuthState === "authenticated" || waitlistClaim.claim || eligibility?.availability.kind === "available" || !registrationTarget) return { kind: canRecoverToWaitlist(eligibility) ? "waitlist" : "continue" };
+		setCheckingNextStep(true);
+		try {
+			return await api.checkRegistrationNextStep({
+				subject: toRegistrationRequestSubject(registrationTarget.subject, selectedAttendanceMode),
+				selections: ticketSelections,
+				selectedSlidingAmount: selectedSlidingAmount ?? void 0,
+				email: formData.email,
+				altchaSolution
+			});
+		} catch {
+			return {
+				kind: "unavailable",
+				message: "We could not check availability. Please try again."
+			};
+		} finally {
+			setCheckingNextStep(false);
+		}
+	};
 	const handleDetailsComplete = async () => {
 		const blockDetailsCompletion = (message) => {
 			setErrorAction("places");
@@ -18004,11 +17924,10 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 				message: "Check the highlighted fields and try again."
 			};
 		}
-		if (isSoldOutWithoutWaitlist({
-			hasWaitlistClaim: waitlistClaim.claim !== null,
-			eligibility
-		})) return blockDetailsCompletion("Sorry, there aren’t enough places left for your selection. Please check the available places and choose again.");
-		if (!eligibility?.canJoinWaitlist && requiresPaymentStep({
+		const next = await checkDetailsNextStep();
+		if (next.kind === "unavailable") return blockDetailsCompletion(next.message);
+		const canJoinWaitlist = next.kind === "waitlist";
+		if (!canJoinWaitlist && requiresPaymentStep({
 			eventRequiresPayment,
 			paymentSelection
 		})) {
@@ -18021,7 +17940,7 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		const submitPlan = resolveEventRegistrationSubmitPlan({
 			paymentSelection,
 			eventRequiresPayment,
-			canJoinWaitlist: eligibility?.canJoinWaitlist
+			canJoinWaitlist
 		});
 		if (!submitPlan.ok) return blockDetailsCompletion(submitPlan.message);
 		const submitResult = await handleSubmit(submitPlan.args.method, submitPlan.args.passId, submitPlan.args.membershipId, submitPlan.args.selection);
@@ -18039,7 +17958,7 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		const submitPlan = resolveEventRegistrationSubmitPlan({
 			paymentSelection,
 			eventRequiresPayment,
-			canJoinWaitlist: eligibility?.canJoinWaitlist
+			canJoinWaitlist: false
 		});
 		if (!submitPlan.ok) {
 			setErrorMessage(submitPlan.message);
@@ -18071,6 +17990,7 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 	const selectionMethod = paymentSelection.method;
 	const shouldShowDiscountToggle = discountContext !== null && discountUi.manualCodeEntryAllowed && (selectionMethod === "stripe" || selectionMethod === "pass_bundle" || selectionMethod === "membership_bundle");
 	const handleSubmit = deps.useEventRegistrationSubmit({
+		commandRef,
 		setErrorAction,
 		api,
 		registrationTarget,
@@ -18087,7 +18007,8 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		setPendingRegistrationReference,
 		setStep,
 		setRegistrationResult: (result) => setRegistrationResult(result),
-		setErrorMessage
+		setErrorMessage,
+		setPaymentStatusRecovery
 	});
 	const handleEventSelect = (event) => {
 		setSelectedEvent(event);
@@ -18146,8 +18067,6 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		scopedEvents,
 		preSelectedEvent,
 		hasPreSelectedContext,
-		checkoutRecovery,
-		startCheckoutRecovery,
 		step,
 		setStep,
 		selectedEvent,
@@ -18201,7 +18120,7 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		waitlistClaim,
 		eligibility,
 		registrationOptionsState: eligibilityResult.state,
-		eligibilityLoading,
+		eligibilityLoading: eligibilityLoading || checkingNextStep,
 		eligibilityError,
 		existingRegistration: existingRegistrationResult.registration,
 		existingRegistrationLoading: existingRegistrationResult.isLoading || portalAuthState === "authenticated" && eligibilityLoading,
@@ -18221,6 +18140,11 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		discountContext,
 		shouldShowDiscountToggle,
 		verification,
+		paymentStatusRecovery,
+		handleCheckPaymentStatus,
+		handleContinueExistingPayment,
+		handleReturnToPayment,
+		handleReturnToBooking,
 		handleDetailsComplete,
 		handlePaymentSelect,
 		handleUseCardInsteadOfPass,
@@ -18273,7 +18197,7 @@ function useEventRegistrationControllerWithDeps(options, deps) {
 				selection: wizard.paymentSelection
 			}),
 			eventRequiresPayment: wizard.eventRequiresPayment,
-			canJoinWaitlist: wizard.eligibility?.canJoinWaitlist
+			canJoinWaitlist: wizard.step !== "select-payment" && wizard.eligibility?.availability.kind === "waitlist" && wizard.eligibility.registration.kind !== "pending_payment"
 		});
 		if (!plan.ok) return {
 			ok: false,
@@ -18318,6 +18242,7 @@ function useEventRegistrationControllerWithDeps(options, deps) {
 			case "redirecting":
 			case "verifying-payment":
 			case "verifying-timeout":
+			case "payment-status":
 			case "payment-failed": return {
 				ok: false,
 				reason: "blocked",
@@ -18325,27 +18250,7 @@ function useEventRegistrationControllerWithDeps(options, deps) {
 			};
 		}
 	}, [submit, wizard]);
-	const back = useCallback(() => {
-		switch (wizard.step) {
-			case "enter-details":
-				wizard.setStep("select-tickets");
-				return;
-			case "select-payment":
-				wizard.setStep("enter-details");
-				return;
-			case "select-tickets":
-				if (!wizard.hasPreSelectedContext) wizard.setStep("select-event");
-				return;
-			case "select-event":
-			case "error":
-			case "success":
-			case "submitting":
-			case "redirecting":
-			case "verifying-payment":
-			case "verifying-timeout":
-			case "payment-failed": return;
-		}
-	}, [wizard]);
+	const back = useEventRegistrationBack(wizard);
 	const updateAttendee = useCallback((values) => {
 		wizard.setFormData(values);
 	}, [wizard]);
@@ -18432,7 +18337,8 @@ function useEventRegistrationControllerWithDeps(options, deps) {
 			terminal: {
 				result: wizard.registrationResult,
 				errorMessage: wizard.errorMessage,
-				verification: wizard.verification
+				verification: wizard.verification,
+				paymentStatusRecovery: wizard.paymentStatusRecovery
 			},
 			actions: {
 				selectEvent: wizard.handleEventSelect,
@@ -18456,12 +18362,40 @@ function useEventRegistrationControllerWithDeps(options, deps) {
 				next,
 				back,
 				submit,
-				retry: wizard.handleRetry
+				retry: wizard.handleRetry,
+				checkPaymentStatus: wizard.handleCheckPaymentStatus,
+				continueExistingPayment: wizard.handleContinueExistingPayment,
+				returnToPayment: wizard.handleReturnToPayment,
+				returnToBooking: wizard.handleReturnToBooking
 			}
 		},
 		wizard
 	};
 }
+function useEventRegistrationBack(wizard) {
+	return useCallback(() => {
+		switch (wizard.step) {
+			case "enter-details":
+				wizard.setStep("select-tickets");
+				return;
+			case "select-payment":
+				wizard.setStep("enter-details");
+				return;
+			case "select-tickets":
+				if (!wizard.hasPreSelectedContext) wizard.setStep("select-event");
+				return;
+			case "select-event":
+			case "error":
+			case "success":
+			case "submitting":
+			case "redirecting":
+			case "verifying-payment":
+			case "verifying-timeout":
+			case "payment-status":
+			case "payment-failed": return;
+		}
+	}, [wizard]);
+}
 function useEventRegistrationWizardControllerWithDeps(options, deps) {
 	const maxTicketsNum = normalizeEventRegistrationMaxTickets(options.maxTickets);
 	return { wizard: deps.useEventRegistrationWizard({
@@ -18517,7 +18451,7 @@ function resolvePaymentModel(wizard, directPaymentOptions) {
 }
 function resolveHeadlessDirectPaymentOptions(wizard) {
 	const eligibility = wizard.eligibility;
-	if (!eligibility?.eligible || !eligibility.canPayDirectly || !eligibility.price) return [];
+	if (!eligibility?.requiresPayment || !eligibility.price) return [];
 	const event = wizard.selectedEvent ?? wizard.preSelectedEvent;
 	return buildEventRegistrationPaymentOptionsViewModel({
 		eventTitle: event?.title ?? "Event",