@pisell/private-materials 6.12.356 → 6.12.358

package/es/utils/buildCartHolderParams.js

@@ -0,0 +1,169 @@
+import { _objectSpread2 } from "../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
+import { isHolderConfigEnabled, isHolderConfigRequired } from "./holderConfig.js";
+import { getCustomer } from "../components/appointmentBooking/utils.js";
+//#region src/utils/buildCartHolderParams.ts
+const toHolderRecordId = (value) => {
+	if (value == null || value === "") return void 0;
+	const id = Number(value);
+	return Number.isNaN(id) ? void 0 : id;
+};
+/**
+* 从 _origin.holder 解析 form_record_id。
+* form_record 可能是 number、number[]；不能假定一定是数组下标 [0]。
+*/
+const resolveOriginHolderId = (holder) => {
+	const formRecord = holder === null || holder === void 0 ? void 0 : holder.form_record;
+	if (Array.isArray(formRecord)) for (const value of formRecord) {
+		const id = toHolderRecordId(value);
+		if (id != null) return id;
+	}
+	else {
+		const id = toHolderRecordId(formRecord);
+		if (id != null) return id;
+	}
+	return toHolderRecordId(holder === null || holder === void 0 ? void 0 : holder.form_record_id);
+};
+/**
+* 从购物车行解析当前选中的 holder form_record_id。
+*
+* venueBooking：以 _origin.holder 为准（SDK 会原地更新 form_record）；
+* 顶层 item.holder_id 可能是上一轮 UI 注入或 SDK 回灌的滞后值，不能优先于 _origin.holder。
+*/
+const resolveCartItemHolderId = (item) => {
+	var _item$_origin;
+	const originHolder = item === null || item === void 0 || (_item$_origin = item._origin) === null || _item$_origin === void 0 ? void 0 : _item$_origin.holder;
+	if (originHolder && typeof originHolder === "object") return resolveOriginHolderId(originHolder);
+	return toHolderRecordId(item === null || item === void 0 ? void 0 : item.holder_id);
+};
+const getCurrentCustomerId = (utils) => {
+	var _getCustomer;
+	return (_getCustomer = getCustomer(utils)) === null || _getCustomer === void 0 ? void 0 : _getCustomer.id;
+};
+const createCartHolderOption = (holder, customerId) => {
+	const _id = (holder === null || holder === void 0 ? void 0 : holder.formRecordId) || (holder === null || holder === void 0 ? void 0 : holder.form_record_id);
+	return {
+		key: _id,
+		id: _id,
+		label: holder === null || holder === void 0 ? void 0 : holder.main_field,
+		name: holder === null || holder === void 0 ? void 0 : holder.main_field,
+		username: holder === null || holder === void 0 ? void 0 : holder.main_field,
+		type: "holder",
+		_origin: _objectSpread2(_objectSpread2({}, holder), {}, {
+			form_record_id: _id,
+			customer_id: customerId
+		})
+	};
+};
+/**
+* 构建 ProductCard Holder 组件使用的单条 holder 数据。
+* 输出字段需要与购物车 ProductCard 消费格式保持一致。
+*/
+const buildCartHolderOption = (holder, utils) => {
+	if (!holder) return {};
+	return createCartHolderOption(holder, getCurrentCustomerId(utils));
+};
+const buildCartHolderOptions = (records, utils) => {
+	const customerId = getCurrentCustomerId(utils);
+	return records.map((record) => createCartHolderOption(record, customerId));
+};
+const getCartHolderTitle = (records, holderId) => {
+	var _records$find;
+	if (!holderId) return "";
+	return (_records$find = records.find((record) => Number(record === null || record === void 0 ? void 0 : record.form_record_id) === holderId)) === null || _records$find === void 0 ? void 0 : _records$find.main_field;
+};
+/**
+* 根据 holderMap 与购物车行数据，构建 ProductCard 所需的 holder 展示字段。
+* 供 appointmentBooking、venueBooking 等购物车场景复用。
+*/
+const buildCartHolderParams = ({ item, holderConfig = {}, formData, translation, enabled = true, utils }) => {
+	var _formData$form;
+	if (!enabled || !isHolderConfigEnabled(holderConfig)) return {
+		isShowChangeHolder: false,
+		isErrorHolder: false,
+		holders: []
+	};
+	const records = (formData === null || formData === void 0 ? void 0 : formData.records) || [];
+	const holderId = resolveCartItemHolderId(item);
+	return {
+		holder_id: holderId,
+		isErrorHolder: !!(!holderId && isHolderConfigRequired(holderConfig)),
+		isShowChangeHolder: true,
+		addHolderButtonText: translation(formData === null || formData === void 0 || (_formData$form = formData.form) === null || _formData$form === void 0 || (_formData$form = _formData$form.form) === null || _formData$form === void 0 || (_formData$form = _formData$form.setting) === null || _formData$form === void 0 ? void 0 : _formData$form.title),
+		holder_title: getCartHolderTitle(records, holderId),
+		holders: buildCartHolderOptions(records, utils)
+	};
+};
+/**
+* 从 appointmentBooking 购物车行读取 holder_config
+*/
+const getAppointmentCartHolderConfig = (item) => {
+	var _item$_productInit;
+	return (item === null || item === void 0 || (_item$_productInit = item._productInit) === null || _item$_productInit === void 0 ? void 0 : _item$_productInit.holder_config) || {};
+};
+/**
+* 从 venueBooking 购物车行读取 holder_config
+*/
+const getVenueCartHolderConfig = (item) => {
+	var _item$_origin2;
+	return (item === null || item === void 0 || (_item$_origin2 = item._origin) === null || _item$_origin2 === void 0 || (_item$_origin2 = _item$_origin2.product) === null || _item$_origin2 === void 0 ? void 0 : _item$_origin2.holder_config) || {};
+};
+/**
+* 校验购物车中 holder_config.required 的行是否已选择 holder。
+*/
+const validateRequiredCartHolders = ({ items = [], getHolderConfig = getVenueCartHolderConfig }) => {
+	const invalidItems = items.filter((item) => {
+		if (!isHolderConfigRequired(getHolderConfig(item))) return false;
+		return !resolveCartItemHolderId(item);
+	});
+	return {
+		hasError: invalidItems.length > 0,
+		invalidItems
+	};
+};
+/**
+* 从 holderMap 解析 minors 表单关联的 sku 关系表单 ID（form_to_form 隐藏字段的 linkedTable）。
+*/
+const getSkuRelationFormId = (holderMap, formId) => {
+	var _formData$form2, _formData$form3, _detail$setting;
+	if (!formId) return 0;
+	const formData = holderMap === null || holderMap === void 0 ? void 0 : holderMap[formId];
+	if ((formData === null || formData === void 0 || (_formData$form2 = formData.form) === null || _formData$form2 === void 0 || (_formData$form2 = _formData$form2.form) === null || _formData$form2 === void 0 ? void 0 : _formData$form2.form_type) !== "minors") return 0;
+	const detail = formData === null || formData === void 0 || (_formData$form3 = formData.form) === null || _formData$form3 === void 0 || (_formData$form3 = _formData$form3.field) === null || _formData$form3 === void 0 ? void 0 : _formData$form3.find((item) => (item === null || item === void 0 ? void 0 : item.filed_type) === "form_to_form" && (item === null || item === void 0 ? void 0 : item.status) === "hide");
+	return (detail === null || detail === void 0 || (_detail$setting = detail.setting) === null || _detail$setting === void 0 ? void 0 : _detail$setting.linkedTable) || 0;
+};
+/**
+* 从 form_to_form_value 中取最新创建的 form_record_id。
+*/
+const getSkuRelationFormRecordId = (res) => {
+	var _res$values;
+	const formToFormValue = res === null || res === void 0 || (_res$values = res.values) === null || _res$values === void 0 || (_res$values = _res$values.form_to_form_value) === null || _res$values === void 0 ? void 0 : _res$values[0];
+	const formDataValue = (formToFormValue === null || formToFormValue === void 0 ? void 0 : formToFormValue.form_data_value) || [];
+	return formDataValue[formDataValue.length - 1];
+};
+/**
+* 处理购物车添加 holder 表单提交成功后的公共逻辑。
+* - minors 关联表单：刷新 holder 列表，取 form_to_form_value 中的 record id
+* - 普通表单：appendFormRecord 并直接使用 form_record_id
+*/
+const handleCartHolderFormSuccess = ({ res, formId, skuRelationFormId, utils, module }) => {
+	var _res$values2, _res$values3, _res$values4;
+	let formRecordId = res === null || res === void 0 || (_res$values2 = res.values) === null || _res$values2 === void 0 ? void 0 : _res$values2.form_record_id;
+	let resolvedFormId = res === null || res === void 0 || (_res$values3 = res.values) === null || _res$values3 === void 0 ? void 0 : _res$values3.form_id;
+	if (formId && skuRelationFormId) {
+		var _module$refreshAllHol;
+		const customer = getCustomer(utils);
+		module === null || module === void 0 || (_module$refreshAllHol = module.refreshAllHolderFormRecords) === null || _module$refreshAllHol === void 0 || _module$refreshAllHol.call(module, { customer_id: customer === null || customer === void 0 ? void 0 : customer.id });
+		formRecordId = getSkuRelationFormRecordId(res);
+		resolvedFormId = formId;
+	} else if (formId) {
+		var _module$appendFormRec;
+		module === null || module === void 0 || (_module$appendFormRec = module.appendFormRecord) === null || _module$appendFormRec === void 0 || _module$appendFormRec.call(module, { record: res === null || res === void 0 ? void 0 : res.values });
+	}
+	return {
+		formRecordId,
+		mainField: res === null || res === void 0 || (_res$values4 = res.values) === null || _res$values4 === void 0 ? void 0 : _res$values4.main_field,
+		formId: resolvedFormId
+	};
+};
+//#endregion
+export { buildCartHolderOption, buildCartHolderParams, getAppointmentCartHolderConfig, getSkuRelationFormId, getVenueCartHolderConfig, handleCartHolderFormSuccess, validateRequiredCartHolders };

package/es/utils/holderConfig.js

@@ -0,0 +1,6 @@
+//#region src/utils/holderConfig.ts
+/** Holder selection requires an enabled configuration and a valid form ID. */
+const isHolderConfigEnabled = (config) => (config === null || config === void 0 ? void 0 : config.status) === "enable" && Number.isFinite(Number(config === null || config === void 0 ? void 0 : config.resource_id)) && Number(config === null || config === void 0 ? void 0 : config.resource_id) > 0;
+const isHolderConfigRequired = (config) => isHolderConfigEnabled(config) && Number(config === null || config === void 0 ? void 0 : config.required) === 1;
+//#endregion
+export { isHolderConfigEnabled, isHolderConfigRequired };

package/lib/components/appointmentBooking/components/Cart/Item/index.js

@@ -2,6 +2,7 @@ const require_runtime = require("../../../../../_virtual/_rolldown/runtime.js");
 const require_objectSpread2 = require("../../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js");
 const require_asyncToGenerator = require("../../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js");
 const require_index = require("../../../../shoppingCart/index.js");
+const require_holderConfig = require("../../../../../utils/holderConfig.js");
 const require_utils = require("../../../utils.js");
 const require_index$1 = require("../../../../subTotal/index.js");
 const require_hooks = require("../../../hooks.js");
@@ -10,6 +11,7 @@ const require_index$2 = require("../../Deposit/index.js");
 const require_utils$1 = require("../utils.js");
 const require_index$3 = require("../ContinueButton/index.js");
 const require_index$4 = require("../../Voucher/index.js");
+const require_buildCartHolderParams = require("../../../../../utils/buildCartHolderParams.js");
 let react = require("react");
 react = require_runtime.__toESM(react);
 let _pisell_utils = require("@pisell/utils");
@@ -23,9 +25,29 @@ const CartItem = ({ onNext, renderContactInfo }) => {
 	const { getResourceList } = require_hooks.useAppointmentBookingResource();
 	const { isFormSubject, bookingSubject, isRetailTemplate } = require_hooks.useAppointmentBookingSetting();
 	const { isLogin } = require_hooks.useAppointmentBookingLogin();
+	const isLoggedIn = isLogin();
 	const utils = require_hooks.contextUtils();
-	const { businessUtils, translation } = utils;
+	const { businessUtils, translation, pisellos } = utils;
 	const { taxTitle, totalTaxFee, isPriceIncludeTax, total, deposit } = summary;
+	const [holderMap, setHolderMap] = (0, react.useState)({});
+	(0, react.useEffect)(() => {
+		var _pisellos$effects;
+		const onHolderChanged = (res) => {
+			if ((res === null || res === void 0 ? void 0 : res.path) === "holderMap") {
+				var _appointmentBooking$g;
+				setHolderMap((appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$g = appointmentBooking.getHolderFormMap) === null || _appointmentBooking$g === void 0 ? void 0 : _appointmentBooking$g.call(appointmentBooking)) || {});
+			}
+		};
+		pisellos === null || pisellos === void 0 || (_pisellos$effects = pisellos.effects) === null || _pisellos$effects === void 0 || _pisellos$effects.on("appointmentBooking_holder:changed", onHolderChanged);
+		return () => {
+			var _pisellos$effects2;
+			pisellos === null || pisellos === void 0 || (_pisellos$effects2 = pisellos.effects) === null || _pisellos$effects2 === void 0 || _pisellos$effects2.off("appointmentBooking_holder:changed", onHolderChanged);
+		};
+	}, [appointmentBooking, pisellos]);
+	(0, react.useEffect)(() => {
+		var _appointmentBooking$g2;
+		setHolderMap((appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$g2 = appointmentBooking.getHolderFormMap) === null || _appointmentBooking$g2 === void 0 ? void 0 : _appointmentBooking$g2.call(appointmentBooking)) || {});
+	}, [appointmentBooking, isLoggedIn]);
 	/**
 	* @title: 当前客户
 	* @description:
@@ -80,14 +102,35 @@ const CartItem = ({ onNext, renderContactInfo }) => {
 		}
 		if (type === "add_holder") {
 			const relationShipFormId = bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.relationship_form_id;
+			const holderConfig = require_buildCartHolderParams.getAppointmentCartHolderConfig(e);
+			const formId = require_holderConfig.isHolderConfigEnabled(holderConfig) ? holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.resource_id : void 0;
+			const skuRelationFormId = require_buildCartHolderParams.getSkuRelationFormId(holderMap, formId);
 			return require_utils.openForm({
-				form_id: relationShipFormId || (bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.form_id),
+				form_id: skuRelationFormId || formId || relationShipFormId || (bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.form_id),
 				title: _pisell_utils.locales.getText("pisell2.event.create.form"),
 				utils,
 				callback: function() {
 					var _ref = require_asyncToGenerator._asyncToGenerator(function* (res) {
 						if ((res === null || res === void 0 ? void 0 : res.status) === "success") {
 							let result = void 0;
+							if (formId) {
+								const { formRecordId, formId: holderFormId } = require_buildCartHolderParams.handleCartHolderFormSuccess({
+									res,
+									formId,
+									skuRelationFormId,
+									utils,
+									module: appointmentBooking
+								});
+								result = require_buildCartHolderParams.buildCartHolderOption(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, res === null || res === void 0 ? void 0 : res.values), {}, {
+									formRecordId,
+									form_id: holderFormId
+								}), utils);
+								appointmentBooking.updateCart({
+									_id: e === null || e === void 0 ? void 0 : e._id,
+									account: result
+								});
+								return;
+							}
 							if (!relationShipFormId) result = yield addAccount(res === null || res === void 0 ? void 0 : res.values, "holder");
 							else result = yield require_utils$1.handleAddHolder({
 								res,
@@ -112,24 +155,36 @@ const CartItem = ({ onNext, renderContactInfo }) => {
 	};
 	const products = (0, react.useMemo)(() => {
 		if (!(carts === null || carts === void 0 ? void 0 : carts.length)) return [];
-		carts.forEach((item) => {
-			item.isShowChangeHolder = !appointmentBooking.isTargetCartIdNormalProduct(item === null || item === void 0 ? void 0 : item._id);
+		const enrichedCarts = carts.map((item) => {
+			const isNormalProduct = appointmentBooking.isTargetCartIdNormalProduct(item === null || item === void 0 ? void 0 : item._id);
+			const holderConfig = require_buildCartHolderParams.getAppointmentCartHolderConfig(item);
+			const holderParams = require_buildCartHolderParams.buildCartHolderParams({
+				item,
+				holderConfig,
+				formData: require_holderConfig.isHolderConfigEnabled(holderConfig) ? holderMap === null || holderMap === void 0 ? void 0 : holderMap[holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.resource_id] : {},
+				translation,
+				enabled: isLoggedIn && isFormSubject && !isNormalProduct,
+				utils
+			});
+			return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, item), holderParams);
 		});
-		if ((currentSelectedResources === null || currentSelectedResources === void 0 ? void 0 : currentSelectedResources.length) > 0) return carts.map((item) => {
+		if ((currentSelectedResources === null || currentSelectedResources === void 0 ? void 0 : currentSelectedResources.length) > 0) return enrichedCarts.map((item) => {
 			const currentResourceData = currentSelectedResources.find((resource) => (resource === null || resource === void 0 ? void 0 : resource._id) === (item === null || item === void 0 ? void 0 : item._id));
 			const multiResources = require_utils.getMultiResources(item, currentResourceData === null || currentResourceData === void 0 ? void 0 : currentResourceData.currentSelectedResource, currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key);
 			return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, item), {}, {
 				isMultipleResource: true,
-				multiResources,
-				isErrorHolder: isErrorHolder || false
+				multiResources
 			});
 		});
-		else return carts;
+		else return enrichedCarts;
 	}, [
 		carts,
 		currentSelectedResources,
 		currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key,
-		isErrorHolder
+		isErrorHolder,
+		holderMap,
+		isFormSubject,
+		isLoggedIn
 	]);
 	/**
 	* @description: 结算列表数据
@@ -189,8 +244,8 @@ const CartItem = ({ onNext, renderContactInfo }) => {
 			isShowDelete: (currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.key) === "select-service",
 			isShowAmountFooter: true,
 			isShowPackageNote: false,
-			isShowChangeHolder: isLastStep ? false : isFormSubject && isLogin,
-			isShowHolder: isFormSubject,
+			isShowChangeHolder: isLastStep ? false : isFormSubject && isLoggedIn,
+			isShowHolder: isFormSubject && isLoggedIn,
 			isShowAddHolderButton: true
 		},
 		collapseParams: {

package/lib/components/appointmentBooking/components/ConfirmInformation/index.js

@@ -3,6 +3,7 @@ const require_useEngineContext = require("../../../../hooks/useEngineContext.js"
 const require_objectSpread2 = require("../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js");
 const require_asyncToGenerator = require("../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js");
 const require_ContactInfoContent = require("../../../../plus/contactInfoModal/ContactInfoContent.js");
+const require_holderConfig = require("../../../../utils/holderConfig.js");
 const require_utils = require("../../utils.js");
 const require_useLoginUser = require("../../../../hooks/useLoginUser.js");
 const require_index = require("../../../productStockCheckModal/index.js");
@@ -25,7 +26,7 @@ const ConfirmInformation = (0, react.forwardRef)((props, ref) => {
 	const utils = require_hooks.contextUtils();
 	const { pubsub } = context.appHelper.utils;
 	const { appointmentBooking, summary, isAgreeDepositPolicy, setLoading, carts, setTimes } = require_context.useAppointmentBookingContext();
-	const { isRetailTemplate, bookingSetting } = require_hooks.useAppointmentBookingSetting();
+	const { isRetailTemplate, bookingSetting, isFormSubject } = require_hooks.useAppointmentBookingSetting();
 	console.log(bookingSetting, "bookingSetting");
 	const [form] = antd.Form.useForm();
 	const userInfo = require_useLoginUser.default();
@@ -181,10 +182,14 @@ const ConfirmInformation = (0, react.forwardRef)((props, ref) => {
 	const onCheckout = function() {
 		var _ref5 = require_asyncToGenerator._asyncToGenerator(function* (extraData) {
 			try {
+				const _extraData = (carts === null || carts === void 0 ? void 0 : carts.some((item) => {
+					var _item$_productInit;
+					return require_holderConfig.isHolderConfigEnabled(item === null || item === void 0 || (_item$_productInit = item._productInit) === null || _item$_productInit === void 0 ? void 0 : _item$_productInit.holder_config);
+				})) ? require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, extraData), {}, { is_add_holder_info: isFormSubject }) : extraData;
 				const { deposit } = summary;
 				const customer = require_utils.formatAppointmentCustomerInfo(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, userInfo), extraData === null || extraData === void 0 ? void 0 : extraData.contacts_info));
 				logCheckout("调用 submitOrder", require_objectSpread2._objectSpread2({ products: require_utils.formatAppointmentCartSummary(carts) }, customer));
-				const { data } = yield appointmentBooking.submitOrder(extraData);
+				const { data } = yield appointmentBooking.submitOrder(_extraData);
 				const { is_deposit, deposit_amount, total_amount, order_id } = data || {};
 				logCheckout("submitOrder 返回", require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({ products: require_utils.formatAppointmentCartSummary(carts) }, customer), {}, {
 					order_id: order_id || null,

package/lib/components/appointmentBooking/components/Content/index.js

@@ -29,6 +29,7 @@ const Layout = () => {
 	const { currentStep, setResourceOtherParams, resourceOtherParams, setIsAgreeDepositPolicy, appointmentBooking, setLoading, policyParams, closePolicy, currentStepParams, setIsErrorHolder } = require_context.useAppointmentBookingContext();
 	const { isDateSelectedFirst, isFormSubject, isRetailTemplate } = require_hooks.useAppointmentBookingSetting();
 	const { isLogin } = require_hooks.useAppointmentBookingLogin();
+	const isLoggedIn = isLogin();
 	const { getHolders } = require_hooks.useAppointmentBookingAccount();
 	const { removeStep } = require_hooks.useAppointmentBookingStep();
 	const { shopDiscount } = require_hooks.useShopDiscount();
@@ -49,7 +50,7 @@ const Layout = () => {
 					const accountLists = yield appointmentBooking.getAccounts();
 					const meAccount = accountLists === null || accountLists === void 0 ? void 0 : accountLists.find((d) => !(d === null || d === void 0 ? void 0 : d.isGuest));
 					appointmentBooking.setLoginAccount(meAccount === null || meAccount === void 0 ? void 0 : meAccount.id, currentUser);
-				} else if (!isRetailTemplate) getHolders();
+				} else if (!isRetailTemplate) yield getHolders();
 			});
 			return function handleLoginSuccess(_x) {
 				return _ref.apply(this, arguments);
@@ -88,11 +89,12 @@ const Layout = () => {
 		} catch (error) {}
 	}, [isFormSubject, isRetailTemplate]);
 	(0, react.useEffect)(() => {
-		if (isFormSubject && isLogin && !isRetailTemplate) getHolders();
+		if (isFormSubject && isLoggedIn && !isRetailTemplate) getHolders();
 	}, [
 		isFormSubject,
-		isLogin,
-		isRetailTemplate
+		isLoggedIn,
+		isRetailTemplate,
+		appointmentBooking
 	]);
 	(0, react.useEffect)(() => {
 		var _currentStep$step;

package/lib/components/appointmentBooking/components/Voucher/index.js

@@ -3,6 +3,7 @@ const require_useEngineContext = require("../../../../hooks/useEngineContext.js"
 const require_objectSpread2 = require("../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js");
 const require_asyncToGenerator = require("../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js");
 const require_utils = require("../../../booking/utils.js");
+const require_utils$1 = require("../../utils.js");
 const require_hooks = require("../../hooks.js");
 const require_context = require("../../context.js");
 let react = require("react");
@@ -200,7 +201,16 @@ const VoucherCard = (props) => {
 			className: "login-btn",
 			onClick: () => {
 				if (!action) return;
-				openLoginModal({ callback: (status) => {} });
+				openLoginModal({
+					data: { type: "plugin" },
+					callback: (status) => {
+						if (status === "success") {
+							var _appointmentBooking$r;
+							const customer = require_utils$1.getCustomer(utils);
+							appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$r = appointmentBooking.refreshAllHolderFormRecords) === null || _appointmentBooking$r === void 0 || _appointmentBooking$r.call(appointmentBooking, { customer_id: customer === null || customer === void 0 ? void 0 : customer.id });
+						}
+					}
+				});
 			}
 		}, _pisell_utils.locales.getText("pisell2.text.goodpass.login")), /* @__PURE__ */ react.default.createElement("span", null, _pisell_utils.locales.getText("pisell2.text.goodpass.login-tip"))));
 	};

package/lib/components/appointmentBooking/hooks.js

@@ -185,15 +185,19 @@ const useAppointmentBookingStep = () => {
 			const selectedResource = (currentSelectedResources === null || currentSelectedResources === void 0 || (_currentSelectedResou2 = currentSelectedResources[0]) === null || _currentSelectedResou2 === void 0 ? void 0 : _currentSelectedResou2.currentSelectedResource) || {};
 			const renderItem = (selectedResource === null || selectedResource === void 0 ? void 0 : selectedResource.renderItem) || {};
 			const checkHolder = function() {
-				var _ref2 = require_asyncToGenerator._asyncToGenerator(function* () {
+				var _ref2 = require_asyncToGenerator._asyncToGenerator(function* (isLoginTrigger = false) {
 					setLoading(false);
 					if (isRetailTemplate || (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.isCartAllNormalProducts())) return appointmentBooking.next();
 					let cartLists = carts || [];
 					if (!(carts === null || carts === void 0 ? void 0 : carts.length)) cartLists = (yield appointmentBooking.getCart()) || [];
 					else cartLists = carts || [];
-					const { hasError } = require_utils.checkAndGoNext(isFormSubject, checkAccount, cartLists.filter((n) => !(appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.isTargetCartIdNormalProduct(n._id))));
+					const { hasError, isEnableSkuHolderRule } = require_utils.checkAndGoNext(isFormSubject, checkAccount, cartLists.filter((n) => !(appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.isTargetCartIdNormalProduct(n._id))));
 					setIsErrorHolder(hasError);
-					if (hasError) return;
+					if (hasError) {
+						require_utils$1.scrollToFirstErrorCard(".pisell-lowcode-product-card-select-holder-error");
+						return;
+					}
+					if (isLoginTrigger && isEnableSkuHolderRule) return;
 					if (!!(renderItem === null || renderItem === void 0 ? void 0 : renderItem.policy_id)) openPolicy({ id: renderItem === null || renderItem === void 0 ? void 0 : renderItem.policy_id }, () => {
 						return appointmentBooking.next();
 					});
@@ -205,10 +209,17 @@ const useAppointmentBookingStep = () => {
 			}();
 			const checkLogin = function() {
 				var _ref3 = require_asyncToGenerator._asyncToGenerator(function* () {
-					if (!isLogin) {
+					if (!isLogin()) {
 						const { pubsub } = utils;
 						pubsub.once("pisell1.login.success", (res) => {
-							if (res === "success") checkHolder();
+							if (res === "success") {
+								if (isFormSubject && !isRetailTemplate && !(appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.isCartAllNormalProducts())) {
+									var _appointmentBooking$r;
+									const customer = require_utils.getCustomer(utils);
+									appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$r = appointmentBooking.refreshAllHolderFormRecords) === null || _appointmentBooking$r === void 0 || _appointmentBooking$r.call(appointmentBooking, { customer_id: customer === null || customer === void 0 ? void 0 : customer.id });
+								}
+								checkHolder(true);
+							}
 							if (res === "close") setLoading(false);
 						});
 						return openLoginModal({ callback: (status) => {} });
@@ -342,10 +353,10 @@ const useAppointmentBookingLogin = () => {
 		return Boolean(utils === null || utils === void 0 || (_utils$token = utils.token) === null || _utils$token === void 0 || (_utils$token$get = _utils$token.get) === null || _utils$token$get === void 0 ? void 0 : _utils$token$get.call(_utils$token));
 	}, [utils]);
 	const openLoginModal = (params) => {
-		const { callback } = params || {};
+		const { callback, data = {} } = params || {};
 		utils.action({
 			type: "pisell1.login",
-			data: { type: "plugin" },
+			data: require_objectSpread2._objectSpread2({ type: "plugin" }, data),
 			callback
 		});
 	};
@@ -390,19 +401,23 @@ const useAppointmentBookingAccount = () => {
 	}, []);
 	const getHolders = function() {
 		var _ref9 = require_asyncToGenerator._asyncToGenerator(function* () {
-			var _utils$getStore$getSt;
+			var _utils$getStore$getSt, _appointmentBooking$r2;
 			const shop_id = (_utils$getStore$getSt = utils.getStore().getState()) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.global) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.shop) === null || _utils$getStore$getSt === void 0 ? void 0 : _utils$getStore$getSt.id;
 			const customer = require_utils.getCustomer(utils);
-			if (!shop_id || !form_id || !(customer === null || customer === void 0 ? void 0 : customer.id)) return [];
-			const params = {
-				url: "/form/data/v1",
-				query: {
-					customer_id: customer === null || customer === void 0 ? void 0 : customer.id,
-					form_id,
-					shop_id
-				}
-			};
-			const data = yield appointmentBooking.fetchHolderAccountsAsync(params);
+			if (!(customer === null || customer === void 0 ? void 0 : customer.id)) return [];
+			let data;
+			if (shop_id && form_id) {
+				const params = {
+					url: "/form/data/v1",
+					query: {
+						customer_id: customer.id,
+						form_id,
+						shop_id
+					}
+				};
+				data = yield appointmentBooking.fetchHolderAccountsAsync(params);
+			}
+			yield appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$r2 = appointmentBooking.refreshAllHolderFormRecords) === null || _appointmentBooking$r2 === void 0 ? void 0 : _appointmentBooking$r2.call(appointmentBooking, { customer_id: customer.id });
 			return (data === null || data === void 0 ? void 0 : data.map((item) => {
 				return {
 					id: item === null || item === void 0 ? void 0 : item.form_record_id,

package/lib/components/appointmentBooking/utils.js

@@ -1,6 +1,7 @@
 require("../../_virtual/_rolldown/runtime.js");
 const require_objectSpread2 = require("../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js");
 const require_asyncToGenerator = require("../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js");
+const require_holderConfig = require("../../utils/holderConfig.js");
 let _pisell_utils = require("@pisell/utils");
 let _pisell_materials = require("@pisell/materials");
 //#region src/components/appointmentBooking/utils.ts
@@ -339,10 +340,19 @@ const getFormInsertBeforeKey = (currentKey, stepList) => {
 * @Date: 2025-05-24 22:46
 */
 const checkAndGoNext = (isFormSubject, checkAccount, carts) => {
+	if (!isFormSubject) return {
+		hasError: false,
+		isEnableSkuHolderRule: false,
+		updatedCartList: carts
+	};
 	let hasError = false;
+	let isEnableSkuHolderRule = false;
 	let updatedCartList = [...carts];
-	if (isFormSubject && !checkAccount("holder")) updatedCartList = carts === null || carts === void 0 ? void 0 : carts.map((item) => {
-		if (!(item === null || item === void 0 ? void 0 : item.holder_id)) {
+	updatedCartList = carts === null || carts === void 0 ? void 0 : carts.map((item) => {
+		var _item$_productInit;
+		const holderConfig = (item === null || item === void 0 || (_item$_productInit = item._productInit) === null || _item$_productInit === void 0 ? void 0 : _item$_productInit.holder_config) || {};
+		if (!(item === null || item === void 0 ? void 0 : item.holder_id) && require_holderConfig.isHolderConfigEnabled(holderConfig) && !require_holderConfig.isHolderConfigRequired(holderConfig)) isEnableSkuHolderRule = true;
+		if (!(item === null || item === void 0 ? void 0 : item.holder_id) && require_holderConfig.isHolderConfigRequired(holderConfig)) {
 			hasError = true;
 			return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, item), {}, { isErrorHolder: true });
 		}
@@ -350,7 +360,8 @@ const checkAndGoNext = (isFormSubject, checkAccount, carts) => {
 	});
 	return {
 		hasError,
-		updatedCartList
+		updatedCartList,
+		isEnableSkuHolderRule
 	};
 };
 const currentAppointmentBoard = (currentKey, resources, appointmentBooking) => {
@@ -412,8 +423,8 @@ const isSessionProduct = function() {
 	var _ref2 = require_asyncToGenerator._asyncToGenerator(function* (appointmentBooking) {
 		const carts = yield appointmentBooking.getCart();
 		return carts === null || carts === void 0 ? void 0 : carts.some((item) => {
-			var _item$_productInit;
-			return (item === null || item === void 0 || (_item$_productInit = item._productInit) === null || _item$_productInit === void 0 || (_item$_productInit = _item$_productInit["schedule.ids"]) === null || _item$_productInit === void 0 ? void 0 : _item$_productInit.length) > 0;
+			var _item$_productInit2;
+			return (item === null || item === void 0 || (_item$_productInit2 = item._productInit) === null || _item$_productInit2 === void 0 || (_item$_productInit2 = _item$_productInit2["schedule.ids"]) === null || _item$_productInit2 === void 0 ? void 0 : _item$_productInit2.length) > 0;
 		});
 	});
 	return function isSessionProduct(_x) {