@pisell/private-materials 6.11.653 → 6.11.655

package/es/components/booking/utils.js

@@ -619,4 +619,4 @@ function showDiscountScanFailMessage(val, scene = "goodpass", locales) {
 	return scene === "goodpass" ? locales.getText("pisell2.text.goodpass.code-invalid-cart") : locales.getText("pisell2.voucher.code-invalid-cart");
 }
 //#endregion
-export { deleteCacheParams, findNextDuration, flexibleObj, formatProductListByCategory, formatResource, getCacheParams, getDays, getDiscountTime, getDiscountTimeByDayMinutes, getDuration, getEndDate, getErrorList, getIsEdit, getIsEject, getIsOnlySession, getLastServer, getMainPrice, getNowTime, getProductTotalPrice, getServeStartTime, getServerItemExtend, getServiceTime, getServiceTimes, isNowTime, isSessionProduct, isWalkIn, request, showDiscountScanFailMessage, sliceDayIntoFiveMinutes };
+export { deleteCacheParams, findNextDuration, flexibleObj, formatProductListByCategory, formatResource, getCacheParams, getDays, getDiscountTime, getDiscountTimeByDayMinutes, getDuration, getEndDate, getErrorList, getIsEdit, getIsEject, getIsOnlySession, getLastServer, getMainPrice, getNowTime, getProductTotalPrice, getServeStartTime, getServerItemExtend, getServiceTime, getServiceTimes, getShopOpeningHours, isNowTime, isSessionProduct, isWalkIn, request, showDiscountScanFailMessage, sliceDayIntoFiveMinutes };

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

@@ -2,7 +2,7 @@ import { _objectSpread2 } from "../../../../../_virtual/_@oxc-project_runtime@0.
 import { _asyncToGenerator } from "../../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js";
 import { getDurationProps, getTimeObj } from "../../../../../components/booking/info2/service/addService/utils.js";
 import { isNormalProductByDurationSchedule } from "../../../../../components/booking/info/service2/utils.js";
-import { getDiscountTime, getServiceTimes, isSessionProduct } from "../../../../../components/booking/utils.js";
+import { getDiscountTime, getServiceTimes, getShopOpeningHours, isSessionProduct } from "../../../../../components/booking/utils.js";
 import Duration from "../../../../../components/booking/materiels/duration/index.js";
 import SkuDetailLoadingPanel from "../../../LoadingPanel.js";
 import { selectionFlowText } from "../../i18n.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, shouldShowPosCustomTimeCandidateCards } from "./posCustomTime.js";
+import { getAvailabilityCandidateDurationMinutes, getPosFlexibleDurationPresetCandidates, getSessionPresetCandidates, isFlexibleDurationValue, isSameAvailabilityCandidateRange, resolvePosCustomTimeBaseMinutes, resolvePosCustomTimeCandidate, resolvePosCustomTimeDefaultDurationMinutes, resolvePosCustomTimeDefaultStartTime, resolvePosFlexibleBusinessDurationMinutes, resolvePosFlexibleDurationInitialCandidate, shouldShowPosCustomTimeCandidateCards } from "./posCustomTime.js";
 import dayjs from "dayjs";
 import React, { useEffect, useMemo } from "react";
 import { Alert, Space } from "antd";
@@ -197,7 +197,7 @@ const refreshAvailabilityTimes = function() {
 			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 nextStartTime = resolvePosCustomTimeDefaultStartTime(context.draft.booking.startTime, baseDurationMinutes);
-			const nextDuration = resolvePosCustomTimeDefaultDurationMinutes((_normalizeDurationMin3 = normalizeDurationMinutesValue(context.draft.booking.duration)) !== null && _normalizeDurationMin3 !== void 0 ? _normalizeDurationMin3 : context.draft.booking.duration, baseDurationMinutes);
+			const nextDuration = resolvePosCustomTimeDefaultDurationMinutes((_normalizeDurationMin3 = normalizeDurationMinutesValue(context.draft.booking.duration)) !== null && _normalizeDurationMin3 !== void 0 ? _normalizeDurationMin3 : context.draft.booking.duration, baseDurationMinutes, context.services.selectionFlowMode === "edit" ? void 0 : resolvePosFlexibleBusinessDurationMinutes(nextStartTime, getShopOpeningHours()));
 			const changedFields = [];
 			if (nextStartTime !== context.draft.booking.startTime) changedFields.push("booking.startTime");
 			if (nextDuration !== context.draft.booking.duration) changedFields.push("booking.duration");
@@ -217,7 +217,7 @@ const refreshAvailabilityTimes = function() {
 				yield refreshAvailabilityTimes(context, module, {
 					durationOverride: nextDuration,
 					startTimeOverride: nextStartTime,
-					selectionIntent: "custom"
+					selectionIntent: "fallback"
 				});
 				return;
 			}
@@ -279,8 +279,16 @@ const refreshAvailabilityTimes = function() {
 		});
 		const normallySelectableCandidates = times.filter((candidate) => isAvailabilityCandidateSelectable(candidate));
 		const selectableCandidates = normallySelectableCandidates.length > 0 || !allowUnavailable ? normallySelectableCandidates : times;
-		const initialCandidate = restoredCandidate || (posCustomTimeAvailability && Boolean(requestedPosStartTime && requestedPosDuration) ? void 0 : selectableCandidates[0]);
+		const shouldPreserveRequestedPosStart = posCustomTimeAvailability && Boolean(requestedPosStartTime && requestedPosDuration);
 		const displayCandidates = posSessionAvailability ? getSessionPresetCandidates(times) : posDurationAvailability && isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) ? getPosFlexibleDurationPresetCandidates(times, requestedCustomRange, customSelectionIntent) : times;
+		const fallbackCandidate = shouldPreserveRequestedPosStart ? void 0 : selectableCandidates[0];
+		const preferPosFlexiblePreset = posDurationAvailability && isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) && !customSelectionIntent && context.services.selectionFlowMode !== "edit" && (selectionIntent === "fallback" || !existingCandidate || existingCandidate.date !== selectedDate);
+		const initialCandidate = posDurationAvailability && isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) ? resolvePosFlexibleDurationInitialCandidate({
+			presetCandidates: displayCandidates,
+			restoredCandidate,
+			fallbackCandidate,
+			preferPreset: preferPosFlexiblePreset
+		}) : restoredCandidate || fallbackCandidate;
 		context.setModuleData(module.key, {
 			requestId,
 			slotStepMinutes: group === null || group === void 0 ? void 0 : group.slotStepMinutes,

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

@@ -28,10 +28,27 @@ const resolvePosCustomTimeDefaultStartTime = (currentValue, sliceMinutes, now) =
 	const minutes = alignedMinute % 60;
 	return `${String(hours).padStart(2, "0")}:${String(minutes).padStart(2, "0")}`;
 };
-const resolvePosCustomTimeDefaultDurationMinutes = (currentValue, baseDurationMinutes) => {
-	if (typeof currentValue === "string") {
-		const flexibleMatch = currentValue.trim().toLowerCase().match(/^flexible_(\d+(?:\.\d+)?)$/);
-		if (flexibleMatch) return Math.max(1, Math.floor(Number(flexibleMatch[1])));
+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 resolvePosCustomTimeDefaultDurationMinutes = (currentValue, baseDurationMinutes, flexibleDefaultMinutes) => {
+	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])));
+		}
 	}
 	const currentMinutes = Number(currentValue);
 	if (Number.isFinite(currentMinutes) && currentMinutes > 0) return Math.max(1, Math.floor(currentMinutes));
@@ -60,5 +77,10 @@ const getPosFlexibleDurationPresetCandidates = (candidates, requestedCustomRange
 	const presets = candidates.filter((candidate) => !isSameAvailabilityCandidateRange(candidate, requestedCustomRange));
 	return presets.length > 0 || customSelectionIntent ? presets : [...candidates];
 };
+const resolvePosFlexibleDurationInitialCandidate = (params) => {
+	const firstAvailablePreset = params.presetCandidates.find((candidate) => (!candidate.status || candidate.status === "available" || candidate.status === "limited") && !(typeof candidate.maxPartySize === "number" && candidate.maxPartySize <= 0));
+	if (params.preferPreset && firstAvailablePreset) return firstAvailablePreset;
+	return params.restoredCandidate || params.fallbackCandidate;
+};
 //#endregion
-export { getAvailabilityCandidateDurationMinutes, getPosFlexibleDurationPresetCandidates, getSessionPresetCandidates, isFlexibleDurationValue, isSameAvailabilityCandidateRange, resolvePosCustomTimeBaseMinutes, resolvePosCustomTimeCandidate, resolvePosCustomTimeDefaultDurationMinutes, resolvePosCustomTimeDefaultStartTime, shouldShowPosCustomTimeCandidateCards };
+export { getAvailabilityCandidateDurationMinutes, getPosFlexibleDurationPresetCandidates, getSessionPresetCandidates, isFlexibleDurationValue, isSameAvailabilityCandidateRange, resolvePosCustomTimeBaseMinutes, resolvePosCustomTimeCandidate, resolvePosCustomTimeDefaultDurationMinutes, resolvePosCustomTimeDefaultStartTime, resolvePosFlexibleBusinessDurationMinutes, resolvePosFlexibleDurationInitialCandidate, shouldShowPosCustomTimeCandidateCards };

package/lib/components/booking/utils.js

@@ -645,6 +645,7 @@ exports.getServeStartTime = getServeStartTime;
 exports.getServerItemExtend = getServerItemExtend;
 exports.getServiceTime = getServiceTime;
 exports.getServiceTimes = getServiceTimes;
+exports.getShopOpeningHours = getShopOpeningHours;
 exports.isNowTime = isNowTime;
 exports.isSessionProduct = isSessionProduct;
 exports.isWalkIn = isWalkIn;

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

@@ -201,7 +201,7 @@ const refreshAvailabilityTimes = function() {
 			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 nextStartTime = require_posCustomTime.resolvePosCustomTimeDefaultStartTime(context.draft.booking.startTime, baseDurationMinutes);
-			const nextDuration = require_posCustomTime.resolvePosCustomTimeDefaultDurationMinutes((_normalizeDurationMin3 = normalizeDurationMinutesValue(context.draft.booking.duration)) !== null && _normalizeDurationMin3 !== void 0 ? _normalizeDurationMin3 : context.draft.booking.duration, baseDurationMinutes);
+			const nextDuration = require_posCustomTime.resolvePosCustomTimeDefaultDurationMinutes((_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, require_utils$2.getShopOpeningHours()));
 			const changedFields = [];
 			if (nextStartTime !== context.draft.booking.startTime) changedFields.push("booking.startTime");
 			if (nextDuration !== context.draft.booking.duration) changedFields.push("booking.duration");
@@ -221,7 +221,7 @@ const refreshAvailabilityTimes = function() {
 				yield refreshAvailabilityTimes(context, module, {
 					durationOverride: nextDuration,
 					startTimeOverride: nextStartTime,
-					selectionIntent: "custom"
+					selectionIntent: "fallback"
 				});
 				return;
 			}
@@ -283,8 +283,16 @@ const refreshAvailabilityTimes = function() {
 		});
 		const normallySelectableCandidates = times.filter((candidate) => isAvailabilityCandidateSelectable(candidate));
 		const selectableCandidates = normallySelectableCandidates.length > 0 || !allowUnavailable ? normallySelectableCandidates : times;
-		const initialCandidate = restoredCandidate || (posCustomTimeAvailability && Boolean(requestedPosStartTime && requestedPosDuration) ? void 0 : selectableCandidates[0]);
+		const shouldPreserveRequestedPosStart = posCustomTimeAvailability && Boolean(requestedPosStartTime && requestedPosDuration);
 		const displayCandidates = posSessionAvailability ? require_posCustomTime.getSessionPresetCandidates(times) : posDurationAvailability && require_posCustomTime.isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) ? require_posCustomTime.getPosFlexibleDurationPresetCandidates(times, requestedCustomRange, customSelectionIntent) : times;
+		const fallbackCandidate = shouldPreserveRequestedPosStart ? void 0 : selectableCandidates[0];
+		const preferPosFlexiblePreset = posDurationAvailability && require_posCustomTime.isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) && !customSelectionIntent && context.services.selectionFlowMode !== "edit" && (selectionIntent === "fallback" || !existingCandidate || existingCandidate.date !== selectedDate);
+		const initialCandidate = posDurationAvailability && require_posCustomTime.isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) ? require_posCustomTime.resolvePosFlexibleDurationInitialCandidate({
+			presetCandidates: displayCandidates,
+			restoredCandidate,
+			fallbackCandidate,
+			preferPreset: preferPosFlexiblePreset
+		}) : restoredCandidate || fallbackCandidate;
 		context.setModuleData(module.key, {
 			requestId,
 			slotStepMinutes: group === null || group === void 0 ? void 0 : group.slotStepMinutes,

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

@@ -30,10 +30,27 @@ const resolvePosCustomTimeDefaultStartTime = (currentValue, sliceMinutes, now) =
 	const minutes = alignedMinute % 60;
 	return `${String(hours).padStart(2, "0")}:${String(minutes).padStart(2, "0")}`;
 };
-const resolvePosCustomTimeDefaultDurationMinutes = (currentValue, baseDurationMinutes) => {
-	if (typeof currentValue === "string") {
-		const flexibleMatch = currentValue.trim().toLowerCase().match(/^flexible_(\d+(?:\.\d+)?)$/);
-		if (flexibleMatch) return Math.max(1, Math.floor(Number(flexibleMatch[1])));
+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 resolvePosCustomTimeDefaultDurationMinutes = (currentValue, baseDurationMinutes, flexibleDefaultMinutes) => {
+	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])));
+		}
 	}
 	const currentMinutes = Number(currentValue);
 	if (Number.isFinite(currentMinutes) && currentMinutes > 0) return Math.max(1, Math.floor(currentMinutes));
@@ -62,6 +79,11 @@ const getPosFlexibleDurationPresetCandidates = (candidates, requestedCustomRange
 	const presets = candidates.filter((candidate) => !isSameAvailabilityCandidateRange(candidate, requestedCustomRange));
 	return presets.length > 0 || customSelectionIntent ? presets : [...candidates];
 };
+const resolvePosFlexibleDurationInitialCandidate = (params) => {
+	const firstAvailablePreset = params.presetCandidates.find((candidate) => (!candidate.status || candidate.status === "available" || candidate.status === "limited") && !(typeof candidate.maxPartySize === "number" && candidate.maxPartySize <= 0));
+	if (params.preferPreset && firstAvailablePreset) return firstAvailablePreset;
+	return params.restoredCandidate || params.fallbackCandidate;
+};
 //#endregion
 exports.getAvailabilityCandidateDurationMinutes = getAvailabilityCandidateDurationMinutes;
 exports.getPosFlexibleDurationPresetCandidates = getPosFlexibleDurationPresetCandidates;
@@ -72,4 +94,6 @@ exports.resolvePosCustomTimeBaseMinutes = resolvePosCustomTimeBaseMinutes;
 exports.resolvePosCustomTimeCandidate = resolvePosCustomTimeCandidate;
 exports.resolvePosCustomTimeDefaultDurationMinutes = resolvePosCustomTimeDefaultDurationMinutes;
 exports.resolvePosCustomTimeDefaultStartTime = resolvePosCustomTimeDefaultStartTime;
+exports.resolvePosFlexibleBusinessDurationMinutes = resolvePosFlexibleBusinessDurationMinutes;
+exports.resolvePosFlexibleDurationInitialCandidate = resolvePosFlexibleDurationInitialCandidate;
 exports.shouldShowPosCustomTimeCandidateCards = shouldShowPosCustomTimeCandidateCards;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.653",
+  "version": "6.11.655",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -69,11 +69,11 @@
     "react-zoom-pan-pinch": "^3.7.0",
     "styled-components": "^6.0.0-rc.3",
     "use-sync-external-store": "^1.6.0",
-    "@pisell/materials": "6.11.256",
-    "@pisell/icon": "0.0.11",
+    "@pisell/pi-payment-sdk": "0.0.3",
     "@pisell/utils": "3.0.4",
     "@pisell/date-picker": "3.0.10",
-    "@pisell/pi-payment-sdk": "0.0.3"
+    "@pisell/materials": "6.11.256",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",