@pisell/private-materials 6.11.651 → 6.11.653

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, getSessionPresetCandidates, isFlexibleDurationValue, isSameAvailabilityCandidateRange, resolvePosCustomTimeBaseMinutes, resolvePosCustomTimeCandidate, resolvePosCustomTimeDefaultDurationMinutes, resolvePosCustomTimeDefaultStartTime } from "./posCustomTime.js";
+import { getAvailabilityCandidateDurationMinutes, getPosFlexibleDurationPresetCandidates, getSessionPresetCandidates, isFlexibleDurationValue, isSameAvailabilityCandidateRange, resolvePosCustomTimeBaseMinutes, resolvePosCustomTimeCandidate, resolvePosCustomTimeDefaultDurationMinutes, resolvePosCustomTimeDefaultStartTime, shouldShowPosCustomTimeCandidateCards } from "./posCustomTime.js";
 import dayjs from "dayjs";
 import React, { useEffect, useMemo } from "react";
 import { Alert, Space } from "antd";
@@ -264,14 +264,15 @@ const refreshAvailabilityTimes = function() {
 			durationMinutes: requestedPosDuration
 		}) : isSameCandidateStart(candidate, selectedDate, requestedPosStartTime)) : void 0;
 		const customSelectionIntent = posCustomTimeAvailability && selectionIntent === "custom";
+		const requestedCustomRange = requestedPosStartTime && requestedPosDuration ? {
+			date: selectedDate,
+			startTime: requestedPosStartTime,
+			durationMinutes: requestedPosDuration
+		} : void 0;
 		const restoredCandidate = resolvePosCustomTimeCandidate({
 			candidates: times.filter((candidate) => isAvailabilityCandidateSelectable(candidate, allowUnavailable)),
 			customSelectionIntent,
-			requestedCustomRange: customSelectionIntent && requestedPosStartTime && requestedPosDuration ? {
-				date: selectedDate,
-				startTime: requestedPosStartTime,
-				durationMinutes: requestedPosDuration
-			} : void 0,
+			requestedCustomRange: customSelectionIntent ? requestedCustomRange : void 0,
 			restoredDraftCandidate,
 			restoredExistingCandidate,
 			fallbackCandidate: fallbackOsCandidate
@@ -279,10 +280,11 @@ 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 displayCandidates = posSessionAvailability ? getSessionPresetCandidates(times) : posDurationAvailability && isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) ? getPosFlexibleDurationPresetCandidates(times, requestedCustomRange, customSelectionIntent) : times;
 		context.setModuleData(module.key, {
 			requestId,
 			slotStepMinutes: group === null || group === void 0 ? void 0 : group.slotStepMinutes,
-			timeSlots: (posSessionAvailability ? getSessionPresetCandidates(times) : times).map((candidate) => ({
+			timeSlots: displayCandidates.map((candidate) => ({
 				id: candidate.key,
 				start_time: candidate.startTime,
 				end_time: candidate.endTime,
@@ -642,7 +644,7 @@ const TimeFlowModuleComponent = ({ context, module, registerHandle }) => {
 		if (isDateModuleLoading) return null;
 		if (!hasNoSelectableAvailabilityDate && (moduleStatus === "loading" || !(availabilityData === null || availabilityData === void 0 ? void 0 : availabilityData.timeSlots))) return /* @__PURE__ */ React.createElement(SkuDetailLoadingPanel, null);
 		if (usePosCustomTimeAvailability) {
-			var _availabilityData$slo, _durationProps$select, _options$durationSele;
+			var _availabilityData$slo, _availabilityData$tim, _durationProps$select, _options$durationSele;
 			if (usePosSessionAvailability && !posCustomTimeBaseMinutes) return /* @__PURE__ */ React.createElement(Alert, {
 				type: "error",
 				showIcon: true,
@@ -651,10 +653,15 @@ const TimeFlowModuleComponent = ({ context, module, registerHandle }) => {
 			const selectedCandidate = availabilityData === null || availabilityData === void 0 ? void 0 : availabilityData.selectedCandidate;
 			const posStartTimeSlice = usePosSessionAvailability ? availabilityData === null || availabilityData === void 0 ? void 0 : availabilityData.slotStepMinutes : (_availabilityData$slo = availabilityData === null || availabilityData === void 0 ? void 0 : availabilityData.slotStepMinutes) !== null && _availabilityData$slo !== void 0 ? _availabilityData$slo : slice;
 			selectedCandidate && context.services.allowUnavailableBookingSelection === true && isAvailabilityCandidateSelectable(selectedCandidate);
+			const showCandidateCards = shouldShowPosCustomTimeCandidateCards({
+				isSessionAvailability: usePosSessionAvailability,
+				isDurationAvailability: usePosDurationAvailability,
+				candidateCount: (availabilityData === null || availabilityData === void 0 || (_availabilityData$tim = availabilityData.timeSlots) === null || _availabilityData$tim === void 0 ? void 0 : _availabilityData$tim.length) || 0
+			});
 			return /* @__PURE__ */ React.createElement(Space, {
 				direction: "vertical",
 				style: { width: "100%" }
-			}, usePosSessionAvailability ? renderAvailabilityTimeSelector() : null, /* @__PURE__ */ React.createElement("div", { style: { fontWeight: 500 } }, selectionFlowText("pisell2.text.start_time")), /* @__PURE__ */ React.createElement(SelectTime, {
+			}, showCandidateCards ? renderAvailabilityTimeSelector() : null, /* @__PURE__ */ React.createElement("div", { style: { fontWeight: 500 } }, selectionFlowText("pisell2.text.start_time")), /* @__PURE__ */ React.createElement(SelectTime, {
 				value: startTime || "",
 				slice: posStartTimeSlice,
 				theme: options.theme,

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

@@ -37,6 +37,7 @@ const resolvePosCustomTimeDefaultDurationMinutes = (currentValue, baseDurationMi
 	if (Number.isFinite(currentMinutes) && currentMinutes > 0) return Math.max(1, Math.floor(currentMinutes));
 	return resolvePosCustomTimeBaseMinutes(baseDurationMinutes);
 };
+const shouldShowPosCustomTimeCandidateCards = (params) => params.isSessionAvailability || params.isDurationAvailability && params.candidateCount > 0;
 const getAvailabilityCandidateDurationMinutes = (candidate) => {
 	const startAt = dayjs(candidate.startAt);
 	const endAt = dayjs(candidate.endAt);
@@ -54,5 +55,10 @@ const resolvePosCustomTimeCandidate = (params) => {
 	return params.restoredDraftCandidate || params.restoredExistingCandidate || params.fallbackCandidate;
 };
 const getSessionPresetCandidates = (candidates) => candidates.filter((candidate) => candidate.source === "session_schedule");
+const getPosFlexibleDurationPresetCandidates = (candidates, requestedCustomRange, customSelectionIntent = false) => {
+	if (!requestedCustomRange) return [...candidates];
+	const presets = candidates.filter((candidate) => !isSameAvailabilityCandidateRange(candidate, requestedCustomRange));
+	return presets.length > 0 || customSelectionIntent ? presets : [...candidates];
+};
 //#endregion
-export { getAvailabilityCandidateDurationMinutes, getSessionPresetCandidates, isFlexibleDurationValue, isSameAvailabilityCandidateRange, resolvePosCustomTimeBaseMinutes, resolvePosCustomTimeCandidate, resolvePosCustomTimeDefaultDurationMinutes, resolvePosCustomTimeDefaultStartTime };
+export { getAvailabilityCandidateDurationMinutes, getPosFlexibleDurationPresetCandidates, getSessionPresetCandidates, isFlexibleDurationValue, isSameAvailabilityCandidateRange, resolvePosCustomTimeBaseMinutes, resolvePosCustomTimeCandidate, resolvePosCustomTimeDefaultDurationMinutes, resolvePosCustomTimeDefaultStartTime, shouldShowPosCustomTimeCandidateCards };

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

@@ -268,14 +268,15 @@ const refreshAvailabilityTimes = function() {
 			durationMinutes: requestedPosDuration
 		}) : isSameCandidateStart(candidate, selectedDate, requestedPosStartTime)) : void 0;
 		const customSelectionIntent = posCustomTimeAvailability && selectionIntent === "custom";
+		const requestedCustomRange = requestedPosStartTime && requestedPosDuration ? {
+			date: selectedDate,
+			startTime: requestedPosStartTime,
+			durationMinutes: requestedPosDuration
+		} : void 0;
 		const restoredCandidate = require_posCustomTime.resolvePosCustomTimeCandidate({
 			candidates: times.filter((candidate) => isAvailabilityCandidateSelectable(candidate, allowUnavailable)),
 			customSelectionIntent,
-			requestedCustomRange: customSelectionIntent && requestedPosStartTime && requestedPosDuration ? {
-				date: selectedDate,
-				startTime: requestedPosStartTime,
-				durationMinutes: requestedPosDuration
-			} : void 0,
+			requestedCustomRange: customSelectionIntent ? requestedCustomRange : void 0,
 			restoredDraftCandidate,
 			restoredExistingCandidate,
 			fallbackCandidate: fallbackOsCandidate
@@ -283,10 +284,11 @@ 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 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;
 		context.setModuleData(module.key, {
 			requestId,
 			slotStepMinutes: group === null || group === void 0 ? void 0 : group.slotStepMinutes,
-			timeSlots: (posSessionAvailability ? require_posCustomTime.getSessionPresetCandidates(times) : times).map((candidate) => ({
+			timeSlots: displayCandidates.map((candidate) => ({
 				id: candidate.key,
 				start_time: candidate.startTime,
 				end_time: candidate.endTime,
@@ -646,7 +648,7 @@ const TimeFlowModuleComponent = ({ context, module, registerHandle }) => {
 		if (isDateModuleLoading) return null;
 		if (!hasNoSelectableAvailabilityDate && (moduleStatus === "loading" || !(availabilityData === null || availabilityData === void 0 ? void 0 : availabilityData.timeSlots))) return /* @__PURE__ */ react.default.createElement(require_LoadingPanel.default, null);
 		if (usePosCustomTimeAvailability) {
-			var _availabilityData$slo, _durationProps$select, _options$durationSele;
+			var _availabilityData$slo, _availabilityData$tim, _durationProps$select, _options$durationSele;
 			if (usePosSessionAvailability && !posCustomTimeBaseMinutes) return /* @__PURE__ */ react.default.createElement(antd.Alert, {
 				type: "error",
 				showIcon: true,
@@ -655,10 +657,15 @@ const TimeFlowModuleComponent = ({ context, module, registerHandle }) => {
 			const selectedCandidate = availabilityData === null || availabilityData === void 0 ? void 0 : availabilityData.selectedCandidate;
 			const posStartTimeSlice = usePosSessionAvailability ? availabilityData === null || availabilityData === void 0 ? void 0 : availabilityData.slotStepMinutes : (_availabilityData$slo = availabilityData === null || availabilityData === void 0 ? void 0 : availabilityData.slotStepMinutes) !== null && _availabilityData$slo !== void 0 ? _availabilityData$slo : slice;
 			selectedCandidate && context.services.allowUnavailableBookingSelection === true && isAvailabilityCandidateSelectable(selectedCandidate);
+			const showCandidateCards = require_posCustomTime.shouldShowPosCustomTimeCandidateCards({
+				isSessionAvailability: usePosSessionAvailability,
+				isDurationAvailability: usePosDurationAvailability,
+				candidateCount: (availabilityData === null || availabilityData === void 0 || (_availabilityData$tim = availabilityData.timeSlots) === null || _availabilityData$tim === void 0 ? void 0 : _availabilityData$tim.length) || 0
+			});
 			return /* @__PURE__ */ react.default.createElement(antd.Space, {
 				direction: "vertical",
 				style: { width: "100%" }
-			}, usePosSessionAvailability ? renderAvailabilityTimeSelector() : null, /* @__PURE__ */ react.default.createElement("div", { style: { fontWeight: 500 } }, require_i18n.selectionFlowText("pisell2.text.start_time")), /* @__PURE__ */ react.default.createElement(_pisell_materials.SelectTime, {
+			}, showCandidateCards ? renderAvailabilityTimeSelector() : null, /* @__PURE__ */ react.default.createElement("div", { style: { fontWeight: 500 } }, require_i18n.selectionFlowText("pisell2.text.start_time")), /* @__PURE__ */ react.default.createElement(_pisell_materials.SelectTime, {
 				value: startTime || "",
 				slice: posStartTimeSlice,
 				theme: options.theme,

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

@@ -39,6 +39,7 @@ const resolvePosCustomTimeDefaultDurationMinutes = (currentValue, baseDurationMi
 	if (Number.isFinite(currentMinutes) && currentMinutes > 0) return Math.max(1, Math.floor(currentMinutes));
 	return resolvePosCustomTimeBaseMinutes(baseDurationMinutes);
 };
+const shouldShowPosCustomTimeCandidateCards = (params) => params.isSessionAvailability || params.isDurationAvailability && params.candidateCount > 0;
 const getAvailabilityCandidateDurationMinutes = (candidate) => {
 	const startAt = (0, dayjs.default)(candidate.startAt);
 	const endAt = (0, dayjs.default)(candidate.endAt);
@@ -56,8 +57,14 @@ const resolvePosCustomTimeCandidate = (params) => {
 	return params.restoredDraftCandidate || params.restoredExistingCandidate || params.fallbackCandidate;
 };
 const getSessionPresetCandidates = (candidates) => candidates.filter((candidate) => candidate.source === "session_schedule");
+const getPosFlexibleDurationPresetCandidates = (candidates, requestedCustomRange, customSelectionIntent = false) => {
+	if (!requestedCustomRange) return [...candidates];
+	const presets = candidates.filter((candidate) => !isSameAvailabilityCandidateRange(candidate, requestedCustomRange));
+	return presets.length > 0 || customSelectionIntent ? presets : [...candidates];
+};
 //#endregion
 exports.getAvailabilityCandidateDurationMinutes = getAvailabilityCandidateDurationMinutes;
+exports.getPosFlexibleDurationPresetCandidates = getPosFlexibleDurationPresetCandidates;
 exports.getSessionPresetCandidates = getSessionPresetCandidates;
 exports.isFlexibleDurationValue = isFlexibleDurationValue;
 exports.isSameAvailabilityCandidateRange = isSameAvailabilityCandidateRange;
@@ -65,3 +72,4 @@ exports.resolvePosCustomTimeBaseMinutes = resolvePosCustomTimeBaseMinutes;
 exports.resolvePosCustomTimeCandidate = resolvePosCustomTimeCandidate;
 exports.resolvePosCustomTimeDefaultDurationMinutes = resolvePosCustomTimeDefaultDurationMinutes;
 exports.resolvePosCustomTimeDefaultStartTime = resolvePosCustomTimeDefaultStartTime;
+exports.shouldShowPosCustomTimeCandidateCards = shouldShowPosCustomTimeCandidateCards;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.651",
+  "version": "6.11.653",
   "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/pi-payment-sdk": "0.0.3",
-    "@pisell/utils": "3.0.4",
+    "@pisell/materials": "6.11.256",
     "@pisell/icon": "0.0.11",
+    "@pisell/utils": "3.0.4",
     "@pisell/date-picker": "3.0.10",
-    "@pisell/materials": "6.11.256"
+    "@pisell/pi-payment-sdk": "0.0.3"
   },
   "peerDependencies": {
     "react": "^18.0.0",