@pisell/private-materials 6.11.645 → 6.11.646

package/lib/plus/salesSdk/context/SalesSdkHolderContext.js

@@ -13,6 +13,11 @@ let react = require("react");
 react = require_runtime.__toESM(react);
 let ahooks = require("ahooks");
 //#region src/plus/salesSdk/context/SalesSdkHolderContext.tsx
+const HOLDER_ACCESS_ALLOWED = {
+	allowed: true,
+	loginOpened: false,
+	loginClosed: false
+};
 const SalesSdkHolderContext = (0, react.createContext)(null);
 SalesSdkHolderContext.displayName = "SalesSdkHolderContext";
 const EMPTY_HOLDER_OPTIONS = [];
@@ -110,31 +115,49 @@ const SalesSdkHolderProvider = ({ children }) => {
 		}
 		return true;
 	}));
-	const ensureHolderRequestAccess = (0, ahooks.useMemoizedFn)(() => {
+	const ensureHolderRequestAccess = (0, ahooks.useMemoizedFn)((options) => {
 		const normalizedPlatform = String(platform || "").trim().toLowerCase();
-		if (normalizedPlatform !== "pc" && normalizedPlatform !== "h5") return Promise.resolve(true);
+		if (normalizedPlatform !== "pc" && normalizedPlatform !== "h5") return Promise.resolve(HOLDER_ACCESS_ALLOWED);
 		const currentCustomerId = resolveHolderCustomerId(bookingTicket);
 		const loggedIn = isLoggedIn();
-		if (loggedIn && !isUnboundHolderCustomerId(currentCustomerId)) return Promise.resolve(true);
+		if (!isUnboundHolderCustomerId(currentCustomerId) && (loggedIn || (options === null || options === void 0 ? void 0 : options.allowBoundCustomerAccess) === true)) return Promise.resolve(HOLDER_ACCESS_ALLOWED);
 		if (holderAccessPromiseRef.current) return holderAccessPromiseRef.current;
-		const accessPromise = loggedIn ? syncAuthenticatedHolderCustomer() : new Promise((resolve) => {
+		const accessPromise = loggedIn ? syncAuthenticatedHolderCustomer().then((allowed) => ({
+			allowed,
+			loginOpened: false,
+			loginClosed: false
+		})) : new Promise((resolve) => {
 			let settled = false;
-			const finish = (allowed) => {
+			const finish = (result) => {
 				if (settled) return;
 				settled = true;
-				resolve(allowed);
+				resolve(result);
 			};
 			if (!openLoginModal({ callback: (status) => {
 				if (settled) return;
 				if (status !== "success") {
-					finish(false);
+					finish({
+						allowed: false,
+						loginOpened: true,
+						loginClosed: true
+					});
 					return;
 				}
 				settled = true;
-				syncAuthenticatedHolderCustomer().then(resolve);
+				syncAuthenticatedHolderCustomer().then((allowed) => {
+					resolve({
+						allowed,
+						loginOpened: true,
+						loginClosed: false
+					});
+				});
 			} })) {
 				console.warn("[SalesSdk] holder request blocked: login modal is unavailable");
-				finish(false);
+				finish({
+					allowed: false,
+					loginOpened: false,
+					loginClosed: false
+				});
 			}
 		});
 		holderAccessPromiseRef.current = accessPromise;
@@ -186,14 +209,30 @@ const SalesSdkHolderProvider = ({ children }) => {
 			}, {});
 		});
 	});
-	const ensureHolderOptionsForSource = (0, ahooks.useMemoizedFn)(function() {
-		var _ref = require_asyncToGenerator._asyncToGenerator(function* (source) {
+	const prepareHolderOptionsForSource = (0, ahooks.useMemoizedFn)(function() {
+		var _ref = require_asyncToGenerator._asyncToGenerator(function* (source, options) {
 			const holderConfig = require_productHolderConfig.resolveEffectiveHolderConfig(source, bookingConfig);
-			if (!holderConfig.enabled || holderConfig.formId === void 0) return EMPTY_HOLDER_OPTIONS;
-			if (!(yield ensureHolderRequestAccess())) return EMPTY_HOLDER_OPTIONS;
+			if (!holderConfig.enabled || holderConfig.formId === void 0) return {
+				options: EMPTY_HOLDER_OPTIONS,
+				accessAllowed: true,
+				loginOpened: false,
+				loginClosed: false
+			};
+			const access = yield ensureHolderRequestAccess(options);
+			if (!access.allowed) return {
+				options: EMPTY_HOLDER_OPTIONS,
+				accessAllowed: false,
+				loginOpened: access.loginOpened,
+				loginClosed: access.loginClosed
+			};
 			const params = resolveRequestParams(source);
 			const requestKey = require_enrichCartLineHolderDisplay.buildHolderListRequestKey(params);
-			if (!params || !requestKey) return EMPTY_HOLDER_OPTIONS;
+			if (!params || !requestKey) return {
+				options: EMPTY_HOLDER_OPTIONS,
+				accessAllowed: true,
+				loginOpened: access.loginOpened,
+				loginClosed: access.loginClosed
+			};
 			const cached = mergeHolderOptionsStable(optimisticHolderOptionsByKey[requestKey] || EMPTY_HOLDER_OPTIONS, serverHolderOptionsByKey[requestKey] || EMPTY_HOLDER_OPTIONS);
 			if (cached.length) {
 				setHolderOptionsRequestKey(requestKey);
@@ -210,9 +249,19 @@ const SalesSdkHolderProvider = ({ children }) => {
 						setLoading(loadingKeysRef.current.size > 0);
 					});
 				}
-				return cached;
+				return {
+					options: cached,
+					accessAllowed: true,
+					loginOpened: access.loginOpened,
+					loginClosed: access.loginClosed
+				};
 			}
-			if (loadingKeysRef.current.has(requestKey)) return cached;
+			if (loadingKeysRef.current.has(requestKey)) return {
+				options: cached,
+				accessAllowed: true,
+				loginOpened: access.loginOpened,
+				loginClosed: access.loginClosed
+			};
 			loadingKeysRef.current.add(requestKey);
 			setLoading(true);
 			try {
@@ -220,20 +269,38 @@ const SalesSdkHolderProvider = ({ children }) => {
 				const fromServer = require_formatHolderOptions.formatHolderOptions(Array.isArray(data === null || data === void 0 ? void 0 : data.list) ? data.list : []);
 				setServerHolderOptionsByKey((prev) => require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, prev), {}, { [requestKey]: fromServer }));
 				setHolderOptionsRequestKey(requestKey);
-				return mergeHolderOptionsStable(optimisticHolderOptionsByKey[requestKey] || EMPTY_HOLDER_OPTIONS, fromServer);
+				return {
+					options: mergeHolderOptionsStable(optimisticHolderOptionsByKey[requestKey] || EMPTY_HOLDER_OPTIONS, fromServer),
+					accessAllowed: true,
+					loginOpened: access.loginOpened,
+					loginClosed: access.loginClosed
+				};
 			} catch (err) {
 				console.warn("[SalesSdk] load holderOptions failed", err);
 				setHolderOptionsRequestKey(null);
-				return EMPTY_HOLDER_OPTIONS;
+				return {
+					options: EMPTY_HOLDER_OPTIONS,
+					accessAllowed: true,
+					loginOpened: access.loginOpened,
+					loginClosed: access.loginClosed
+				};
 			} finally {
 				loadingKeysRef.current.delete(requestKey);
 				setLoading(loadingKeysRef.current.size > 0);
 			}
 		});
-		return function(_x) {
+		return function(_x, _x2) {
 			return _ref.apply(this, arguments);
 		};
 	}());
+	const ensureHolderOptionsForSource = (0, ahooks.useMemoizedFn)(function() {
+		var _ref2 = require_asyncToGenerator._asyncToGenerator(function* (source) {
+			return (yield prepareHolderOptionsForSource(source)).options;
+		});
+		return function(_x3) {
+			return _ref2.apply(this, arguments);
+		};
+	}());
 	(0, react.useEffect)(() => {
 		return require_holderOptionsSyncBridge.registerHolderOptionsSyncBridge({
 			upsertHolderOptions,
@@ -251,7 +318,7 @@ const SalesSdkHolderProvider = ({ children }) => {
 		let cancelled = false;
 		collectHolderSources(bookingTicket, bookingConfig).forEach((source) => {
 			require_asyncToGenerator._asyncToGenerator(function* () {
-				if (!(yield ensureHolderRequestAccess()) || cancelled) return;
+				if (!(yield ensureHolderRequestAccess()).allowed || cancelled) return;
 				const params = resolveRequestParams(source);
 				const requestKey = require_enrichCartLineHolderDisplay.buildHolderListRequestKey(params);
 				if (!params || !requestKey) return;
@@ -307,6 +374,7 @@ const SalesSdkHolderProvider = ({ children }) => {
 		getHolderOptionsForSource,
 		getHolderOptionsRequestKeyForSource,
 		ensureHolderOptionsForSource,
+		prepareHolderOptionsForSource,
 		reload,
 		upsertHolderOptions
 	}), [
@@ -317,6 +385,7 @@ const SalesSdkHolderProvider = ({ children }) => {
 		getHolderOptionsForSource,
 		getHolderOptionsRequestKeyForSource,
 		ensureHolderOptionsForSource,
+		prepareHolderOptionsForSource,
 		reload,
 		upsertHolderOptions
 	]);
@@ -335,11 +404,24 @@ function useSalesSdkHolderOptional() {
 		getHolderOptionsForSource: () => EMPTY_HOLDER_OPTIONS,
 		getHolderOptionsRequestKeyForSource: () => null,
 		ensureHolderOptionsForSource: function() {
-			var _ref2 = require_asyncToGenerator._asyncToGenerator(function* () {
+			var _ref3 = require_asyncToGenerator._asyncToGenerator(function* () {
 				return EMPTY_HOLDER_OPTIONS;
 			});
 			return function ensureHolderOptionsForSource() {
-				return _ref2.apply(this, arguments);
+				return _ref3.apply(this, arguments);
+			};
+		}(),
+		prepareHolderOptionsForSource: function() {
+			var _ref4 = require_asyncToGenerator._asyncToGenerator(function* () {
+				return {
+					options: EMPTY_HOLDER_OPTIONS,
+					accessAllowed: true,
+					loginOpened: false,
+					loginClosed: false
+				};
+			});
+			return function prepareHolderOptionsForSource() {
+				return _ref4.apply(this, arguments);
 			};
 		}(),
 		reload: () => void 0,

package/lib/plus/salesSdk/context/SalesSdkProvider.js

@@ -222,7 +222,7 @@ function SalesSdkBootstrap({ autoRestoreOnInit, autoBootstrap, autoInitBookingCo
 	]);
 	return null;
 }
-const SalesSdkProvider = ({ osKey, solution = "bookingTicket", moduleAccess = "ensure", lifecycleOwner = "provider", businessCode, bookingConfigParams, autoInitBookingContext = true, otherParams, shouldMergeProductLines, rulesHooks, orderId, preloadedSalesDetail, autoBootstrap = true, autoRestoreOnInit = true, restoreOrderAfterPaidCheckout = true, destroyOnUnmount = true, uiHosts, normalProductDetailConfig, mergeBookingLinesForDisplay = true, legacyOpenProductDetail, enableTempOrderSync = false, enableTempOrderPersist = false, syncDetailOnOrderChange = false, isActive = true, preserveProductCatalogOnInactiveCustomerClear = false, enableGlobalScanListener = false, promotionScanSuccessMessageKey, promotionItemIncreaseMessageKey, defaultProductLoadParams, children }) => {
+const SalesSdkProvider = ({ osKey, solution = "bookingTicket", moduleAccess = "ensure", lifecycleOwner = "provider", businessCode, bookingConfigParams, autoInitBookingContext = true, otherParams, deferHolderAuthOnClose = false, shouldMergeProductLines, rulesHooks, orderId, preloadedSalesDetail, autoBootstrap = true, autoRestoreOnInit = true, restoreOrderAfterPaidCheckout = true, destroyOnUnmount = true, uiHosts, normalProductDetailConfig, mergeBookingLinesForDisplay = true, legacyOpenProductDetail, enableTempOrderSync = false, enableTempOrderPersist = false, syncDetailOnOrderChange = false, isActive = true, preserveProductCatalogOnInactiveCustomerClear = false, enableGlobalScanListener = false, promotionScanSuccessMessageKey, promotionItemIncreaseMessageKey, defaultProductLoadParams, children }) => {
 	var _context$appHelper, _osKey$replace;
 	const context = require_useEngineContext.default();
 	const utils = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {};
@@ -234,17 +234,7 @@ const SalesSdkProvider = ({ osKey, solution = "bookingTicket", moduleAccess = "e
 		engineChannel: channel,
 		platform: otherParams === null || otherParams === void 0 ? void 0 : otherParams.platform
 	});
-	const shouldEnableCustomerAuthModule = (0, react.useMemo)(() => [
-		otherParams === null || otherParams === void 0 ? void 0 : otherParams.platform,
-		otherParams === null || otherParams === void 0 ? void 0 : otherParams.channel,
-		channel,
-		productLoadChannel
-	].some((value) => String(value || "").trim().toLowerCase() === "kiosk"), [
-		channel,
-		otherParams === null || otherParams === void 0 ? void 0 : otherParams.channel,
-		otherParams === null || otherParams === void 0 ? void 0 : otherParams.platform,
-		productLoadChannel
-	]);
+	const shouldEnableCustomerAuthModule = deferHolderAuthOnClose;
 	const [promotionScanItemIncreaseRevision, setPromotionScanItemIncreaseRevision] = (0, react.useState)(0);
 	/** 加车 enrich 早于 BookingEdit 抽屉，须提前注入 HTTP 客户端供跨日报价等 serve 使用 */
 	(0, react.useEffect)(() => {
@@ -1338,6 +1328,7 @@ const SalesSdkProvider = ({ osKey, solution = "bookingTicket", moduleAccess = "e
 		isActive,
 		preserveCatalogOnInactiveCustomerClear: preserveProductCatalogOnInactiveCustomerClear
 	}, /* @__PURE__ */ react.default.createElement(require_SalesSdkSummaryContext.SalesSdkSummaryProvider, { ref: summaryProviderRef }, /* @__PURE__ */ react.default.createElement(require_SalesSdkCartContext.SalesSdkCartProvider, {
+		deferHolderAuthOnClose,
 		shouldMergeProductLines,
 		mergeBookingLinesForDisplay
 	}, /* @__PURE__ */ react.default.createElement(require_SalesSdkGlobalScanSubscriber.default, {

package/lib/plus/salesSdk/hosts/ConfirmHolderHostRenderer.js

@@ -1,6 +1,7 @@
 const require_runtime = require("../../../_virtual/_rolldown/runtime.js");
 const require_asyncToGenerator = require("../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js");
 const require_SalesSdkHostBridgesContext = require("../context/SalesSdkHostBridgesContext.js");
+const require_productHolderConfig = require("../utils/productHolderConfig.js");
 const require_SalesSdkHolderContext = require("../context/SalesSdkHolderContext.js");
 const require_SalesSdkUIHostsContext = require("../context/SalesSdkUIHostsContext.js");
 const require_assignHolderToCartLine = require("../utils/assignHolderToCartLine.js");
@@ -30,14 +31,16 @@ const ConfirmHolderHostRenderer = () => {
 	const ctx = pending === null || pending === void 0 ? void 0 : pending.ctx;
 	const open = Boolean((pending === null || pending === void 0 ? void 0 : pending.open) && ctx);
 	const snapshotLineKeys = (_ctx$snapshotLineKeys = ctx === null || ctx === void 0 ? void 0 : ctx.snapshotLineKeys) !== null && _ctx$snapshotLineKeys !== void 0 ? _ctx$snapshotLineKeys : [];
-	const liveUnassignedCount = (0, react.useMemo)(() => {
-		if (!open || !bookingTicket) return 0;
-		return require_holderSubmitValidation.calculateUnassignedHolderCount(require_holderSubmitValidation.collectUnassignedHolderLines(bookingTicket));
+	const liveUnassignedLines = (0, react.useMemo)(() => {
+		if (!open || !bookingTicket) return [];
+		return require_holderSubmitValidation.collectUnassignedHolderLines(bookingTicket);
 	}, [
 		bookingTicket,
 		open,
 		refreshKey
 	]);
+	const liveUnassignedCount = (0, react.useMemo)(() => require_holderSubmitValidation.calculateUnassignedHolderCount(liveUnassignedLines), [liveUnassignedLines]);
+	const canSkip = liveUnassignedLines.length > 0 && !liveUnassignedLines.some((line) => require_productHolderConfig.isProductHolderRequired(line.cacheItem));
 	const lines = (0, react.useMemo)(() => {
 		if (!open || !bookingTicket || !snapshotLineKeys.length) return [];
 		return require_holderSubmitValidation.buildHolderConfirmDisplayLines({
@@ -87,8 +90,14 @@ const ConfirmHolderHostRenderer = () => {
 		holderConfirm.complete();
 	}, [holderConfirm, liveUnassignedCount]);
 	const handleSkip = (0, react.useCallback)(() => {
+		if (!canSkip) {
+			(0, _pisell_materials.PisellToast)({ content: _pisell_utils.locales.getText("pisell2.text.press-card-assign-holder") });
+			setRefreshKey((key) => key + 1);
+			holderConfirm.refresh();
+			return;
+		}
 		holderConfirm.complete();
-	}, [holderConfirm]);
+	}, [canSkip, holderConfirm]);
 	const handleDismissConfirmed = (0, react.useCallback)(() => {
 		holderConfirm.cancel();
 	}, [holderConfirm]);
@@ -97,7 +106,7 @@ const ConfirmHolderHostRenderer = () => {
 		open,
 		lines,
 		liveUnassignedCount,
-		bookingConfig: ctx.bookingConfig,
+		canSkip,
 		onAssign: handleAssign,
 		onConfirm: handleConfirm,
 		onSkip: handleSkip,

package/lib/plus/salesSdk/normalProductDetail/NormalProductDetailHostRenderer.js

@@ -220,6 +220,7 @@ const NormalProductDetailHostRenderer = ({ defaultSkuDetailConfig }) => {
 			var _ref17 = require_asyncToGenerator._asyncToGenerator(function* () {
 				var _bookingTicket$getBoo3, _bookingTicket$getBoo4;
 				const payload = capturedPending.payload;
+				const deferHolderUntilSubmit = payload.mode === "create" ? payload.requiresDetailPayload.deferHolderUntilSubmit === true : payload.mode === "booking-create" ? payload.requiresBookingEditPayload.deferHolderUntilSubmit === true : false;
 				let openArgs;
 				let bookingConfig = (_bookingTicket$getBoo3 = bookingTicket === null || bookingTicket === void 0 || (_bookingTicket$getBoo4 = bookingTicket.getBookingConfig) === null || _bookingTicket$getBoo4 === void 0 ? void 0 : _bookingTicket$getBoo4.call(bookingTicket)) !== null && _bookingTicket$getBoo3 !== void 0 ? _bookingTicket$getBoo3 : null;
 				let bookingState = null;
@@ -336,7 +337,8 @@ const NormalProductDetailHostRenderer = ({ defaultSkuDetailConfig }) => {
 				const refreshHolderContextFromHydratedProduct = function() {
 					var _ref6 = require_asyncToGenerator._asyncToGenerator(function* ({ productData }) {
 						holderSource = productData;
-						try {
+						if (deferHolderUntilSubmit) holderOptions = getHolderOptionsForSource(productData);
+						else try {
 							holderOptions = yield ensureHolderOptionsForSource(productData);
 						} catch (error) {
 							console.warn("[SalesSdk] 水合后 Holder 字典加载失败，沿用当前分源缓存", error);
@@ -350,7 +352,7 @@ const NormalProductDetailHostRenderer = ({ defaultSkuDetailConfig }) => {
 						} catch (error) {
 							console.warn("[SalesSdk] 水合后预约配置加载失败，沿用当前 isFranchisee", error);
 						}
-						if (bookingState) bookingState = require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, bookingState), {}, {
+						if (bookingState) bookingState = require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, bookingState), deferHolderUntilSubmit ? { deferHolderUntilSubmit: true } : {}), {}, {
 							isFranchisee: hydratedIsFranchisee,
 							otherParams: hydratedOtherParams,
 							pet: require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, bookingState.pet || {}), {}, { holders: holderOptions })
@@ -571,6 +573,7 @@ const NormalProductDetailHostRenderer = ({ defaultSkuDetailConfig }) => {
 					};
 				}
 				if (!isCurrentPending()) return;
+				if (bookingState && deferHolderUntilSubmit) bookingState = require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, bookingState), {}, { deferHolderUntilSubmit: true });
 				setPreparedOpen({
 					pending: capturedPending,
 					openArgs,

package/lib/plus/salesSdk/types.d.ts

@@ -1324,6 +1324,8 @@ interface SalesSdkAddProductRequiresDetailPayload {
   initialQuantity?: number;
   /** @internal 本次详情 Flow 的 Holder 初始选择。 */
   initialHolderIds?: Array<number | string>;
+  /** @internal 登录被关闭后，仅把 Holder 必填延后到提交前校验。 */
+  deferHolderUntilSubmit?: boolean;
 }
 /**
  * `requiresBookingEdit` 时 UI 打开资源 / 时间编辑抽屉所需 payload。
@@ -1334,6 +1336,8 @@ interface SalesSdkRequiresBookingEditPayload {
   date: string | null;
   /** @internal 仅供加车前 Selection Flow 初始化 Holder 草稿。 */
   initialHolderIds?: Array<number | string>;
+  /** @internal 登录被关闭后，仅把 Holder 必填延后到提交前校验。 */
+  deferHolderUntilSubmit?: boolean;
   /**
    * 已加车行「编辑资源」：强制打开抽屉，忽略 cacheItem.autoClose。
    * 加车链路（requiresBookingEdit）不传此字段；autoClose=true 时自动 confirm 跳过抽屉。
@@ -1529,7 +1533,8 @@ interface SalesSdkConfirmDetailInput {
     quantity?: number;
     notShowToast?: boolean; /** Holder 弹窗的初始选中项；最终仍以用户确认结果为准 */
     initialHolderIds?: Array<number | string>; /** 跨日弹窗确认后的区间（规格弹窗之后注入） */
-    multiDayRange?: SalesSdkMultiDaySelectResult;
+    multiDayRange?: SalesSdkMultiDaySelectResult; /** @internal 当前确认延后 Holder 到提交前补录。 */
+    deferHolderUntilSubmit?: boolean;
   };
 }
 /**
@@ -1639,6 +1644,11 @@ interface SalesSdkAddProductWithFlowOptions {
    * @internal 由 createAddProductWithFlowDebounced 注入，业务调用方勿传。
    */
   preparedCacheItem?: any;
+  /**
+   * 当前商品 Flow 已关闭登录；详情/加购阶段延后 Holder，提交前仍按原配置校验。
+   * @internal 由 Kiosk 模板登录门禁注入，业务调用方勿传。
+   */
+  deferHolderUntilSubmit?: boolean;
 }
 /**
  * 资源不可用原因（与 OS `BookingContext.ResourceUnavailableReason` 一比一对齐）。
@@ -1701,6 +1711,11 @@ interface SalesSdkProviderProps {
   autoInitBookingContext?: boolean;
   /** 透传给 OS 注册时的 otherParams（platform / type / channel / dineInConfig 等） */
   otherParams?: Record<string, any>;
+  /**
+   * Kiosk 模板专用：用户关闭商品 Holder 登录后继续详情/加购，并延后到提交前补录。
+   * @internal 由 BigSale 根据 resolvedTemplate 注入。
+   */
+  deferHolderAuthOnClose?: boolean;
   /**
    * 运行时商品行合并策略；返回 false 时快速加购不做防抖合并，OS 始终新增商品行，
    * 预约商品也保持独立展示。默认合并。

package/lib/plus/salesSdk/utils/customerAuthGate.js

@@ -14,15 +14,12 @@ function isTruthyRequired(value) {
 function normalizeText(value) {
 	return value == null ? "" : String(value).trim().toLowerCase();
 }
-function isKioskRuntime(params) {
-	return normalizeText(params.platform) === "kiosk" || normalizeText(params.channel) === "kiosk";
-}
 function isHolderRequiredProduct(product) {
 	const holderConfig = product === null || product === void 0 ? void 0 : product.holder_config;
 	return normalizeText(holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.status) === "enable" && isTruthyRequired(holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.required);
 }
 function shouldPromptCustomerAuthForProduct(params) {
-	return isKioskRuntime(params) && isHolderRequiredProduct(params.product) && !isValidOrderCustomerId(params.currentCustomerId);
+	return params.enabled === true && isHolderRequiredProduct(params.product) && !isValidOrderCustomerId(params.currentCustomerId);
 }
 function normalizeCustomerAuthCustomer(value) {
 	if (!value || typeof value !== "object") return null;

package/lib/plus/salesSdk/utils/enrichCacheItemBeforeAdd.js

@@ -20,7 +20,7 @@ function _enrichCacheItemBeforeAdd() {
 		const customerId = require_buildBookingEditDrawerState.resolveAddFlowCustomerId(input.tempOrder, input.customerId);
 		const holderSource = (_input$catalogItem2 = input.catalogItem) !== null && _input$catalogItem2 !== void 0 ? _input$catalogItem2 : cacheItem;
 		const effectiveHolderConfig = require_productHolderConfig.resolveEffectiveHolderConfig(holderSource, input.bookingConfig);
-		if (require_shouldPromptHolderOnAddCart.shouldPromptHolderOnAddCart({
+		if (!input.deferHolderUntilSubmit && require_shouldPromptHolderOnAddCart.shouldPromptHolderOnAddCart({
 			cacheItem,
 			bookingConfig: input.bookingConfig,
 			productSource: holderSource,

package/lib/plus/salesSdk/utils/ensureCustomerAuthBeforeAdd.js

@@ -6,10 +6,10 @@ function ensureCustomerAuthBeforeAdd(_x) {
 }
 function _ensureCustomerAuthBeforeAdd() {
 	_ensureCustomerAuthBeforeAdd = require_asyncToGenerator._asyncToGenerator(function* (params) {
-		if (!require_customerAuthGate.shouldPromptCustomerAuthForProduct(params)) return true;
+		if (!require_customerAuthGate.shouldPromptCustomerAuthForProduct(params)) return { status: "ready" };
 		if (!params.openCustomerAuth) {
 			console.warn("[SalesSdk] Kiosk holder-required product needs customer auth, but openCustomerAuth is unavailable");
-			return false;
+			return { status: "fallback" };
 		}
 		try {
 			const result = yield params.openCustomerAuth({
@@ -17,16 +17,16 @@ function _ensureCustomerAuthBeforeAdd() {
 				product: params.product,
 				currentCustomerId: params.currentCustomerId
 			});
-			if (!(result === null || result === void 0 ? void 0 : result.customer)) return false;
+			if (!(result === null || result === void 0 ? void 0 : result.customer)) return { status: "deferred" };
 			if (typeof params.setOrderCustomer !== "function") {
 				console.warn("[SalesSdk] Customer auth succeeded, but setOrderCustomer is unavailable");
-				return false;
+				return { status: "fallback" };
 			}
 			yield params.setOrderCustomer(result.customer);
-			return true;
+			return { status: "ready" };
 		} catch (error) {
 			console.warn("[SalesSdk] Customer auth before add failed", error);
-			return false;
+			return { status: "fallback" };
 		}
 	});
 	return _ensureCustomerAuthBeforeAdd.apply(this, arguments);

package/lib/plus/salesSdk/utils/holderSubmitValidation.js

@@ -104,9 +104,8 @@ function collectUnassignedHolderLines(bookingTicket) {
 		const orderLine = (_bookingView$_extend = bookingView._extend) === null || _bookingView$_extend === void 0 ? void 0 : _bookingView$_extend.product;
 		if (!orderLine) return;
 		const sourceProduct = (_catalog$find = catalog.find((p) => String(p.id) === String(orderLine.product_id))) !== null && _catalog$find !== void 0 ? _catalog$find : null;
-		const holderSource = (_ref = sourceProduct !== null && sourceProduct !== void 0 ? sourceProduct : orderLine) !== null && _ref !== void 0 ? _ref : bookingView;
-		const effectiveHolderConfig = require_productHolderConfig.resolveEffectiveHolderConfig(holderSource, bookingConfig);
-		if (!(effectiveHolderConfig.source === "product" ? effectiveHolderConfig.required : effectiveHolderConfig.enabled)) return;
+		const effectiveHolderConfig = require_productHolderConfig.resolveEffectiveHolderConfig((_ref = sourceProduct !== null && sourceProduct !== void 0 ? sourceProduct : orderLine) !== null && _ref !== void 0 ? _ref : bookingView, bookingConfig);
+		if (!effectiveHolderConfig.enabled) return;
 		const cacheItem = buildCacheItemFromOrderLine({
 			product: orderLine,
 			booking: bookingView,
@@ -115,7 +114,7 @@ function collectUnassignedHolderLines(bookingTicket) {
 		if (require_utils.isNormalProductByDurationSchedule(cacheItem)) return;
 		if (hasHolderAssigned(cacheItem)) return;
 		rawLines.push({
-			cacheItem: require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, cacheItem), require_productHolderConfig.isProductHolderRequired(cacheItem) ? {} : { holder_config: holderSource === null || holderSource === void 0 ? void 0 : holderSource.holder_config }),
+			cacheItem: require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, cacheItem), require_productHolderConfig.isProductHolderRequired(cacheItem) ? {} : { holder_config: effectiveHolderConfig.raw }),
 			booking: bookingView,
 			orderLine
 		});

package/lib/plus/salesSdk/utils/productHolderConfig.js

@@ -30,26 +30,12 @@ function resolveProductHolderConfig(source) {
 	}, formId !== void 0 && formId !== null && formId !== "" ? { formId } : {}), {}, { raw });
 }
 /**
-* 统一解析 Holder 配置：商品只要明确携带 holder_config（包括 disable），
-* 就完全以商品级配置为准；只有商品没有该字段时才回退旧 appointment_subject。
-*
-* 这样既允许新商品单独关闭店铺级 Holder，也能继续兼容尚未迁移的旧预约商品。
+* 统一解析 Holder 配置：保留旧函数签名以减少调用方改动，
+* 启用与必填判断不再回退 bookingConfig。
 */
-function resolveEffectiveHolderConfig(source, bookingConfig) {
-	var _bookingConfig$config;
+function resolveEffectiveHolderConfig(source, _bookingConfig) {
 	const productConfig = resolveProductHolderConfig(source);
 	if (productConfig.raw) return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, productConfig), {}, { source: "product" });
-	const basicConfig = bookingConfig === null || bookingConfig === void 0 || (_bookingConfig$config = bookingConfig.config) === null || _bookingConfig$config === void 0 ? void 0 : _bookingConfig$config.basic;
-	const appointmentSubject = basicConfig === null || basicConfig === void 0 ? void 0 : basicConfig.appointment_subject;
-	const legacyEnabled = (appointmentSubject === null || appointmentSubject === void 0 ? void 0 : appointmentSubject.type) === "form" && (appointmentSubject === null || appointmentSubject === void 0 ? void 0 : appointmentSubject.show_hold_on_add_cart) !== 0;
-	const legacyFormId = appointmentSubject === null || appointmentSubject === void 0 ? void 0 : appointmentSubject.form_id;
-	if (appointmentSubject) return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({
-		enabled: legacyEnabled,
-		required: legacyEnabled && (basicConfig === null || basicConfig === void 0 ? void 0 : basicConfig.subject_require) === "require"
-	}, legacyFormId !== void 0 && legacyFormId !== null && legacyFormId !== "" ? { formId: legacyFormId } : {}), {}, {
-		raw: null,
-		source: "legacy"
-	});
 	return {
 		enabled: false,
 		required: false,

package/lib/plus/salesSdk/utils/runAddProductFlow.js

@@ -42,7 +42,8 @@ function _openBookingEditAfterEnrich() {
 				cacheItem,
 				catalogProduct: catalogProduct !== null && catalogProduct !== void 0 ? catalogProduct : payload.catalogProduct,
 				customerId: drawerCustomerId,
-				initialHolderIds: flowOptions.initialHolderIds
+				initialHolderIds: flowOptions.initialHolderIds,
+				deferHolderUntilSubmit: flowOptions.deferHolderUntilSubmit
 			}));
 			if (selectionResult.status === "cancelled") return { status: "cancelled" };
 			if (selectionResult.status === "committed") {
@@ -65,6 +66,7 @@ function _openBookingEditAfterEnrich() {
 						customerId: (_flowOptions$customer2 = flowOptions.customerId) !== null && _flowOptions$customer2 !== void 0 ? _flowOptions$customer2 : payload.customerId,
 						initialHolderIds: flowOptions.initialHolderIds,
 						holderOptions: flowOptions.holderOptions,
+						deferHolderUntilSubmit: flowOptions.deferHolderUntilSubmit,
 						date: payload.date,
 						locale: flowOptions.locale,
 						mode: "drawer"
@@ -104,6 +106,7 @@ function _openBookingEditAfterEnrich() {
 			customerId: (_flowOptions$customer3 = flowOptions.customerId) !== null && _flowOptions$customer3 !== void 0 ? _flowOptions$customer3 : payload.customerId,
 			initialHolderIds: flowOptions.initialHolderIds,
 			holderOptions: flowOptions.holderOptions,
+			deferHolderUntilSubmit: flowOptions.deferHolderUntilSubmit,
 			date: payload.date,
 			locale: flowOptions.locale,
 			mode: "drawer"
@@ -112,12 +115,16 @@ function _openBookingEditAfterEnrich() {
 		const openEdit = hosts === null || hosts === void 0 ? void 0 : hosts.openBookingEdit;
 		if (!openEdit) return {
 			status: "requiresBookingEdit",
-			payload: require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, payload), {}, { cacheItem: enriched.cacheItem })
+			payload: require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, payload), {}, {
+				cacheItem: enriched.cacheItem,
+				deferHolderUntilSubmit: flowOptions.deferHolderUntilSubmit
+			})
 		};
 		const edited = yield openEdit(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, payload), {}, {
 			cacheItem: enriched.cacheItem,
 			catalogProduct: catalogProduct !== null && catalogProduct !== void 0 ? catalogProduct : payload.catalogProduct,
-			customerId: drawerCustomerId
+			customerId: drawerCustomerId,
+			deferHolderUntilSubmit: flowOptions.deferHolderUntilSubmit
 		}));
 		if (!edited) return { status: "cancelled" };
 		const { products } = yield cart.confirmBookingEdit({
@@ -151,7 +158,8 @@ function _runAddProductFlow() {
 			if (!openDetail) return result;
 			const detailResult = yield openDetail(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, result.payload), {}, {
 				initialQuantity: (_flowOptions$quantity = flowOptions.quantity) !== null && _flowOptions$quantity !== void 0 ? _flowOptions$quantity : result.payload.initialQuantity,
-				initialHolderIds: (_flowOptions$initialH = flowOptions.initialHolderIds) !== null && _flowOptions$initialH !== void 0 ? _flowOptions$initialH : result.payload.initialHolderIds
+				initialHolderIds: (_flowOptions$initialH = flowOptions.initialHolderIds) !== null && _flowOptions$initialH !== void 0 ? _flowOptions$initialH : result.payload.initialHolderIds,
+				deferHolderUntilSubmit: flowOptions.deferHolderUntilSubmit
 			}));
 			if (!detailResult) return { status: "cancelled" };
 			if (detailResult._committedProducts) {
@@ -191,7 +199,8 @@ function _runAddProductFlow() {
 						options: flowOptions
 					}),
 					initialHolderIds: flowOptions.initialHolderIds,
-					multiDayRange: multiDayRange || void 0
+					multiDayRange: multiDayRange || void 0,
+					deferHolderUntilSubmit: flowOptions.deferHolderUntilSubmit
 				}
 			};
 			result = yield cart.confirmDetail(confirmInput);

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

@@ -64,7 +64,8 @@ const HolderFlowModuleComponent = ({ context, module, registerHandle }) => {
 	const holderIds = context.draft.booking.holderIds;
 	const quantity = context.draft.quantity || 1;
 	const bookingState = context.hostContext;
-	const required = resolveFlowHolderConfig(productData, bookingState).required;
+	const deferHolderUntilSubmit = (bookingState === null || bookingState === void 0 ? void 0 : bookingState.deferHolderUntilSubmit) === true;
+	const required = resolveFlowHolderConfig(productData, bookingState).required && !deferHolderUntilSubmit;
 	const unsupportedReason = require_utils.isMultiDayProduct(productData) ? void 0 : require_index.getUnsupportedBookingFlowReason(productData);
 	const customerId = getCustomerId(bookingState);
 	const [hostError, setHostError] = (0, react.useState)(null);
@@ -170,9 +171,11 @@ const holderFlowModule = {
 		"booking.customerId"
 	],
 	isApplicable: (context) => {
+		var _context$hostContext;
 		const productData = context.draft.productData;
 		if (require_utils$1.isNormalProductByDurationSchedule(productData)) return false;
 		if (!resolveFlowHolderConfig(productData, context.hostContext).enabled) return false;
+		if (((_context$hostContext = context.hostContext) === null || _context$hostContext === void 0 ? void 0 : _context$hostContext.deferHolderUntilSubmit) === true) return false;
 		if (!context.hostContext) return true;
 		return !require_utils$2.isWalkIn(getCustomerId(context.hostContext));
 	},

package/package.json

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