@riverbankcms/sdk 0.142.0 → 0.143.0

package/dist/client/rendering/client.mjs

@@ -9612,6 +9612,10 @@ var init_endpoints = __esmMin((() => {
 			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"
@@ -10194,6 +10198,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 });
@@ -33622,6 +33633,18 @@ var init_wizardSteps$1 = __esmMin((() => {
 }));
 //#endregion
 //#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);
 }
@@ -33851,6 +33874,7 @@ function shellLabelForRegistrationStep(step, events) {
 		case "redirecting":
 		case "verifying-payment":
 		case "verifying-timeout":
+		case "payment-status":
 		case "payment-failed": return "Details";
 	}
 }
@@ -46823,7 +46847,7 @@ var init_eventPaymentOptions = __esmMin((() => {
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration/registrationStateMachine.ts
 function hasBlockingExistingRegistration(input) {
-	return !input.hasWaitlistClaim && input.isAuthenticated && input.registration.kind !== "none";
+	return !input.hasWaitlistClaim && input.isAuthenticated && input.registration.kind === "waitlisted";
 }
 function createInitialRegistrationFlowState(hasPreSelectedContext) {
 	return {
@@ -46875,7 +46899,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 ? {
@@ -46889,7 +46913,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);
@@ -46908,7 +46932,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,
@@ -47000,7 +47024,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 ? {
@@ -47069,92 +47093,55 @@ var init_event_registration_headless_state = __esmMin((() => {
 	init_event_registration_headless_planning();
 }));
 //#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;
+//#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";
 }
-/**
-* 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 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 isSoldOutEventSelectable(event, waitlistAvailable) {
-	return waitlistAvailable || canRecoverEventCheckout(event);
+function getTicketSelectionTotal(lines) {
+	return normalizeTicketSelectionLines(lines).reduce((total, line) => total + line.quantity, 0);
 }
-function canJoinWaitlistOutsideRecovery(event, attendanceMode, checkoutRecovery) {
-	return !checkoutRecovery && event !== null && canJoinEventWaitlist(event, { attendanceMode });
+function getTicketLineQuantity(lines, pricingOptionId) {
+	return normalizeTicketSelectionLines(lines).find((line) => line.pricingOptionId === pricingOptionId)?.quantity ?? 0;
 }
-function canRecoverEventCheckout(event) {
-	return event !== null && (event.registrationSubject.kind === "wholeSeries" || event.pricing.kind !== "free" && event.pricing.kind !== "external");
+function getSingleSelectedPricingOptionId(lines) {
+	const normalized = normalizeTicketSelectionLines(lines);
+	return normalized.length === 1 ? normalized[0]?.pricingOptionId ?? null : null;
 }
-var init_checkoutRecovery = __esmMin((() => {
-	init_domain();
-}));
+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));
+}
+function setTicketLineQuantity(input) {
+	const nextQuantity = Math.max(0, Math.floor(input.quantity));
+	const normalized = normalizeTicketSelectionLines(input.lines).filter((line) => line.pricingOptionId !== input.pricingOptionId);
+	if (nextQuantity <= 0) return normalized;
+	return [...normalized, {
+		pricingOptionId: input.pricingOptionId,
+		quantity: nextQuantity
+	}];
+}
+function getTicketTypeLineMax(input) {
+	const otherSelectedQuantity = input.totalSelectedQuantity - input.currentQuantity;
+	const maxByBlock = input.maxTickets - otherSelectedQuantity;
+	return Math.max(0, maxByBlock);
+}
+var init_ticketSelectionLines = __esmMin((() => {}));
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration/utils.ts
 function getPortalSubjectEmail(profile) {
@@ -47218,8 +47205,6 @@ function formatPassCreditUsageLabel(creditsRemaining) {
 	return `Uses 1 of ${creditsRemaining} credits`;
 }
 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,
@@ -47232,7 +47217,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,
@@ -47247,7 +47231,6 @@ function transformRegistrationOptionsResponse(response) {
 			},
 			transactions: []
 		} : null,
-		eligible: response.registration.kind === "none" && registrationAvailable,
 		requiresPayment: monetaryPaymentAvailable,
 		pricingStrategy: response.pricing.strategy,
 		paymentTerms: response.pricing.paymentTerms,
@@ -47262,16 +47245,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],
@@ -47301,8 +47280,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;
@@ -47315,6 +47294,7 @@ function findSelectedTicketType(input) {
 var ENTITLEMENT_SINGLE_TICKET_TOOLTIP;
 var init_utils = __esmMin((() => {
 	init_src$2();
+	init_ticketSelectionLines();
 	init_shared();
 	ENTITLEMENT_SINGLE_TICKET_TOOLTIP = "Only available for single-ticket bookings";
 }));
@@ -47327,7 +47307,6 @@ function getEventSelectionMode(events) {
 }
 var EventSelectionStep;
 var init_EventSelectionStep = __esmMin((() => {
-	init_checkoutRecovery();
 	init_utils();
 	init_domain();
 	EventSelectionStep = ({ events, selectedEvent, onSelect, showVenue, showCapacity }) => {
@@ -47344,25 +47323,19 @@ var init_EventSelectionStep = __esmMin((() => {
 					const remaining = getRemainingPlaces(selectMostOpenCapacitySource(event));
 					const isSoldOut = isEventFull(event);
 					const canJoinWaitlist = canJoinEventWaitlistOnAnyMode(event);
-					const isUnavailable = isSoldOut && !isSoldOutEventSelectable(event, canJoinWaitlist);
 					const isLowCapacity = remaining.kind === "low";
 					const capacityLabel = formatEventRemainingPlaces(event, { full: "Sold out" });
 					const timeZone = event.timeZone ?? null;
-					const cardClasses = [
-						"er-event-card",
-						isSelected && "er-event-card--selected",
-						isUnavailable && "er-event-card--disabled"
-					].filter(Boolean).join(" ");
+					const cardClasses = ["er-event-card", isSelected && "er-event-card--selected"].filter(Boolean).join(" ");
 					const badgeClasses = [
 						"er-capacity-badge",
-						isUnavailable && "er-capacity-badge--soldout",
+						isSoldOut && "er-capacity-badge--soldout",
 						isLowCapacity && "er-capacity-badge--low",
-						(canJoinWaitlist || !isUnavailable && !isLowCapacity) && "er-capacity-badge--available"
+						(canJoinWaitlist || !isSoldOut && !isLowCapacity) && "er-capacity-badge--available"
 					].filter(Boolean).join(" ");
 					return /* @__PURE__ */ jsx("button", {
 						type: "button",
-						onClick: () => !isUnavailable && onSelect(event),
-						disabled: isUnavailable,
+						onClick: () => onSelect(event),
 						className: cardClasses,
 						children: /* @__PURE__ */ jsxs("div", {
 							className: "er-event-option",
@@ -47390,44 +47363,15 @@ var init_EventSelectionStep = __esmMin((() => {
 	};
 }));
 //#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]);
-}
-var init_useCheckoutRecovery = __esmMin((() => {
-	init_checkoutRecovery();
-}));
-//#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";
@@ -47444,19 +47388,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();
@@ -47496,54 +47440,6 @@ function validateFormData(formData, requiresConsent = false) {
 }
 var init_validation = __esmMin((() => {}));
 //#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
-	}));
-}
-function getTicketSelectionTotal(lines) {
-	return normalizeTicketSelectionLines(lines).reduce((total, line) => total + line.quantity, 0);
-}
-function getTicketLineQuantity(lines, pricingOptionId) {
-	return normalizeTicketSelectionLines(lines).find((line) => line.pricingOptionId === pricingOptionId)?.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) => option.availability.kind === "available").map((option) => option.pricingOptionId));
-	return input.lines.every((line) => line.pricingOptionId !== null && availableOptionIds.has(line.pricingOptionId));
-}
-function setTicketLineQuantity(input) {
-	const nextQuantity = Math.max(0, Math.floor(input.quantity));
-	const normalized = normalizeTicketSelectionLines(input.lines).filter((line) => line.pricingOptionId !== input.pricingOptionId);
-	if (nextQuantity <= 0) return normalized;
-	return [...normalized, {
-		pricingOptionId: input.pricingOptionId,
-		quantity: nextQuantity
-	}];
-}
-function getTicketTypeLineMax(input) {
-	const otherSelectedQuantity = input.totalSelectedQuantity - input.currentQuantity;
-	const maxByBlock = input.maxTickets - otherSelectedQuantity;
-	const maxByEvent = input.availableSpots == null ? input.maxTickets : input.availableSpots - otherSelectedQuantity;
-	const maxByTicketType = input.ticketTypeRemainingCapacity ?? input.maxTickets;
-	return Math.max(0, Math.min(maxByBlock, maxByEvent, maxByTicketType));
-}
-var init_ticketSelectionLines = __esmMin((() => {}));
-//#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration/hooks.state.ts
 function eligibilityLookupReducer(state, action) {
 	switch (action.type) {
@@ -47655,17 +47551,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);
 }
@@ -47706,7 +47591,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) => ({
@@ -47828,6 +47713,7 @@ var init_hooks = __esmMin((() => {
 	init_api();
 	init_utils();
 	init_ticketSelectionLines();
+	init_registrationDerivations();
 	init_hooks_state();
 	eventRegistrationHooksDeps = { useBlockApi };
 	REGISTRATION_OPTIONS_DEBOUNCE_MS = 150;
@@ -48294,7 +48180,6 @@ var init_stripeMinimumCharge = __esmMin((() => {
 var init_stripeCheckoutReturnUrl = __esmMin((() => {}));
 var init_stateTransitions = __esmMin((() => {
 	init_src$2();
-	init_assertNever();
 }));
 //#endregion
 //#region ../commerce/src/purchase/event-registration-errors.ts
@@ -48308,9 +48193,9 @@ var init_event_registration_errors = __esmMin((() => {
 			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.",
@@ -48362,6 +48247,7 @@ var init_event_registration_errors = __esmMin((() => {
 		}
 	};
 }));
+var init_eventCheckoutRecoveryWindow = __esmMin((() => {}));
 //#endregion
 //#region ../commerce/src/purchase/index.ts
 var init_purchase = __esmMin((() => {
@@ -48423,6 +48309,7 @@ var init_purchase = __esmMin((() => {
 	init_stripeCheckoutReturnUrl();
 	init_stateTransitions();
 	init_event_registration_errors();
+	init_eventCheckoutRecoveryWindow();
 	init_stripeCommissionMetadata();
 }));
 //#endregion
@@ -48861,7 +48748,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";
@@ -48875,34 +48785,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.");
 	}
@@ -48911,9 +48802,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 () => {
@@ -48921,7 +48819,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;
 		}
@@ -48944,13 +48842,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");
@@ -49009,7 +48902,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"
+	};
 }
 var init_registrationErrorPresentation = __esmMin((() => {
 	init_purchase();
@@ -49038,26 +48934,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.
@@ -49071,7 +48947,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;
@@ -49084,19 +48960,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
@@ -49105,8 +48977,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);
@@ -49130,9 +49001,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,
@@ -49163,15 +49065,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) {
@@ -49195,85 +49089,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;
@@ -49286,14 +49101,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 {
@@ -49305,12 +49112,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,
@@ -49335,6 +49153,7 @@ var init_useEventRegistrationSubmit = __esmMin((() => {
 	init_shared();
 	init_registrationErrorPresentation();
 	init_constants();
+	init_registrationDerivations();
 	init_sessionStorage();
 	init_ticketSelectionLines();
 	eventRegistrationSubmitDeps = {
@@ -49552,23 +49371,128 @@ var init_useWaitlistClaimRestoration = __esmMin((() => {
 }));
 //#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);
-}
 var init_registrationCompletion = __esmMin((() => {}));
 //#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])
+	};
+}
+var init_usePaymentStatusRecovery = __esmMin((() => {}));
+//#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration/useEventRegistrationWizard.ts
 function usesTieredPricing(event) {
 	return event !== null && event !== void 0 ? publicEventPricingStrategy(event.pricing) === "tiered" : false;
@@ -49615,6 +49539,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);
@@ -49641,28 +49566,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;
@@ -49700,7 +49626,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;
@@ -49812,14 +49738,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({
@@ -49843,12 +49765,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,
@@ -49859,8 +49777,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,
@@ -49927,6 +49845,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");
@@ -49958,11 +49896,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
 		})) {
@@ -49975,7 +49912,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);
@@ -49993,7 +49930,7 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		const submitPlan = resolveEventRegistrationSubmitPlan({
 			paymentSelection,
 			eventRequiresPayment,
-			canJoinWaitlist: eligibility?.canJoinWaitlist
+			canJoinWaitlist: false
 		});
 		if (!submitPlan.ok) {
 			setErrorMessage(submitPlan.message);
@@ -50025,6 +49962,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,
@@ -50041,7 +49979,8 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		setPendingRegistrationReference,
 		setStep,
 		setRegistrationResult: (result) => setRegistrationResult(result),
-		setErrorMessage
+		setErrorMessage,
+		setPaymentStatusRecovery
 	});
 	const handleEventSelect = (event) => {
 		setSelectedEvent(event);
@@ -50100,8 +50039,6 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		scopedEvents,
 		preSelectedEvent,
 		hasPreSelectedContext,
-		checkoutRecovery,
-		startCheckoutRecovery,
 		step,
 		setStep,
 		selectedEvent,
@@ -50155,7 +50092,7 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		waitlistClaim,
 		eligibility,
 		registrationOptionsState: eligibilityResult.state,
-		eligibilityLoading,
+		eligibilityLoading: eligibilityLoading || checkingNextStep,
 		eligibilityError,
 		existingRegistration: existingRegistrationResult.registration,
 		existingRegistrationLoading: existingRegistrationResult.isLoading || portalAuthState === "authenticated" && eligibilityLoading,
@@ -50175,6 +50112,11 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		discountContext,
 		shouldShowDiscountToggle,
 		verification,
+		paymentStatusRecovery,
+		handleCheckPaymentStatus,
+		handleContinueExistingPayment,
+		handleReturnToPayment,
+		handleReturnToBooking,
 		handleDetailsComplete,
 		handlePaymentSelect,
 		handleUseCardInsteadOfPass,
@@ -50186,12 +50128,9 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 }
 var eventRegistrationWizardDeps;
 var init_useEventRegistrationWizard = __esmMin((() => {
-	init_checkoutRecovery();
-	init_useCheckoutRecovery();
 	init_src$2();
 	init_registrationErrorRecovery();
 	init_api();
-	init_domain();
 	init_validation();
 	init_hooks();
 	init_portalLogout();
@@ -50211,6 +50150,7 @@ var init_useEventRegistrationWizard = __esmMin((() => {
 	init_waitlistClaimRestoration();
 	init_useWaitlistClaimRestoration();
 	init_registrationCompletion();
+	init_usePaymentStatusRecovery();
 	eventRegistrationWizardDeps = {
 		usePortalAuth,
 		useEligibility,
@@ -50394,7 +50334,6 @@ var init_ErrorStep = __esmMin((() => {
 		start: "Start again",
 		details: "Check my details",
 		"payment-options": "View payment options",
-		"payment-status": "Check payment status",
 		portal: "View my bookings",
 		event: "View event"
 	};
@@ -50413,7 +50352,7 @@ var init_ErrorStep = __esmMin((() => {
 				className: "er-text--muted er-message",
 				children: offerWaitlist ? "Sorry, this event is now full. You can join the waiting list, and we’ll email you if a place becomes available." : message
 			}),
-			actions: action === "none" ? void 0 : action === "portal" || action === "payment-status" ? /* @__PURE__ */ jsx("a", {
+			actions: action === "none" ? void 0 : action === "portal" ? /* @__PURE__ */ jsx("a", {
 				href: "/portal",
 				className: "er-retry-btn",
 				children: labels[action]
@@ -50674,8 +50613,11 @@ var init_EventRegistrationSummaryBar = __esmMin((() => {
 */
 function resolveDetailsButtonText(input) {
 	const { wizard } = input;
-	if (wizard.eligibility?.canJoinWaitlist) return "Join waitlist";
-	if (!input.hasWaitlistClaim && wizard.eligibility?.isFull) return "Sold out";
+	const availability = wizard.eligibility?.availability;
+	const full = availability?.kind === "waitlist" || isSelectionSoldOut(availability);
+	if (wizard.portalAuthState !== "authenticated" && full) return "Continue";
+	if (canRecoverToWaitlist(wizard.eligibility)) return "Join waitlist";
+	if (!input.hasWaitlistClaim && full && wizard.eligibility?.registration.kind !== "pending_payment") return "Sold out";
 	if (wizard.paymentSelection.method === "pass") return "Book using class pass";
 	if (wizard.paymentSelection.method === "membership") return input.fallbackText;
 	return wizard.eventRequiresPayment ? "Continue to payment" : input.fallbackText;
@@ -50690,44 +50632,28 @@ function isExistingRegistrationBlocking$1(wizard) {
 		hasWaitlistClaim: wizard.waitlistClaim.claim !== null
 	});
 }
-/**
-* Full for the visitor's selected attendance mode (or the whole event when no
-* mode is chosen) with no waitlist to fall back on. Reads the same capacity
-* source as the steps above the action bar so the button never disagrees
-* with them on a hybrid event.
-*/
-function isFullWithNoWaitlist(event, attendanceMode) {
-	if (!event) return false;
-	const source = selectEventCapacitySource(event, attendanceMode);
-	return getEventAvailability(source).isFull && !source.waitlistEnabled;
-}
 function resolveTicketSelectionContinueLabel(input) {
 	if (input.isCheckingExistingRegistration) return "Checking registration...";
 	if (input.registrationOptionsPending) return "Checking availability...";
 	if (input.registrationOptionsFailed) return "Availability unavailable";
 	if (input.hasExistingRegistration) return resolveExistingRegistrationLabel(input.wizard);
-	if (input.isSoldOutWithoutWaitlist) return "Sold out";
 	if (input.ticketTypeSelectionBlocked) return "Choose a ticket";
 	return "Continue";
 }
 function SelectTicketsActions(props) {
 	const { wizard } = props;
-	const hasWaitlistClaim = wizard.waitlistClaim.claim !== null;
-	const currentEvent = wizard.selectedEvent ?? wizard.preSelectedEvent;
 	const registrationOptionsPending = wizard.registrationOptionsState.tag === "idle" || wizard.registrationOptionsState.tag === "loading";
 	const registrationOptionsFailed = wizard.registrationOptionsState.tag === "failed";
-	const isSoldOutWithoutWaitlist = !wizard.checkoutRecovery && !hasWaitlistClaim && isFullWithNoWaitlist(currentEvent, wizard.selectedAttendanceMode);
 	const isCheckingExistingRegistration = wizard.portalAuthState === "authenticated" && wizard.existingRegistrationLoading;
 	const hasExistingRegistration = isExistingRegistrationBlocking$1(wizard);
 	const ticketTypeSelectionBlocked = wizard.ticketTypeSelectionRequired && !wizard.hasValidTicketSelection;
-	const isContinueDisabled = registrationOptionsPending || registrationOptionsFailed || isCheckingExistingRegistration || hasExistingRegistration || isSoldOutWithoutWaitlist || ticketTypeSelectionBlocked;
+	const isContinueDisabled = registrationOptionsPending || registrationOptionsFailed || isCheckingExistingRegistration || hasExistingRegistration || ticketTypeSelectionBlocked;
 	const continueLabel = resolveTicketSelectionContinueLabel({
 		wizard,
 		registrationOptionsPending,
 		registrationOptionsFailed,
 		isCheckingExistingRegistration,
 		hasExistingRegistration,
-		isSoldOutWithoutWaitlist,
 		ticketTypeSelectionBlocked
 	});
 	return /* @__PURE__ */ jsxs("div", {
@@ -50758,8 +50684,12 @@ function EnterDetailsActions(props) {
 	const { wizard } = props;
 	const hasWaitlistClaim = wizard.waitlistClaim.claim !== null;
 	const isCheckingEligibility = wizard.eligibilityLoading;
-	const eligibilityUnavailable = !hasWaitlistClaim && (Boolean(wizard.eligibilityError) || !wizard.eligibility || wizard.eligibility.availability.kind === "unavailable" || !wizard.eligibility.eligible);
-	const isSoldOut = !hasWaitlistClaim && wizard.eligibility?.isFull === true && wizard.eligibility.canJoinWaitlist !== true;
+	const eligibilityUnavailable = Boolean(resolveRegistrationAvailabilityBlocker({
+		hasWaitlistClaim,
+		eligibility: wizard.eligibility,
+		eligibilityError: wizard.eligibilityError
+	}));
+	const isSoldOut = !hasWaitlistClaim && wizard.portalAuthState === "authenticated" && wizard.eligibility?.registration.kind !== "pending_payment" && isSelectionSoldOut(wizard.eligibility?.availability);
 	const isContinueDisabled = isCheckingEligibility || eligibilityUnavailable || isSoldOut;
 	const continueLabel = isCheckingEligibility ? "Checking availability..." : wizard.eligibilityError ? "Availability unavailable" : eligibilityUnavailable ? "Registration unavailable" : resolveDetailsButtonText({
 		wizard,
@@ -50810,6 +50740,7 @@ function EventRegistrationWizardActions(props) {
 		case "redirecting":
 		case "verifying-payment":
 		case "verifying-timeout":
+		case "payment-status":
 		case "payment-failed": return null;
 		case "select-event": return null;
 		case "select-tickets": return /* @__PURE__ */ jsx(SelectTicketsActions, { ...props });
@@ -50821,7 +50752,8 @@ function EventRegistrationWizardActions(props) {
 var init_EventRegistrationWizardActions = __esmMin((() => {
 	init_registrationStateMachine();
 	init_spinner$1();
-	init_domain();
+	init_registrationCompletion();
+	init_registrationErrorRecovery();
 }));
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration/siteCreditPreview.ts
@@ -50902,7 +50834,7 @@ var init_siteCreditPreview = __esmMin((() => {
 function resolvePaymentStepStatus(input) {
 	if (input.loading) return "loading";
 	if (input.error || !input.eligibility) return "error";
-	if (input.eligibility.registration.kind !== "none" || !input.eligibility.eligible && !input.eligibility.isFree) return "not-eligible";
+	if (input.eligibility.registration.kind === "waitlisted" || input.eligibility.paymentOptions.length === 0) return "not-eligible";
 	return "ready";
 }
 function shouldPromptForLogin(status, isAuthenticated, eligibility) {
@@ -50937,7 +50869,7 @@ function UnavailableEntitlementMessage(props) {
 	] });
 }
 function IneligiblePaymentPanel(props) {
-	if (props.eligibility.isFull && !props.eligibility.canJoinWaitlist) return /* @__PURE__ */ jsxs("div", {
+	if (isSelectionSoldOut(props.eligibility.availability)) return /* @__PURE__ */ jsxs("div", {
 		className: "rb-reg-stack er-stack",
 		children: [/* @__PURE__ */ jsx("h3", {
 			className: "er-title",
@@ -51006,26 +50938,23 @@ function PaymentBlockingPanel(props) {
 		})
 	});
 	if (!props.eligibility) return /* @__PURE__ */ jsx(MissingEligibilityPanel, {});
-	if (props.eligibility.registration.kind !== "none") {
-		const isBooked = props.eligibility.registration.kind === "booked";
-		return /* @__PURE__ */ jsxs("div", {
-			className: "rb-reg-stack er-stack",
-			children: [/* @__PURE__ */ jsx("h3", {
-				className: "er-title",
-				children: isBooked ? "Already booked" : "Already on the waitlist"
-			}), /* @__PURE__ */ jsxs("div", {
-				className: "er-center",
-				children: [/* @__PURE__ */ jsx("p", {
-					className: "er-text er-text--muted",
-					children: isBooked ? "You already have a booking for this event. Please check your bookings to see its status. If you need help, contact the organiser." : "You're already on the waitlist for this event."
-				}), /* @__PURE__ */ jsx("a", {
-					href: "/portal",
-					className: "er-retry-btn",
-					children: "View my bookings"
-				})]
+	if (props.eligibility.registration.kind === "waitlisted") return /* @__PURE__ */ jsxs("div", {
+		className: "rb-reg-stack er-stack",
+		children: [/* @__PURE__ */ jsx("h3", {
+			className: "er-title",
+			children: "Already on the waitlist"
+		}), /* @__PURE__ */ jsxs("div", {
+			className: "er-center",
+			children: [/* @__PURE__ */ jsx("p", {
+				className: "er-text er-text--muted",
+				children: "You're already on the waitlist for this event."
+			}), /* @__PURE__ */ jsx("a", {
+				href: "/portal",
+				className: "er-retry-btn",
+				children: "View my bookings"
 			})]
-		});
-	}
+		})]
+	});
 	if (props.eligibility.isFree) return /* @__PURE__ */ jsxs("div", {
 		className: "rb-reg-stack er-stack",
 		children: [/* @__PURE__ */ jsx("h3", {
@@ -51046,7 +50975,7 @@ function PaymentBlockingPanel(props) {
 			})]
 		})]
 	});
-	return props.eligibility.eligible ? null : /* @__PURE__ */ jsx(IneligiblePaymentPanel, {
+	return props.eligibility.paymentOptions.length > 0 ? null : /* @__PURE__ */ jsx(IneligiblePaymentPanel, {
 		eligibility: props.eligibility,
 		email: props.email,
 		isAuthenticated: props.isAuthenticated,
@@ -51056,6 +50985,7 @@ function PaymentBlockingPanel(props) {
 var init_PaymentBlockingPanel = __esmMin((() => {
 	init_buttons();
 	init_spinner$1();
+	init_registrationCompletion();
 }));
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration/types.ts
@@ -51185,7 +51115,7 @@ function SlidingScaleAmountField(props) {
 }
 function TicketTypeQuantityRows(props) {
 	const totalSelectedQuantity = getTicketSelectionTotal(props.ticketSelections);
-	const effectiveMaxTickets = props.availableSpots == null ? props.maxTickets : Math.min(props.maxTickets, props.availableSpots);
+	const effectiveMaxTickets = props.maxTickets;
 	return /* @__PURE__ */ jsxs("div", {
 		className: "er-ticket-lines",
 		children: [
@@ -51195,16 +51125,14 @@ function TicketTypeQuantityRows(props) {
 				"aria-label": props.bookingUnit === "place" ? "Places" : "Tickets",
 				children: props.ticketTypes.map((ticketType) => {
 					const quantity = getTicketLineQuantity(props.ticketSelections, ticketType.pricingOptionId);
-					const disabled = ticketType.availability.kind === "unavailable";
+					const disabled = !canRequestTicketOption(ticketType.availability);
 					const availabilityLabel = getTicketTypeAvailabilityLabel(ticketType);
 					const ticketTypeRemainingLabel = formatTicketTypeRemaining(ticketType.availability.remainingPlaces);
 					const priceLabel = ticketType.priceAmount > 0 ? formatPrice(ticketType.priceAmount, props.currency) : "Free";
 					const maxAllowed = disabled ? 0 : getTicketTypeLineMax({
 						currentQuantity: quantity,
 						totalSelectedQuantity,
-						maxTickets: props.maxTickets,
-						availableSpots: props.availableSpots,
-						ticketTypeRemainingCapacity: ticketType.availability.remainingPlaces
+						maxTickets: props.maxTickets
 					});
 					return /* @__PURE__ */ jsxs("div", {
 						className: `er-ticket-line${disabled ? " er-ticket-line--disabled" : ""}`,
@@ -51309,33 +51237,13 @@ function AttendanceModeTiles(props) {
 		})
 	});
 }
-function getMaxAllowedTicketCount(input) {
-	if (input.canJoinWaitlist) return input.maxTickets;
-	if (!input.usesTicketTypes) return Math.min(input.maxTickets, input.availableSpots ?? input.maxTickets);
-	if (!input.hasSelectedTicketType) return 1;
-	return Math.max(1, Math.min(input.maxTickets, input.selectedTicketTypeRemainingCapacity ?? input.maxTickets, input.availableSpots ?? input.maxTickets));
-}
 function resolveTicketSelectionPricing(event) {
 	return {
 		mode: event ? publicEventPricingStrategy(event.pricing) : void 0,
 		currency: event ? publicEventPricingCurrency(event.pricing) : null
 	};
 }
-function CheckoutRecoveryEntry(props) {
-	return props.onContinue ? /* @__PURE__ */ jsx("button", {
-		type: "button",
-		className: "er-back-btn",
-		onClick: props.onContinue,
-		children: "Continue an existing booking"
-	}) : null;
-}
-function getTicketSelectionCapacity(event, attendanceMode, checkoutRecovery) {
-	if (checkoutRecovery) return {
-		availableSpots: null,
-		isSoldOut: false,
-		canJoinWaitlist: false,
-		eventAvailabilityLabel: null
-	};
+function getTicketSelectionCapacity(event, attendanceMode) {
 	const source = event ? selectEventCapacitySource(event, attendanceMode) : null;
 	const availability = source ? getEventAvailability(source) : null;
 	const canJoinWaitlist = source ? canJoinEventWaitlist(source) : false;
@@ -51352,29 +51260,21 @@ var init_TicketSelectionStep = __esmMin((() => {
 	init_domain();
 	init_utils();
 	init_ticketSelectionLines();
-	TicketSelectionStep = ({ event, occurrenceContext: _occurrenceContext, selectedAttendanceMode = null, onAttendanceModeChange, ticketsCount, maxTickets, visibleTicketTypes: visibleTicketTypesOverride, ticketSelections = [], onTicketSelectionsChange, slidingScale = null, selectedSlidingAmountInput = "", slidingScaleSelectionMessage = null, onSlidingAmountChange, onTicketsChange, bookingUnit = { kind: "ticket" }, checkoutRecovery = false, onCheckoutRecovery }) => {
+	TicketSelectionStep = ({ event, occurrenceContext: _occurrenceContext, selectedAttendanceMode = null, onAttendanceModeChange, ticketsCount, maxTickets, visibleTicketTypes: visibleTicketTypesOverride, ticketSelections = [], onTicketSelectionsChange, slidingScale = null, selectedSlidingAmountInput = "", slidingScaleSelectionMessage = null, onSlidingAmountChange, onTicketsChange, bookingUnit = { kind: "ticket" } }) => {
 		const unit = bookingUnit.kind;
 		const deliveryMode = event?.deliveryMode ?? "in_person";
 		const attendanceModes = event?.attendanceModes ?? [];
-		const { availableSpots, isSoldOut, canJoinWaitlist, eventAvailabilityLabel } = getTicketSelectionCapacity(event, selectedAttendanceMode, checkoutRecovery);
+		const { availableSpots, isSoldOut, canJoinWaitlist, eventAvailabilityLabel } = getTicketSelectionCapacity(event, selectedAttendanceMode);
 		const { mode: eventPricingMode, currency: eventPricingCurrency } = resolveTicketSelectionPricing(event);
-		const usesTicketTypes = eventPricingMode === "tiered" && !canJoinWaitlist;
+		const usesTicketTypes = eventPricingMode === "tiered";
 		const visibleTicketTypes = usesTicketTypes ? visibleTicketTypesOverride ?? getVisibleTicketTypes({
 			event,
 			eligibility: null,
 			selectedAttendanceMode
 		}) : [];
-		const implicitTicketType = usesTicketTypes ? getImplicitSingleAvailableTicketType(visibleTicketTypes) : null;
 		const noVisibleTicketTypes = usesTicketTypes && visibleTicketTypes.length === 0;
-		const hasAvailableTicketTypes = usesTicketTypes && visibleTicketTypes.some((ticketType) => ticketType.availability.kind === "available");
-		const maxAllowed = getMaxAllowedTicketCount({
-			canJoinWaitlist,
-			usesTicketTypes,
-			maxTickets,
-			availableSpots,
-			selectedTicketTypeRemainingCapacity: implicitTicketType?.availability.remainingPlaces ?? null,
-			hasSelectedTicketType: implicitTicketType !== null
-		});
+		const hasAvailableTicketTypes = usesTicketTypes && visibleTicketTypes.some((ticketType) => canRequestTicketOption(ticketType.availability));
+		const maxAllowed = maxTickets;
 		if (deliveryMode === "hybrid" && !selectedAttendanceMode) return /* @__PURE__ */ jsxs("div", {
 			className: "rb-reg-stack er-stack",
 			children: [
@@ -51393,20 +51293,6 @@ var init_TicketSelectionStep = __esmMin((() => {
 				})
 			]
 		});
-		if (isSoldOut && !canJoinWaitlist) return /* @__PURE__ */ jsxs("div", {
-			className: "rb-reg-stack er-stack",
-			children: [
-				/* @__PURE__ */ jsx("h3", {
-					className: "er-title",
-					children: "Sold out"
-				}),
-				/* @__PURE__ */ jsx("p", {
-					className: "er-text er-text--muted",
-					children: "Sorry you missed out! This event is fully booked."
-				}),
-				/* @__PURE__ */ jsx(CheckoutRecoveryEntry, { onContinue: onCheckoutRecovery })
-			]
-		});
 		if (!eventPricingCurrency) return /* @__PURE__ */ jsx("div", {
 			className: "rb-reg-stack er-stack",
 			children: /* @__PURE__ */ jsx("p", {
@@ -51473,14 +51359,14 @@ var init_TicketSelectionStep = __esmMin((() => {
 						})]
 					})
 				] }),
-				canJoinWaitlist && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("p", {
+				isSoldOut && !canJoinWaitlist && /* @__PURE__ */ jsx("p", {
 					className: "er-text er-text--muted",
-					children: "This event is currently full. Continue to join the waitlist if a place opens up."
-				}), /* @__PURE__ */ jsx(CheckoutRecoveryEntry, { onContinue: onCheckoutRecovery })] }),
-				checkoutRecovery && /* @__PURE__ */ jsx("p", {
+					children: "This event is fully booked."
+				}),
+				canJoinWaitlist && /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx("p", {
 					className: "er-text er-text--muted",
-					children: "Enter the details from your earlier booking. We’ll check your checkout before continuing to payment."
-				})
+					children: "This event is currently full. Continue to join the waitlist if a place opens up."
+				}) })
 			]
 		});
 	};
@@ -106425,7 +106311,7 @@ var init_PaymentSelectionStep = __esmMin((() => {
 		const occurrenceId = occurrenceContext?.id ?? (event?.registrationSubject.kind === "occurrence" ? event.registrationSubject.occurrenceId : "");
 		const selectedMethod = selectedSelection.method;
 		const totalPrice = directPaymentTotalCents;
-		const canShowDirectPaymentOptions = Boolean(eligibility?.eligible && eligibility.canPayDirectly && eligibility.price);
+		const canShowDirectPaymentOptions = Boolean(eligibility?.requiresPayment && eligibility.price);
 		const directPaymentOptions = eligibility && canShowDirectPaymentOptions ? buildEventRegistrationPaymentOptionsViewModel({
 			eventTitle: event?.title ?? "Event",
 			approvedPaymentOptions: eligibility.paymentOptions,
@@ -106488,7 +106374,7 @@ var init_PaymentSelectionStep = __esmMin((() => {
 			onRequestLogin
 		});
 		if (eligibilityLoading || eligibilityError || !eligibility) return blockingPanel;
-		if (eligibility.isFree || !eligibility.eligible) return blockingPanel;
+		if (eligibility.isFree || paymentStepStatus !== "ready") return blockingPanel;
 		const isMultiTicket = areEntitlementsDisabledForTicketCount(ticketsCount);
 		return /* @__PURE__ */ jsxs("div", {
 			className: "rb-reg-stack er-stack",
@@ -106707,7 +106593,7 @@ var init_VerifyingTimeoutStep = __esmMin((() => {
 			title,
 			body: /* @__PURE__ */ jsx("p", {
 				className: "er-text--muted er-message",
-				children: message
+				children: onCheckAgain ? message : "We still can’t confirm your payment. Please don’t make another payment. Contact the organiser so they can check your booking."
 			}),
 			actionsClassName: "er-button-group",
 			actions: onCheckAgain ? /* @__PURE__ */ jsx("button", {
@@ -106715,11 +106601,7 @@ var init_VerifyingTimeoutStep = __esmMin((() => {
 				onClick: onCheckAgain,
 				className: "er-btn er-btn--primary",
 				children: "Check payment status"
-			}) : /* @__PURE__ */ jsx("a", {
-				href: "/portal",
-				className: "er-btn er-btn--primary",
-				children: "Check payment status"
-			}),
+			}) : void 0,
 			secondaryBody: supportEmail ? /* @__PURE__ */ jsxs("p", {
 				className: "er-text--sm er-text--muted er-message",
 				children: [
@@ -106909,6 +106791,7 @@ function EventRegistrationWizardContent(props) {
 		case "redirecting":
 		case "verifying-payment":
 		case "verifying-timeout":
+		case "payment-status":
 		case "payment-failed": return null;
 		case "select-event": return /* @__PURE__ */ jsx(EventSelectionStep, {
 			events: wizard.scopedEvents,
@@ -106924,8 +106807,6 @@ function EventRegistrationWizardContent(props) {
 				onBookForSomeoneElse: wizard.handleBookForSomeoneElse
 			}), /* @__PURE__ */ jsx(TicketSelectionStep, {
 				event: wizard.selectedEvent,
-				checkoutRecovery: wizard.checkoutRecovery,
-				onCheckoutRecovery: canRecoverEventCheckout(wizard.selectedEvent) ? wizard.startCheckoutRecovery : void 0,
 				occurrenceContext: wizard.occurrenceContext,
 				selectedAttendanceMode: wizard.selectedAttendanceMode,
 				onAttendanceModeChange: wizard.setSelectedAttendanceMode,
@@ -106953,13 +106834,90 @@ var init_EventRegistrationWizardContent = __esmMin((() => {
 	init_client();
 	init_src();
 	init_shared();
-	init_checkoutRecovery();
 	init_registrationStateMachine();
 	init_siteCreditPreview();
 	init_PaymentBlockingPanel();
 	init_event_registration();
 }));
 //#endregion
+//#region ../blocks/src/system/runtime/nodes/event-registration/PaymentStatusStep.tsx
+function presentation(state) {
+	switch (state.kind) {
+		case "ready": return {
+			title: "We haven’t confirmed your payment yet",
+			message: "We’ve saved your booking details, but we haven’t been able to confirm that your payment was successful. Please don’t make another payment. Select Check payment status to get the latest update.",
+			action: { label: "Check payment status" }
+		};
+		case "checking": return {
+			title: "We haven’t confirmed your payment yet",
+			message: "We’ve saved your booking details, but we haven’t been able to confirm that your payment was successful. Please don’t make another payment.",
+			action: {
+				label: "Checking payment…",
+				disabled: true
+			}
+		};
+		case "processing": return {
+			title: "Your payment is still being processed",
+			message: "Please don’t make another payment. You can check its status again in a moment.",
+			action: { label: "Check payment status" }
+		};
+		case "paymentAvailable": return {
+			title: "Your payment hasn’t been completed",
+			message: "Your booking details are still saved. Continue to payment to finish your booking.",
+			action: { label: "Continue to payment" }
+		};
+		case "retryAvailable": return {
+			title: "Continue your booking",
+			message: "You can return to payment. We’ll check your booking, any existing payment and availability before starting another checkout.",
+			action: { label: "Return to payment" }
+		};
+		case "temporarilyUnavailable": return {
+			title: "We couldn’t check your payment",
+			message: "Please don’t make another payment yet. Try checking again in a moment.",
+			action: { label: "Check payment status" }
+		};
+		case "assistanceRequired": return {
+			title: "We still can’t confirm your payment",
+			message: "Please don’t make another payment. Contact the organiser so they can check your booking.",
+			action: { label: "Return to booking" }
+		};
+	}
+}
+function PaymentStatusStep(props) {
+	const view = presentation(props.state);
+	const onClick = props.state.kind === "paymentAvailable" ? props.onContinuePayment : props.state.kind === "retryAvailable" ? props.onReturnToPayment : props.state.kind === "assistanceRequired" ? props.onReturnToBooking : props.onCheck;
+	return /* @__PURE__ */ jsx(TerminalPanel, {
+		tone: "warning",
+		className: "er-center",
+		titleClassName: "er-title--lg er-message",
+		icon: /* @__PURE__ */ jsx(StateIcon, {
+			variant: "warning",
+			children: /* @__PURE__ */ jsx(ClockIcon, {})
+		}),
+		title: view.title,
+		body: /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("p", {
+			className: "er-text--muted er-message",
+			children: view.message
+		}), /* @__PURE__ */ jsx("span", {
+			className: "rb-sr-only",
+			"aria-live": "polite",
+			"aria-atomic": "true",
+			children: props.state.kind === "checking" ? "Checking payment…" : view.title
+		})] }),
+		actionsClassName: "er-button-group",
+		actions: view.action ? /* @__PURE__ */ jsx("button", {
+			type: "button",
+			onClick,
+			disabled: view.action.disabled,
+			className: "er-btn er-btn--primary",
+			children: /* @__PURE__ */ jsx("span", { children: view.action.label })
+		}) : void 0
+	});
+}
+var init_PaymentStatusStep = __esmMin((() => {
+	init_shared();
+}));
+//#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration/EventRegistrationSurface.tsx
 function EventPortalAuthPrompt(props) {
 	return /* @__PURE__ */ jsxs("div", {
@@ -107044,6 +107002,13 @@ function EventRegistrationTerminalState(props) {
 			message: wizard.verification.status === "timeout" ? void 0 : wizard.errorMessage,
 			supportEmail: props.supportEmail
 		});
+		case "payment-status": return wizard.paymentStatusRecovery ? /* @__PURE__ */ jsx(PaymentStatusStep, {
+			state: wizard.paymentStatusRecovery,
+			onCheck: wizard.handleCheckPaymentStatus,
+			onContinuePayment: wizard.handleContinueExistingPayment,
+			onReturnToPayment: wizard.handleReturnToPayment,
+			onReturnToBooking: wizard.handleReturnToBooking
+		}) : null;
 		case "success": return wizard.registrationResult ? /* @__PURE__ */ jsx(SuccessStep, {
 			title: wizard.registrationResult.title,
 			variant: wizard.registrationResult.variant,
@@ -107052,7 +107017,7 @@ function EventRegistrationTerminalState(props) {
 		case "error": return /* @__PURE__ */ jsx(ErrorStep, {
 			message: wizard.errorMessage,
 			action: wizard.errorAction,
-			canJoinWaitlist: wizard.eligibility?.isFull && wizard.eligibility.canJoinWaitlist,
+			canJoinWaitlist: wizard.eligibility?.availability.kind === "waitlist" && wizard.eligibility.registration.kind !== "pending_payment",
 			onRetry: wizard.handleRetry
 		});
 		case "select-event":
@@ -107114,6 +107079,7 @@ var init_EventRegistrationSurface = __esmMin((() => {
 	init_EventRegistrationWizardActions();
 	init_EventRegistrationWizardContent();
 	init_PaymentFailedStep();
+	init_PaymentStatusStep();
 	init_StepIndicator();
 	init_SuccessStep();
 	init_VerifyingPaymentStep();
@@ -107251,6 +107217,7 @@ function getWizardStepLabel(input) {
 		case "redirecting":
 		case "verifying-payment":
 		case "verifying-timeout":
+		case "payment-status":
 		case "payment-failed": return "";
 	}
 }