@pisell/private-materials 6.11.659 → 6.11.661

package/es/pro/skuDetailModal/flow/modules/time/index.js

@@ -10,7 +10,7 @@ import { buildDraftCacheItem, getModuleOptions, getUnsupportedBookingFlowReason,
 import TimeResourceSelector from "../../../../../components/eventBooking/components/timeResourceSelector/index.js";
 import { resolveAvailabilityStatus } from "../../../../../components/eventBooking/components/bookingAvailabilityCalendar/utils.js";
 import { validateAvailabilityTimeAutoResolution } from "../autoResolution.js";
-import { getAvailabilityCandidateDurationMinutes, getPosFlexibleDurationPresetCandidates, getSessionPresetCandidates, isFlexibleDurationValue, isSameAvailabilityCandidateRange, resolvePosCustomTimeBaseMinutes, resolvePosCustomTimeCandidate, resolvePosCustomTimeDefaultDurationMinutes, resolvePosCustomTimeDefaultStartTime, resolvePosFlexibleBusinessDurationMinutes, resolvePosFlexibleDurationInitialCandidate, shouldResetPosFlexibleTimeForDate, shouldShowPosCustomTimeCandidateCards } from "./posCustomTime.js";
+import { getAvailabilityCandidateDurationMinutes, getPosFlexibleDurationPresetCandidates, getSessionPresetCandidates, isFlexibleDurationValue, isSameAvailabilityCandidateRange, resolvePosCustomTimeBaseMinutes, resolvePosCustomTimeCandidate, resolvePosCustomTimeDefaultDurationMinutes, resolvePosCustomTimeDefaultStartTime, resolvePosFlexibleDurationInitialCandidate, shouldResetPosFlexibleTimeForDate, shouldShowPosCustomTimeCandidateCards } from "./posCustomTime.js";
 import dayjs from "dayjs";
 import React, { useEffect, useMemo } from "react";
 import { Alert, Space } from "antd";
@@ -191,15 +191,15 @@ const refreshAvailabilityTimes = function() {
 		}, requestedDuration ? _objectSpread2({ durationMinutesByProductId: { [String(availability.productId)]: requestedDuration } }, requestedStartTime ? { durationStartTimesByProductId: { [String(availability.productId)]: [requestedStartTime] } } : {}) : {}))).find((item) => String(item.productId) === String(availability.productId));
 		const candidates = (group === null || group === void 0 ? void 0 : group.ranges) || [];
 		const product = context.draft.productData;
-		if (posDurationAvailability && selectionIntent === "restore" && isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration)) {
+		if (posDurationAvailability && selectionIntent === "restore" && isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) && candidates.length === 0) {
 			var _context$hostContext, _moduleOptions$slice, _context$draft$bookin2, _normalizeDurationMin3;
 			const moduleOptions = getModuleOptions(module);
 			const configuredSlice = (_context$hostContext = context.hostContext) === null || _context$hostContext === void 0 || (_context$hostContext = _context$hostContext.bookingConfig) === null || _context$hostContext === void 0 || (_context$hostContext = _context$hostContext.config) === null || _context$hostContext === void 0 || (_context$hostContext = _context$hostContext.basic) === null || _context$hostContext === void 0 ? void 0 : _context$hostContext.service_time;
 			const fallbackSlice = (_moduleOptions$slice = moduleOptions.slice) !== null && _moduleOptions$slice !== void 0 ? _moduleOptions$slice : typeof configuredSlice === "object" ? configuredSlice === null || configuredSlice === void 0 ? void 0 : configuredSlice.value : configuredSlice;
-			const baseDurationMinutes = resolvePosCustomTimeBaseMinutes(group === null || group === void 0 ? void 0 : group.slotStepMinutes, fallbackSlice);
+			const baseDurationMinutes = resolvePosCustomTimeBaseMinutes(getProductDurationMinutes(context), group === null || group === void 0 ? void 0 : group.slotStepMinutes, fallbackSlice);
 			const resetForSelectedDate = shouldResetPosFlexibleTimeForDate((_context$draft$bookin2 = context.draft.booking.selectedCandidate) !== null && _context$draft$bookin2 !== void 0 ? _context$draft$bookin2 : previousTimeData === null || previousTimeData === void 0 ? void 0 : previousTimeData.selectedCandidate, selectedDate);
 			const nextStartTime = resolvePosCustomTimeDefaultStartTime(resetForSelectedDate ? null : context.draft.booking.startTime, baseDurationMinutes);
-			const nextDuration = resolvePosCustomTimeDefaultDurationMinutes(resetForSelectedDate ? product === null || product === void 0 ? void 0 : product.duration : (_normalizeDurationMin3 = normalizeDurationMinutesValue(context.draft.booking.duration)) !== null && _normalizeDurationMin3 !== void 0 ? _normalizeDurationMin3 : context.draft.booking.duration, baseDurationMinutes, context.services.selectionFlowMode === "edit" ? void 0 : resolvePosFlexibleBusinessDurationMinutes(nextStartTime, (group === null || group === void 0 ? void 0 : group.operatingEndAt) ? dayjs(group.operatingEndAt).format("HH:mm") : void 0));
+			const nextDuration = resolvePosCustomTimeDefaultDurationMinutes(resetForSelectedDate ? product === null || product === void 0 ? void 0 : product.duration : (_normalizeDurationMin3 = normalizeDurationMinutesValue(context.draft.booking.duration)) !== null && _normalizeDurationMin3 !== void 0 ? _normalizeDurationMin3 : context.draft.booking.duration, baseDurationMinutes);
 			const changedFields = [];
 			if (nextStartTime !== context.draft.booking.startTime) changedFields.push("booking.startTime");
 			if (nextDuration !== context.draft.booking.duration) changedFields.push("booking.duration");
@@ -292,7 +292,7 @@ const refreshAvailabilityTimes = function() {
 			restoredCandidate,
 			fallbackCandidate,
 			preferPreset: preferPosFlexiblePreset,
-			minimumPresetStartAt: preferPosFlexiblePreset ? dayjs().toISOString() : void 0
+			allowRestoredFallback: fallbackSelectionIntent
 		}) : restoredCandidate || fallbackCandidate;
 		context.setModuleData(module.key, {
 			requestId,

package/es/pro/skuDetailModal/flow/modules/time/posCustomTime.js

@@ -28,24 +28,9 @@ const resolvePosCustomTimeDefaultStartTime = (currentValue, sliceMinutes, now) =
 	const minutes = alignedMinute % 60;
 	return `${String(hours).padStart(2, "0")}:${String(minutes).padStart(2, "0")}`;
 };
-const resolvePosFlexibleBusinessDurationMinutes = (startTime, closingTime) => {
-	const toMinuteOfDay = (value) => {
-		if (typeof value !== "string") return null;
-		const matched = value.trim().match(/^([01]\d|2[0-3]):([0-5]\d)(?::[0-5]\d)?$/);
-		if (!matched) return null;
-		return Number(matched[1]) * 60 + Number(matched[2]);
-	};
-	const startMinute = toMinuteOfDay(startTime);
-	const closingMinute = toMinuteOfDay(closingTime);
-	if (startMinute === null || closingMinute === null) return null;
-	const duration = closingMinute > startMinute ? closingMinute - startMinute : closingMinute < startMinute ? closingMinute + 1440 - startMinute : 0;
-	return duration > 0 ? duration : null;
-};
 const shouldResetPosFlexibleTimeForDate = (candidate, selectedDate) => Boolean(candidate && candidate.date !== selectedDate);
-const resolvePosCustomTimeDefaultDurationMinutes = (currentValue, baseDurationMinutes, flexibleDefaultMinutes) => {
+const resolvePosCustomTimeDefaultDurationMinutes = (currentValue, baseDurationMinutes) => {
 	if (isFlexibleDurationValue(currentValue)) {
-		const flexibleMinutes = Number(flexibleDefaultMinutes);
-		if (Number.isFinite(flexibleMinutes) && flexibleMinutes > 0) return Math.max(1, Math.floor(flexibleMinutes));
 		if (typeof currentValue === "string") {
 			const flexibleMatch = currentValue.trim().toLowerCase().match(/^flexible_(\d+(?:\.\d+)?)$/);
 			if (flexibleMatch) return Math.max(1, Math.floor(Number(flexibleMatch[1])));
@@ -79,15 +64,11 @@ const getPosFlexibleDurationPresetCandidates = (candidates, requestedCustomRange
 	return candidates.filter((candidate) => !isSameAvailabilityCandidateRange(candidate, requestedCustomRange));
 };
 const resolvePosFlexibleDurationInitialCandidate = (params) => {
-	const minimumPresetStartAt = params.minimumPresetStartAt === void 0 ? null : dayjs(params.minimumPresetStartAt);
 	const firstAvailablePreset = params.presetCandidates.find((candidate) => {
-		if (!((!candidate.status || candidate.status === "available" || candidate.status === "limited") && !(typeof candidate.maxPartySize === "number" && candidate.maxPartySize <= 0))) return false;
-		if (!(minimumPresetStartAt === null || minimumPresetStartAt === void 0 ? void 0 : minimumPresetStartAt.isValid())) return true;
-		const candidateStartAt = dayjs(candidate.startAt);
-		return candidateStartAt.isValid() && !candidateStartAt.isBefore(minimumPresetStartAt);
+		return (!candidate.status || candidate.status === "available" || candidate.status === "limited") && !(typeof candidate.maxPartySize === "number" && candidate.maxPartySize <= 0);
 	});
-	if (params.preferPreset && firstAvailablePreset) return firstAvailablePreset;
+	if (params.preferPreset) return firstAvailablePreset || (params.allowRestoredFallback ? params.restoredCandidate : void 0);
 	return params.restoredCandidate || params.fallbackCandidate;
 };
 //#endregion
-export { getAvailabilityCandidateDurationMinutes, getPosFlexibleDurationPresetCandidates, getSessionPresetCandidates, isFlexibleDurationValue, isSameAvailabilityCandidateRange, resolvePosCustomTimeBaseMinutes, resolvePosCustomTimeCandidate, resolvePosCustomTimeDefaultDurationMinutes, resolvePosCustomTimeDefaultStartTime, resolvePosFlexibleBusinessDurationMinutes, resolvePosFlexibleDurationInitialCandidate, shouldResetPosFlexibleTimeForDate, shouldShowPosCustomTimeCandidateCards };
+export { getAvailabilityCandidateDurationMinutes, getPosFlexibleDurationPresetCandidates, getSessionPresetCandidates, isFlexibleDurationValue, isSameAvailabilityCandidateRange, resolvePosCustomTimeBaseMinutes, resolvePosCustomTimeCandidate, resolvePosCustomTimeDefaultDurationMinutes, resolvePosCustomTimeDefaultStartTime, resolvePosFlexibleDurationInitialCandidate, shouldResetPosFlexibleTimeForDate, shouldShowPosCustomTimeCandidateCards };

package/es/pro/skuDetailModal/flow/posAutoResolution.js

@@ -24,5 +24,7 @@ const getPosAutoResolutionDraftKey = (draft) => {
 	});
 };
 const shouldDirectlyConfirmPosSelectionFlow = ({ eligible, status, currentStepIndex }) => eligible && status === "resolved" && currentStepIndex === 0;
+const shouldPreparePosSelectionFlowOnConfirm = ({ eligible, currentStepIndex, abandoned }) => eligible && currentStepIndex === 0 && !abandoned;
+const isCurrentPosAutoResolutionRun = ({ expectedRunId, currentRunId, expectedOpenTaskId, currentOpenTaskId, expectedDraftKey, currentDraftKey, abandoned, currentStepIndex }) => expectedRunId === currentRunId && expectedOpenTaskId === currentOpenTaskId && expectedDraftKey === currentDraftKey && !abandoned && currentStepIndex === 0;
 //#endregion
-export { getPosAutoResolutionDraftKey, isPosCreateAutoResolutionCandidate, shouldDirectlyConfirmPosSelectionFlow };
+export { getPosAutoResolutionDraftKey, isCurrentPosAutoResolutionRun, isPosCreateAutoResolutionCandidate, shouldDirectlyConfirmPosSelectionFlow, shouldPreparePosSelectionFlowOnConfirm };

package/es/pro/skuDetailModal/index.js

@@ -35,7 +35,7 @@ import resolveBookingPriceDisplayAmounts, { canOpenBookingManualPriceChange } fr
 import { normalizeSelectionDuration } from "./flow/modules/time/index.js";
 import { flowModuleRegistry } from "./flow/registry.js";
 import SkuDetailSelectionFlowView from "./flow/SkuDetailSelectionFlowView.js";
-import { getPosAutoResolutionDraftKey, isPosCreateAutoResolutionCandidate, shouldDirectlyConfirmPosSelectionFlow } from "./flow/posAutoResolution.js";
+import { getPosAutoResolutionDraftKey, isCurrentPosAutoResolutionRun, isPosCreateAutoResolutionCandidate, shouldDirectlyConfirmPosSelectionFlow, shouldPreparePosSelectionFlowOnConfirm } from "./flow/posAutoResolution.js";
 import dayjs from "dayjs";
 import React, { forwardRef, useCallback, useContext, useEffect, useImperativeHandle, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { locales } from "@pisell/utils";
@@ -132,7 +132,7 @@ const resolveInitialAvailabilityCandidate = (source, startDate, endDate, startTi
 	if (endDate && candidateEndDate && candidateEndDate !== endDate.format("YYYY-MM-DD")) return;
 	return rawCandidate;
 };
-const PcActionButtons = ({ isCreateMode, isRemoveDisabled, isShowManualPriceChange, isShowNote, isShowRemove, confirmLabel, isConfirmDisabled = false, isManualPriceChangeDisabled = false, hidePrimaryActions = false, onCancel, onRemove, onManualPriceChange, onOpenNote, onConfirm }) => {
+const PcActionButtons = ({ isCreateMode, isRemoveDisabled, isShowManualPriceChange, isShowNote, isShowRemove, confirmLabel, isConfirmDisabled = false, isConfirmLoading = false, isManualPriceChangeDisabled = false, hidePrimaryActions = false, onCancel, onRemove, onManualPriceChange, onOpenNote, onConfirm }) => {
 	const auxiliaryActions = [isShowNote ? /* @__PURE__ */ React.createElement(Button, {
 		key: "note",
 		type: "default",
@@ -164,6 +164,7 @@ const PcActionButtons = ({ isCreateMode, isRemoveDisabled, isShowManualPriceChan
 		type: "primary",
 		size: "large",
 		disabled: isConfirmDisabled,
+		loading: isConfirmLoading,
 		onClick: onConfirm,
 		className: "sku-detail-side-actions-btn sku-detail-side-actions-confirm-btn"
 	}, /* @__PURE__ */ React.createElement("span", { className: "sku-detail-content-footer-confirm-btn-text" }, confirmLabel))) : null);
@@ -236,8 +237,10 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 	const [selectionFlowProcedureSteps, setSelectionFlowProcedureSteps] = useState(null);
 	const [compiledSelectionFlowSteps, setCompiledSelectionFlowSteps] = useState(null);
 	const [posAutoResolutionStatus, setPosAutoResolutionStatus] = useState("idle");
+	const [posAutoResolutionConfirmPending, setPosAutoResolutionConfirmPending] = useState(false);
 	const posAutoResolutionRunRef = useRef(0);
 	const posAutoResolutionAbandonedRef = useRef(false);
+	const posAutoResolutionConfirmPendingRunRef = useRef(null);
 	const [effectiveSelectionFlowSteps, setEffectiveSelectionFlowSteps] = useState(void 0);
 	const [skuDetailConfig, setSkuDetailConfig] = useState({
 		isShowProductSummary: false,
@@ -786,6 +789,8 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 				setLatestSelectionFlowDraft(null);
 				posAutoResolutionRunRef.current += 1;
 				posAutoResolutionAbandonedRef.current = false;
+				posAutoResolutionConfirmPendingRunRef.current = null;
+				setPosAutoResolutionConfirmPending(false);
 				setPosAutoResolutionStatus("idle");
 				setEffectiveSelectionFlowSteps(void 0);
 				setNoteModalOpen(false);
@@ -1296,6 +1301,8 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 		setLatestSelectionFlowDraft(null);
 		posAutoResolutionRunRef.current += 1;
 		posAutoResolutionAbandonedRef.current = false;
+		posAutoResolutionConfirmPendingRunRef.current = null;
+		setPosAutoResolutionConfirmPending(false);
 		setPosAutoResolutionStatus("idle");
 		setCurrentStep(0);
 	}, []);
@@ -1303,6 +1310,8 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 		openTaskIdRef.current += 1;
 		flowDateHydrationVersionRef.current += 1;
 		posAutoResolutionRunRef.current += 1;
+		posAutoResolutionConfirmPendingRunRef.current = null;
+		setPosAutoResolutionConfirmPending(false);
 		setOpen(false);
 		setDetailLoading(false);
 		setNoteModalOpen(false);
@@ -1321,20 +1330,48 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 			if (isCustomSelectionFlow && !flowDraft) {
 				const flow = selectionFlowRef.current;
 				if (!flow) return false;
-				if (canDirectlyConfirmPosSelectionFlow) {
+				const currentFlowStepIndex = flow.getState().currentStepIndex;
+				if (shouldPreparePosSelectionFlowOnConfirm({
+					eligible: isPosCreateAutoResolutionEligible,
+					currentStepIndex: currentFlowStepIndex,
+					abandoned: posAutoResolutionAbandonedRef.current
+				})) {
+					if (posAutoResolutionConfirmPendingRunRef.current !== null) return false;
 					const openTaskId = openTaskIdRef.current;
 					const draftKey = getPosAutoResolutionDraftKey(flow.getState().draft);
 					const runId = posAutoResolutionRunRef.current + 1;
 					posAutoResolutionRunRef.current = runId;
-					const result = yield flow.prepareSteps({ fromStepIndex: 1 });
-					if (posAutoResolutionRunRef.current !== runId || openTaskIdRef.current !== openTaskId || posAutoResolutionAbandonedRef.current || getPosAutoResolutionDraftKey(flow.getState().draft) !== draftKey) return false;
-					if (!result.prepared || result.cancelled) {
-						setPosAutoResolutionStatus("retained");
-						return false;
+					posAutoResolutionConfirmPendingRunRef.current = runId;
+					setPosAutoResolutionConfirmPending(true);
+					setPosAutoResolutionStatus("checking");
+					try {
+						const result = yield flow.prepareSteps({ fromStepIndex: 1 });
+						if (!isCurrentPosAutoResolutionRun({
+							expectedRunId: runId,
+							currentRunId: posAutoResolutionRunRef.current,
+							expectedOpenTaskId: openTaskId,
+							currentOpenTaskId: openTaskIdRef.current,
+							expectedDraftKey: draftKey,
+							currentDraftKey: getPosAutoResolutionDraftKey(flow.getState().draft),
+							abandoned: posAutoResolutionAbandonedRef.current,
+							currentStepIndex: flow.getState().currentStepIndex
+						}) || result.cancelled) return false;
+						if (!result.prepared) {
+							posAutoResolutionAbandonedRef.current = true;
+							posAutoResolutionRunRef.current += 1;
+							setPosAutoResolutionStatus("retained");
+							return (yield flow.next()) || false;
+						}
+						setPosAutoResolutionStatus("resolved");
+						const completed = yield flow.complete();
+						if (!completed && openTaskIdRef.current === openTaskId && posAutoResolutionRunRef.current === runId) setPosAutoResolutionStatus("retained");
+						return completed;
+					} finally {
+						if (posAutoResolutionConfirmPendingRunRef.current === runId) {
+							posAutoResolutionConfirmPendingRunRef.current = null;
+							setPosAutoResolutionConfirmPending(false);
+						}
 					}
-					const completed = yield flow.complete();
-					if (!completed && openTaskIdRef.current === openTaskId && posAutoResolutionRunRef.current === runId) setPosAutoResolutionStatus("retained");
-					return completed;
 				}
 				if (isPosCreateAutoResolutionEligible) {
 					posAutoResolutionAbandonedRef.current = true;
@@ -1709,8 +1746,9 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 			isShowNote: !!(skuDetailConfig === null || skuDetailConfig === void 0 ? void 0 : skuDetailConfig.isShowNote),
 			isShowRemove: (skuDetailConfig === null || skuDetailConfig === void 0 ? void 0 : skuDetailConfig.isShowRemove) !== false,
 			confirmLabel: pcConfirmButtonText,
+			isConfirmLoading: posAutoResolutionConfirmPending,
 			isManualPriceChangeDisabled: !canOpenManualPriceChange,
-			isConfirmDisabled: hasReachedBookingPriceStep && (selectionFlowBookingPricePending || selectionFlowBookingPriceError),
+			isConfirmDisabled: posAutoResolutionConfirmPending || hasReachedBookingPriceStep && (selectionFlowBookingPricePending || selectionFlowBookingPriceError),
 			onCancel: handleCancel,
 			onRemove: handleRemove,
 			onManualPriceChange: handleManualPriceChange,

package/lib/pro/skuDetailModal/flow/modules/time/index.js

@@ -195,15 +195,15 @@ const refreshAvailabilityTimes = function() {
 		}, requestedDuration ? require_objectSpread2._objectSpread2({ durationMinutesByProductId: { [String(availability.productId)]: requestedDuration } }, requestedStartTime ? { durationStartTimesByProductId: { [String(availability.productId)]: [requestedStartTime] } } : {}) : {}))).find((item) => String(item.productId) === String(availability.productId));
 		const candidates = (group === null || group === void 0 ? void 0 : group.ranges) || [];
 		const product = context.draft.productData;
-		if (posDurationAvailability && selectionIntent === "restore" && require_posCustomTime.isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration)) {
+		if (posDurationAvailability && selectionIntent === "restore" && require_posCustomTime.isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) && candidates.length === 0) {
 			var _context$hostContext, _moduleOptions$slice, _context$draft$bookin2, _normalizeDurationMin3;
 			const moduleOptions = require_index$1.getModuleOptions(module);
 			const configuredSlice = (_context$hostContext = context.hostContext) === null || _context$hostContext === void 0 || (_context$hostContext = _context$hostContext.bookingConfig) === null || _context$hostContext === void 0 || (_context$hostContext = _context$hostContext.config) === null || _context$hostContext === void 0 || (_context$hostContext = _context$hostContext.basic) === null || _context$hostContext === void 0 ? void 0 : _context$hostContext.service_time;
 			const fallbackSlice = (_moduleOptions$slice = moduleOptions.slice) !== null && _moduleOptions$slice !== void 0 ? _moduleOptions$slice : typeof configuredSlice === "object" ? configuredSlice === null || configuredSlice === void 0 ? void 0 : configuredSlice.value : configuredSlice;
-			const baseDurationMinutes = require_posCustomTime.resolvePosCustomTimeBaseMinutes(group === null || group === void 0 ? void 0 : group.slotStepMinutes, fallbackSlice);
+			const baseDurationMinutes = require_posCustomTime.resolvePosCustomTimeBaseMinutes(getProductDurationMinutes(context), group === null || group === void 0 ? void 0 : group.slotStepMinutes, fallbackSlice);
 			const resetForSelectedDate = require_posCustomTime.shouldResetPosFlexibleTimeForDate((_context$draft$bookin2 = context.draft.booking.selectedCandidate) !== null && _context$draft$bookin2 !== void 0 ? _context$draft$bookin2 : previousTimeData === null || previousTimeData === void 0 ? void 0 : previousTimeData.selectedCandidate, selectedDate);
 			const nextStartTime = require_posCustomTime.resolvePosCustomTimeDefaultStartTime(resetForSelectedDate ? null : context.draft.booking.startTime, baseDurationMinutes);
-			const nextDuration = require_posCustomTime.resolvePosCustomTimeDefaultDurationMinutes(resetForSelectedDate ? product === null || product === void 0 ? void 0 : product.duration : (_normalizeDurationMin3 = normalizeDurationMinutesValue(context.draft.booking.duration)) !== null && _normalizeDurationMin3 !== void 0 ? _normalizeDurationMin3 : context.draft.booking.duration, baseDurationMinutes, context.services.selectionFlowMode === "edit" ? void 0 : require_posCustomTime.resolvePosFlexibleBusinessDurationMinutes(nextStartTime, (group === null || group === void 0 ? void 0 : group.operatingEndAt) ? (0, dayjs.default)(group.operatingEndAt).format("HH:mm") : void 0));
+			const nextDuration = require_posCustomTime.resolvePosCustomTimeDefaultDurationMinutes(resetForSelectedDate ? product === null || product === void 0 ? void 0 : product.duration : (_normalizeDurationMin3 = normalizeDurationMinutesValue(context.draft.booking.duration)) !== null && _normalizeDurationMin3 !== void 0 ? _normalizeDurationMin3 : context.draft.booking.duration, baseDurationMinutes);
 			const changedFields = [];
 			if (nextStartTime !== context.draft.booking.startTime) changedFields.push("booking.startTime");
 			if (nextDuration !== context.draft.booking.duration) changedFields.push("booking.duration");
@@ -296,7 +296,7 @@ const refreshAvailabilityTimes = function() {
 			restoredCandidate,
 			fallbackCandidate,
 			preferPreset: preferPosFlexiblePreset,
-			minimumPresetStartAt: preferPosFlexiblePreset ? (0, dayjs.default)().toISOString() : void 0
+			allowRestoredFallback: fallbackSelectionIntent
 		}) : restoredCandidate || fallbackCandidate;
 		context.setModuleData(module.key, {
 			requestId,

package/lib/pro/skuDetailModal/flow/modules/time/posCustomTime.js

@@ -30,24 +30,9 @@ const resolvePosCustomTimeDefaultStartTime = (currentValue, sliceMinutes, now) =
 	const minutes = alignedMinute % 60;
 	return `${String(hours).padStart(2, "0")}:${String(minutes).padStart(2, "0")}`;
 };
-const resolvePosFlexibleBusinessDurationMinutes = (startTime, closingTime) => {
-	const toMinuteOfDay = (value) => {
-		if (typeof value !== "string") return null;
-		const matched = value.trim().match(/^([01]\d|2[0-3]):([0-5]\d)(?::[0-5]\d)?$/);
-		if (!matched) return null;
-		return Number(matched[1]) * 60 + Number(matched[2]);
-	};
-	const startMinute = toMinuteOfDay(startTime);
-	const closingMinute = toMinuteOfDay(closingTime);
-	if (startMinute === null || closingMinute === null) return null;
-	const duration = closingMinute > startMinute ? closingMinute - startMinute : closingMinute < startMinute ? closingMinute + 1440 - startMinute : 0;
-	return duration > 0 ? duration : null;
-};
 const shouldResetPosFlexibleTimeForDate = (candidate, selectedDate) => Boolean(candidate && candidate.date !== selectedDate);
-const resolvePosCustomTimeDefaultDurationMinutes = (currentValue, baseDurationMinutes, flexibleDefaultMinutes) => {
+const resolvePosCustomTimeDefaultDurationMinutes = (currentValue, baseDurationMinutes) => {
 	if (isFlexibleDurationValue(currentValue)) {
-		const flexibleMinutes = Number(flexibleDefaultMinutes);
-		if (Number.isFinite(flexibleMinutes) && flexibleMinutes > 0) return Math.max(1, Math.floor(flexibleMinutes));
 		if (typeof currentValue === "string") {
 			const flexibleMatch = currentValue.trim().toLowerCase().match(/^flexible_(\d+(?:\.\d+)?)$/);
 			if (flexibleMatch) return Math.max(1, Math.floor(Number(flexibleMatch[1])));
@@ -81,14 +66,10 @@ const getPosFlexibleDurationPresetCandidates = (candidates, requestedCustomRange
 	return candidates.filter((candidate) => !isSameAvailabilityCandidateRange(candidate, requestedCustomRange));
 };
 const resolvePosFlexibleDurationInitialCandidate = (params) => {
-	const minimumPresetStartAt = params.minimumPresetStartAt === void 0 ? null : (0, dayjs.default)(params.minimumPresetStartAt);
 	const firstAvailablePreset = params.presetCandidates.find((candidate) => {
-		if (!((!candidate.status || candidate.status === "available" || candidate.status === "limited") && !(typeof candidate.maxPartySize === "number" && candidate.maxPartySize <= 0))) return false;
-		if (!(minimumPresetStartAt === null || minimumPresetStartAt === void 0 ? void 0 : minimumPresetStartAt.isValid())) return true;
-		const candidateStartAt = (0, dayjs.default)(candidate.startAt);
-		return candidateStartAt.isValid() && !candidateStartAt.isBefore(minimumPresetStartAt);
+		return (!candidate.status || candidate.status === "available" || candidate.status === "limited") && !(typeof candidate.maxPartySize === "number" && candidate.maxPartySize <= 0);
 	});
-	if (params.preferPreset && firstAvailablePreset) return firstAvailablePreset;
+	if (params.preferPreset) return firstAvailablePreset || (params.allowRestoredFallback ? params.restoredCandidate : void 0);
 	return params.restoredCandidate || params.fallbackCandidate;
 };
 //#endregion
@@ -101,7 +82,6 @@ exports.resolvePosCustomTimeBaseMinutes = resolvePosCustomTimeBaseMinutes;
 exports.resolvePosCustomTimeCandidate = resolvePosCustomTimeCandidate;
 exports.resolvePosCustomTimeDefaultDurationMinutes = resolvePosCustomTimeDefaultDurationMinutes;
 exports.resolvePosCustomTimeDefaultStartTime = resolvePosCustomTimeDefaultStartTime;
-exports.resolvePosFlexibleBusinessDurationMinutes = resolvePosFlexibleBusinessDurationMinutes;
 exports.resolvePosFlexibleDurationInitialCandidate = resolvePosFlexibleDurationInitialCandidate;
 exports.shouldResetPosFlexibleTimeForDate = shouldResetPosFlexibleTimeForDate;
 exports.shouldShowPosCustomTimeCandidateCards = shouldShowPosCustomTimeCandidateCards;

package/lib/pro/skuDetailModal/flow/posAutoResolution.js

@@ -24,7 +24,11 @@ const getPosAutoResolutionDraftKey = (draft) => {
 	});
 };
 const shouldDirectlyConfirmPosSelectionFlow = ({ eligible, status, currentStepIndex }) => eligible && status === "resolved" && currentStepIndex === 0;
+const shouldPreparePosSelectionFlowOnConfirm = ({ eligible, currentStepIndex, abandoned }) => eligible && currentStepIndex === 0 && !abandoned;
+const isCurrentPosAutoResolutionRun = ({ expectedRunId, currentRunId, expectedOpenTaskId, currentOpenTaskId, expectedDraftKey, currentDraftKey, abandoned, currentStepIndex }) => expectedRunId === currentRunId && expectedOpenTaskId === currentOpenTaskId && expectedDraftKey === currentDraftKey && !abandoned && currentStepIndex === 0;
 //#endregion
 exports.getPosAutoResolutionDraftKey = getPosAutoResolutionDraftKey;
+exports.isCurrentPosAutoResolutionRun = isCurrentPosAutoResolutionRun;
 exports.isPosCreateAutoResolutionCandidate = isPosCreateAutoResolutionCandidate;
 exports.shouldDirectlyConfirmPosSelectionFlow = shouldDirectlyConfirmPosSelectionFlow;
+exports.shouldPreparePosSelectionFlowOnConfirm = shouldPreparePosSelectionFlowOnConfirm;

package/lib/pro/skuDetailModal/index.js

@@ -138,7 +138,7 @@ const resolveInitialAvailabilityCandidate = (source, startDate, endDate, startTi
 	if (endDate && candidateEndDate && candidateEndDate !== endDate.format("YYYY-MM-DD")) return;
 	return rawCandidate;
 };
-const PcActionButtons = ({ isCreateMode, isRemoveDisabled, isShowManualPriceChange, isShowNote, isShowRemove, confirmLabel, isConfirmDisabled = false, isManualPriceChangeDisabled = false, hidePrimaryActions = false, onCancel, onRemove, onManualPriceChange, onOpenNote, onConfirm }) => {
+const PcActionButtons = ({ isCreateMode, isRemoveDisabled, isShowManualPriceChange, isShowNote, isShowRemove, confirmLabel, isConfirmDisabled = false, isConfirmLoading = false, isManualPriceChangeDisabled = false, hidePrimaryActions = false, onCancel, onRemove, onManualPriceChange, onOpenNote, onConfirm }) => {
 	const auxiliaryActions = [isShowNote ? /* @__PURE__ */ react.default.createElement(_pisell_materials.Button, {
 		key: "note",
 		type: "default",
@@ -170,6 +170,7 @@ const PcActionButtons = ({ isCreateMode, isRemoveDisabled, isShowManualPriceChan
 		type: "primary",
 		size: "large",
 		disabled: isConfirmDisabled,
+		loading: isConfirmLoading,
 		onClick: onConfirm,
 		className: "sku-detail-side-actions-btn sku-detail-side-actions-confirm-btn"
 	}, /* @__PURE__ */ react.default.createElement("span", { className: "sku-detail-content-footer-confirm-btn-text" }, confirmLabel))) : null);
@@ -242,8 +243,10 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 	const [selectionFlowProcedureSteps, setSelectionFlowProcedureSteps] = (0, react.useState)(null);
 	const [compiledSelectionFlowSteps, setCompiledSelectionFlowSteps] = (0, react.useState)(null);
 	const [posAutoResolutionStatus, setPosAutoResolutionStatus] = (0, react.useState)("idle");
+	const [posAutoResolutionConfirmPending, setPosAutoResolutionConfirmPending] = (0, react.useState)(false);
 	const posAutoResolutionRunRef = (0, react.useRef)(0);
 	const posAutoResolutionAbandonedRef = (0, react.useRef)(false);
+	const posAutoResolutionConfirmPendingRunRef = (0, react.useRef)(null);
 	const [effectiveSelectionFlowSteps, setEffectiveSelectionFlowSteps] = (0, react.useState)(void 0);
 	const [skuDetailConfig, setSkuDetailConfig] = (0, react.useState)({
 		isShowProductSummary: false,
@@ -792,6 +795,8 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 				setLatestSelectionFlowDraft(null);
 				posAutoResolutionRunRef.current += 1;
 				posAutoResolutionAbandonedRef.current = false;
+				posAutoResolutionConfirmPendingRunRef.current = null;
+				setPosAutoResolutionConfirmPending(false);
 				setPosAutoResolutionStatus("idle");
 				setEffectiveSelectionFlowSteps(void 0);
 				setNoteModalOpen(false);
@@ -1302,6 +1307,8 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 		setLatestSelectionFlowDraft(null);
 		posAutoResolutionRunRef.current += 1;
 		posAutoResolutionAbandonedRef.current = false;
+		posAutoResolutionConfirmPendingRunRef.current = null;
+		setPosAutoResolutionConfirmPending(false);
 		setPosAutoResolutionStatus("idle");
 		setCurrentStep(0);
 	}, []);
@@ -1309,6 +1316,8 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 		openTaskIdRef.current += 1;
 		flowDateHydrationVersionRef.current += 1;
 		posAutoResolutionRunRef.current += 1;
+		posAutoResolutionConfirmPendingRunRef.current = null;
+		setPosAutoResolutionConfirmPending(false);
 		setOpen(false);
 		setDetailLoading(false);
 		setNoteModalOpen(false);
@@ -1327,20 +1336,48 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 			if (isCustomSelectionFlow && !flowDraft) {
 				const flow = selectionFlowRef.current;
 				if (!flow) return false;
-				if (canDirectlyConfirmPosSelectionFlow) {
+				const currentFlowStepIndex = flow.getState().currentStepIndex;
+				if (require_posAutoResolution.shouldPreparePosSelectionFlowOnConfirm({
+					eligible: isPosCreateAutoResolutionEligible,
+					currentStepIndex: currentFlowStepIndex,
+					abandoned: posAutoResolutionAbandonedRef.current
+				})) {
+					if (posAutoResolutionConfirmPendingRunRef.current !== null) return false;
 					const openTaskId = openTaskIdRef.current;
 					const draftKey = require_posAutoResolution.getPosAutoResolutionDraftKey(flow.getState().draft);
 					const runId = posAutoResolutionRunRef.current + 1;
 					posAutoResolutionRunRef.current = runId;
-					const result = yield flow.prepareSteps({ fromStepIndex: 1 });
-					if (posAutoResolutionRunRef.current !== runId || openTaskIdRef.current !== openTaskId || posAutoResolutionAbandonedRef.current || require_posAutoResolution.getPosAutoResolutionDraftKey(flow.getState().draft) !== draftKey) return false;
-					if (!result.prepared || result.cancelled) {
-						setPosAutoResolutionStatus("retained");
-						return false;
+					posAutoResolutionConfirmPendingRunRef.current = runId;
+					setPosAutoResolutionConfirmPending(true);
+					setPosAutoResolutionStatus("checking");
+					try {
+						const result = yield flow.prepareSteps({ fromStepIndex: 1 });
+						if (!require_posAutoResolution.isCurrentPosAutoResolutionRun({
+							expectedRunId: runId,
+							currentRunId: posAutoResolutionRunRef.current,
+							expectedOpenTaskId: openTaskId,
+							currentOpenTaskId: openTaskIdRef.current,
+							expectedDraftKey: draftKey,
+							currentDraftKey: require_posAutoResolution.getPosAutoResolutionDraftKey(flow.getState().draft),
+							abandoned: posAutoResolutionAbandonedRef.current,
+							currentStepIndex: flow.getState().currentStepIndex
+						}) || result.cancelled) return false;
+						if (!result.prepared) {
+							posAutoResolutionAbandonedRef.current = true;
+							posAutoResolutionRunRef.current += 1;
+							setPosAutoResolutionStatus("retained");
+							return (yield flow.next()) || false;
+						}
+						setPosAutoResolutionStatus("resolved");
+						const completed = yield flow.complete();
+						if (!completed && openTaskIdRef.current === openTaskId && posAutoResolutionRunRef.current === runId) setPosAutoResolutionStatus("retained");
+						return completed;
+					} finally {
+						if (posAutoResolutionConfirmPendingRunRef.current === runId) {
+							posAutoResolutionConfirmPendingRunRef.current = null;
+							setPosAutoResolutionConfirmPending(false);
+						}
 					}
-					const completed = yield flow.complete();
-					if (!completed && openTaskIdRef.current === openTaskId && posAutoResolutionRunRef.current === runId) setPosAutoResolutionStatus("retained");
-					return completed;
 				}
 				if (isPosCreateAutoResolutionEligible) {
 					posAutoResolutionAbandonedRef.current = true;
@@ -1715,8 +1752,9 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 			isShowNote: !!(skuDetailConfig === null || skuDetailConfig === void 0 ? void 0 : skuDetailConfig.isShowNote),
 			isShowRemove: (skuDetailConfig === null || skuDetailConfig === void 0 ? void 0 : skuDetailConfig.isShowRemove) !== false,
 			confirmLabel: pcConfirmButtonText,
+			isConfirmLoading: posAutoResolutionConfirmPending,
 			isManualPriceChangeDisabled: !canOpenManualPriceChange,
-			isConfirmDisabled: hasReachedBookingPriceStep && (selectionFlowBookingPricePending || selectionFlowBookingPriceError),
+			isConfirmDisabled: posAutoResolutionConfirmPending || hasReachedBookingPriceStep && (selectionFlowBookingPricePending || selectionFlowBookingPriceError),
 			onCancel: handleCancel,
 			onRemove: handleRemove,
 			onManualPriceChange: handleManualPriceChange,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.659",
+  "version": "6.11.661",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -70,8 +70,8 @@
     "styled-components": "^6.0.0-rc.3",
     "use-sync-external-store": "^1.6.0",
     "@pisell/pi-payment-sdk": "0.0.3",
-    "@pisell/utils": "3.0.4",
     "@pisell/materials": "6.11.256",
+    "@pisell/utils": "3.0.4",
     "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "3.0.10"
   },