@pisell/private-materials 6.12.355 → 6.12.357

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) {

package/lib/components/venueBooking/components/Cart/index.js

@@ -3,7 +3,10 @@ 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_index = require("../../../shoppingCart/index.js");
+const require_holderConfig = require("../../../../utils/holderConfig.js");
+const require_utils = require("../../../appointmentBooking/utils.js");
 const require_index$1 = require("../../../subTotal/index.js");
+const require_buildCartHolderParams = require("../../../../utils/buildCartHolderParams.js");
 const require_orderProductIdentity = require("../../utils/orderProductIdentity.js");
 const require_context = require("../../context.js");
 const require_index$2 = require("../Voucher/index.js");
@@ -21,24 +24,65 @@ require("./index.less");
 * 支持两种模式：embedded（桌面端内嵌）和 drawer（移动端抽屉弹出）
 */
 function Cart(props) {
-	var _engineContext$appHel, _engineContext$appHel2, _engineContext$appHel3, _engineContext$engine, _businessUtils$getApp, _businessUtils$getApp2, _ref, _ref2, _ref3, _summary$total_amount, _summary$deposit3;
+	var _engineContext$appHel, _engineContext$appHel2, _engineContext$appHel3, _engineContext$engine, _engineContext$appHel4, _businessUtils$getApp, _businessUtils$getApp2, _ref, _ref2, _ref3, _summary$total_amount, _summary$deposit3;
 	const { open, onCancel, onNext, items, summary, embedded = false, confirmLoading = false, extraContent } = props;
-	const { currentStep, runModuleAction, refreshViewModel, refreshTimeSlotGrid, venueBookingModule, isAgreeDepositPolicy, setIsAgreeDepositPolicy } = require_context.useVenueBookingContext();
+	const { currentStep, runModuleAction, refreshViewModel, refreshTimeSlotGrid, venueBookingModule, isAgreeDepositPolicy, setIsAgreeDepositPolicy, isLoading, isLogin } = require_context.useVenueBookingContext();
 	const engineContext = require_useEngineContext.default();
 	const businessUtils = engineContext === null || engineContext === void 0 || (_engineContext$appHel = engineContext.appHelper) === null || _engineContext$appHel === void 0 || (_engineContext$appHel = _engineContext$appHel.utils) === null || _engineContext$appHel === void 0 ? void 0 : _engineContext$appHel.businessUtils;
 	const symbol = String((engineContext === null || engineContext === void 0 || (_engineContext$appHel2 = engineContext.appHelper) === null || _engineContext$appHel2 === void 0 || (_engineContext$appHel2 = _engineContext$appHel2.utils) === null || _engineContext$appHel2 === void 0 || (_engineContext$appHel3 = _engineContext$appHel2.getSymbolic) === null || _engineContext$appHel3 === void 0 ? void 0 : _engineContext$appHel3.call(_engineContext$appHel2)) || "$");
 	const locale = (engineContext === null || engineContext === void 0 || (_engineContext$engine = engineContext.engine) === null || _engineContext$engine === void 0 || (_engineContext$engine = _engineContext$engine.props) === null || _engineContext$engine === void 0 ? void 0 : _engineContext$engine.locale) || "en";
+	const [holderMap, setHolderMap] = (0, react.useState)({});
+	const { pisellos, translation } = (engineContext === null || engineContext === void 0 || (_engineContext$appHel4 = engineContext.appHelper) === null || _engineContext$appHel4 === void 0 ? void 0 : _engineContext$appHel4.utils) || {};
 	const hasGoodPassApp = !!(businessUtils === null || businessUtils === void 0 || (_businessUtils$getApp = businessUtils.getAppByModal) === null || _businessUtils$getApp === void 0 ? void 0 : _businessUtils$getApp.call(businessUtils, "goodpass"));
 	const hasDiscountCardApp = !!(businessUtils === null || businessUtils === void 0 || (_businessUtils$getApp2 = businessUtils.getAppByModal) === null || _businessUtils$getApp2 === void 0 ? void 0 : _businessUtils$getApp2.call(businessUtils, "discountcard"));
 	const showVoucher = hasGoodPassApp || hasDiscountCardApp;
+	(0, react.useEffect)(() => {
+		var _pisellos$effects;
+		const onHolderChanged = (res) => {
+			if ((res === null || res === void 0 ? void 0 : res.path) === "holderMap") setHolderMap(res === null || res === void 0 ? void 0 : res.value);
+		};
+		pisellos === null || pisellos === void 0 || (_pisellos$effects = pisellos.effects) === null || _pisellos$effects === void 0 || _pisellos$effects.on("venueBooking_holder:changed", onHolderChanged);
+		return () => {
+			var _pisellos$effects2;
+			pisellos === null || pisellos === void 0 || (_pisellos$effects2 = pisellos.effects) === null || _pisellos$effects2 === void 0 || _pisellos$effects2.off("venueBooking_holder:changed", onHolderChanged);
+		};
+	}, [pisellos]);
+	(0, react.useEffect)(() => {
+		if (isLoading || !venueBookingModule) return;
+		try {
+			var _venueBookingModule$g;
+			setHolderMap(((_venueBookingModule$g = venueBookingModule.getHolderFormMap) === null || _venueBookingModule$g === void 0 ? void 0 : _venueBookingModule$g.call(venueBookingModule)) || {});
+		} catch (error) {
+			console.warn("[venueBooking] Holder data is not ready", error);
+			setHolderMap({});
+		}
+	}, [venueBookingModule, isLoading]);
 	const isVisible = embedded || open;
 	const totalAmount = (_ref = (_ref2 = (_ref3 = (_summary$total_amount = summary === null || summary === void 0 ? void 0 : summary.total_amount) !== null && _summary$total_amount !== void 0 ? _summary$total_amount : summary === null || summary === void 0 ? void 0 : summary.expect_amount) !== null && _ref3 !== void 0 ? _ref3 : summary === null || summary === void 0 ? void 0 : summary.amount) !== null && _ref2 !== void 0 ? _ref2 : summary === null || summary === void 0 ? void 0 : summary.total) !== null && _ref !== void 0 ? _ref : "0.00";
 	const cartProducts = (0, react.useMemo)(() => {
-		return (items || []).map((item) => require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, item), {}, {
-			symbol: (item === null || item === void 0 ? void 0 : item.symbol) || symbol,
-			is_hide_like: true
-		}));
-	}, [items, symbol]);
+		return (items || []).map((item) => {
+			var _item$_origin, _engineContext$appHel5;
+			const holderConfig = require_buildCartHolderParams.getVenueCartHolderConfig(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: !!(item === null || item === void 0 || (_item$_origin = item._origin) === null || _item$_origin === void 0 || (_item$_origin = _item$_origin.product) === null || _item$_origin === void 0 ? void 0 : _item$_origin.bookingUuid),
+				utils: engineContext === null || engineContext === void 0 || (_engineContext$appHel5 = engineContext.appHelper) === null || _engineContext$appHel5 === void 0 ? void 0 : _engineContext$appHel5.utils
+			});
+			return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, item), {}, {
+				symbol: (item === null || item === void 0 ? void 0 : item.symbol) || symbol,
+				is_hide_like: true,
+				allowClearHolder: true
+			}, holderParams);
+		});
+	}, [
+		items,
+		symbol,
+		holderMap,
+		translation
+	]);
 	const confirmOrderText = currentStep === "checkout" ? String(_pisell_utils.locales.getText("pisell2.venue.action.pay.now") || "立即支付") : String(_pisell_utils.locales.getText("pisell2.venue.action.next") || "下一步");
 	/**
 	* SubTotal 金额明细列表
@@ -46,12 +90,12 @@ function Cart(props) {
 	* surcharges 为服务费列表，label 支持多语言对象，按当前 locale 取值
 	*/
 	const subTotalList = (0, react.useMemo)(() => {
-		var _summary$product_amou, _summary$tax_fee, _ref4, _summary$total_amount2, _summary$deposit, _venueBookingModule$g, _tempSummary$is_price, _summary$deposit$tota, _summary$deposit2;
+		var _summary$product_amou, _summary$tax_fee, _ref4, _summary$total_amount2, _summary$deposit, _venueBookingModule$g2, _tempSummary$is_price, _summary$deposit$tota, _summary$deposit2;
 		const subTotal = Number((_summary$product_amou = summary === null || summary === void 0 ? void 0 : summary.product_amount) !== null && _summary$product_amou !== void 0 ? _summary$product_amou : 0);
 		const totalTaxFee = Number((_summary$tax_fee = summary === null || summary === void 0 ? void 0 : summary.tax_fee) !== null && _summary$tax_fee !== void 0 ? _summary$tax_fee : 0);
 		const total = Number((_ref4 = (_summary$total_amount2 = summary === null || summary === void 0 ? void 0 : summary.total_amount) !== null && _summary$total_amount2 !== void 0 ? _summary$total_amount2 : summary === null || summary === void 0 ? void 0 : summary.expect_amount) !== null && _ref4 !== void 0 ? _ref4 : 0);
 		const hasDeposit = !!(summary === null || summary === void 0 || (_summary$deposit = summary.deposit) === null || _summary$deposit === void 0 ? void 0 : _summary$deposit.hasDeposit);
-		const tempOrder = venueBookingModule === null || venueBookingModule === void 0 || (_venueBookingModule$g = venueBookingModule.getTempOrder) === null || _venueBookingModule$g === void 0 ? void 0 : _venueBookingModule$g.call(venueBookingModule);
+		const tempOrder = venueBookingModule === null || venueBookingModule === void 0 || (_venueBookingModule$g2 = venueBookingModule.getTempOrder) === null || _venueBookingModule$g2 === void 0 ? void 0 : _venueBookingModule$g2.call(venueBookingModule);
 		const tempSummary = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.summary) || {};
 		const taxTitle = String((tempSummary === null || tempSummary === void 0 ? void 0 : tempSummary.tax_title) || (summary === null || summary === void 0 ? void 0 : summary.tax_title) || "GST/Tax");
 		const rawTaxRate = Number(tempSummary === null || tempSummary === void 0 ? void 0 : tempSummary.tax_rate);
@@ -113,7 +157,57 @@ function Cart(props) {
 		return false;
 	};
 	const handleCartChange = function() {
-		var _ref5 = require_asyncToGenerator._asyncToGenerator(function* (item, type, sourceItem) {
+		var _ref6 = require_asyncToGenerator._asyncToGenerator(function* (item, type, sourceItem) {
+			if (type === "add_holder") {
+				var _engineContext$appHel6;
+				const holderConfig = require_buildCartHolderParams.getVenueCartHolderConfig(item);
+				if (!require_holderConfig.isHolderConfigEnabled(holderConfig)) return;
+				const formId = holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.resource_id;
+				if (!formId) return;
+				const skuRelationFormId = require_buildCartHolderParams.getSkuRelationFormId(holderMap, formId);
+				return require_utils.openForm({
+					form_id: skuRelationFormId || formId,
+					title: _pisell_utils.locales.getText("pisell2.venue.create.form"),
+					utils: engineContext === null || engineContext === void 0 || (_engineContext$appHel6 = engineContext.appHelper) === null || _engineContext$appHel6 === void 0 ? void 0 : _engineContext$appHel6.utils,
+					callback: function() {
+						var _ref5 = require_asyncToGenerator._asyncToGenerator(function* (res) {
+							if ((res === null || res === void 0 ? void 0 : res.status) === "success") {
+								var _engineContext$appHel7, _engineContext$appHel8, _item$_origin2;
+								const { formRecordId, formId: holderFormId } = require_buildCartHolderParams.handleCartHolderFormSuccess({
+									res,
+									formId,
+									skuRelationFormId,
+									utils: engineContext === null || engineContext === void 0 || (_engineContext$appHel7 = engineContext.appHelper) === null || _engineContext$appHel7 === void 0 ? void 0 : _engineContext$appHel7.utils,
+									module: venueBookingModule
+								});
+								const customer = require_utils.getCustomer(engineContext === null || engineContext === void 0 || (_engineContext$appHel8 = engineContext.appHelper) === null || _engineContext$appHel8 === void 0 ? void 0 : _engineContext$appHel8.utils);
+								venueBookingModule.setBookingHolder(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.bookingUuid, {
+									customer_id: customer === null || customer === void 0 ? void 0 : customer.id,
+									form_id: holderFormId,
+									form_record: [formRecordId]
+								});
+								yield refreshViewModel();
+							}
+						});
+						return function callback(_x) {
+							return _ref5.apply(this, arguments);
+						};
+					}()
+				});
+			}
+			if (type === "change_holder") {
+				var _engineContext$appHel9, _item$_origin3;
+				const customer = require_utils.getCustomer(engineContext === null || engineContext === void 0 || (_engineContext$appHel9 = engineContext.appHelper) === null || _engineContext$appHel9 === void 0 ? void 0 : _engineContext$appHel9.utils);
+				const holder = (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem._origin) || sourceItem;
+				const params = !sourceItem ? null : {
+					customer_id: customer === null || customer === void 0 ? void 0 : customer.id,
+					form_id: holder === null || holder === void 0 ? void 0 : holder.form_id,
+					form_record: [holder === null || holder === void 0 ? void 0 : holder.form_record_id]
+				};
+				venueBookingModule.setBookingHolder(item === null || item === void 0 || (_item$_origin3 = item._origin) === null || _item$_origin3 === void 0 || (_item$_origin3 = _item$_origin3.product) === null || _item$_origin3 === void 0 ? void 0 : _item$_origin3.bookingUuid, params);
+				yield refreshViewModel();
+				return;
+			}
 			if (type !== "delete") return;
 			const targetItem = sourceItem && typeof sourceItem === "object" ? sourceItem : item;
 			if (currentStep !== "select-venue" && isVenueBookingCartItem(targetItem)) {
@@ -139,8 +233,8 @@ function Cart(props) {
 				});
 			}
 		});
-		return function handleCartChange(_x, _x2, _x3) {
-			return _ref5.apply(this, arguments);
+		return function handleCartChange(_x2, _x3, _x4) {
+			return _ref6.apply(this, arguments);
 		};
 	}();
 	(0, react.useEffect)(() => {
@@ -156,9 +250,9 @@ function Cart(props) {
 			isShowNote: false,
 			isShowDelete: true,
 			isShowPackageNote: false,
-			isShowChangeHolder: false,
-			isShowHolder: false,
-			isShowAddHolderButton: false
+			isShowChangeHolder: currentStep === "checkout" ? false : !!isLogin,
+			isShowHolder: true,
+			isShowAddHolderButton: true
 		},
 		platform: "h5",
 		emptyText: _pisell_utils.locales.getText("pisell2.venue.cart.empty"),
@@ -174,8 +268,8 @@ function Cart(props) {
 		isAgreePolicy: isAgreeDepositPolicy,
 		onChange: setIsAgreeDepositPolicy,
 		getProtocol: (id) => {
-			var _venueBookingModule$g2;
-			return venueBookingModule === null || venueBookingModule === void 0 || (_venueBookingModule$g2 = venueBookingModule.getProtocol) === null || _venueBookingModule$g2 === void 0 ? void 0 : _venueBookingModule$g2.call(venueBookingModule, id);
+			var _venueBookingModule$g3;
+			return venueBookingModule === null || venueBookingModule === void 0 || (_venueBookingModule$g3 = venueBookingModule.getProtocol) === null || _venueBookingModule$g3 === void 0 ? void 0 : _venueBookingModule$g3.call(venueBookingModule, id);
 		}
 	}) : null), extraContent ? /* @__PURE__ */ react.default.createElement("div", { className: "pisell-venue-booking-cart-extra-content" }, extraContent) : null);
 	if (embedded) return /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, cartListContent, /* @__PURE__ */ react.default.createElement("div", { className: "pisell-venue-booking-cart-embedded-footer" }, cartSummaryContent, /* @__PURE__ */ react.default.createElement(_pisell_materials.Button, {

package/lib/components/venueBooking/context.js

@@ -2,6 +2,7 @@ const require_runtime = require("../../_virtual/_rolldown/runtime.js");
 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_buildCartHolderParams = require("../../utils/buildCartHolderParams.js");
 const require_hooks = require("./hooks.js");
 const require_utils = require("./utils.js");
 let dayjs = require("dayjs");
@@ -504,13 +505,23 @@ function VenueBookingProvider({ entryContext, children }) {
 			} });
 			return;
 		}
+		if (currentStep === "addons") {
+			const { hasError } = require_buildCartHolderParams.validateRequiredCartHolders({
+				items: viewModel.cartItems,
+				getHolderConfig: require_buildCartHolderParams.getVenueCartHolderConfig
+			});
+			if (hasError) return;
+		}
 		goToStep("checkout");
 	}, [
 		isLogin,
 		openLoginModal,
 		handleLoginSuccess,
 		goToStep,
-		venueBookingModule
+		venueBookingModule,
+		currentStep,
+		viewModel.cartItems,
+		require_buildCartHolderParams.getVenueCartHolderConfig
 	]);
 	/** 主操作按钮行为（含登录门禁，自适应 2/3 步流程） */
 	const handlePrimaryAction = (0, react.useCallback)(() => {
@@ -546,9 +557,9 @@ function VenueBookingProvider({ entryContext, children }) {
 		isAgreeDepositPolicy,
 		viewModel.summary,
 		stepList,
-		proceedToCheckout,
 		goToStep,
-		handleSubmitOrder
+		handleSubmitOrder,
+		proceedToCheckout
 	]);
 	(0, react.useEffect)(() => {
 		var _pubsub$subscribe;

package/lib/components/venueBooking/locales.js

@@ -126,7 +126,8 @@ var locales_default = {
 		"pisell2.appointment.policy": "You have read and agreed to this policy",
 		"pisell2.appointment.policy.confirm": "Confirm",
 		"pisell2.appointment.booking.empty.data": "No data",
-		"pisell2.product-select.search": "Search"
+		"pisell2.product-select.search": "Search",
+		"pisell2.venue.create.form": "Create form"
 	},
 	"zh-CN": {
 		"pisell2.venue.step.select": "选择场地",
@@ -250,7 +251,8 @@ var locales_default = {
 		"pisell2.appointment.policy": "您已仔细阅读并同意此协议",
 		"pisell2.appointment.policy.confirm": "确定",
 		"pisell2.appointment.booking.empty.data": "暂无数据",
-		"pisell2.product-select.search": "搜索"
+		"pisell2.product-select.search": "搜索",
+		"pisell2.venue.create.form": "创建表单"
 	},
 	"zh-HK": {
 		"pisell2.venue.step.select": "選擇場地",
@@ -374,7 +376,8 @@ var locales_default = {
 		"pisell2.appointment.policy": "您已仔細閱讀並同意此協議",
 		"pisell2.appointment.policy.confirm": "確定",
 		"pisell2.appointment.booking.empty.data": "暫無數據",
-		"pisell2.product-select.search": "搜索"
+		"pisell2.product-select.search": "搜索",
+		"pisell2.venue.create.form": "创建表单"
 	},
 	ja: {
 		"pisell2.venue.step.select": "コートを選択",
@@ -498,7 +501,8 @@ var locales_default = {
 		"pisell2.appointment.policy": "このポリシーを読み、同意しました",
 		"pisell2.appointment.policy.confirm": "確認",
 		"pisell2.appointment.booking.empty.data": "データなし",
-		"pisell2.product-select.search": "検索"
+		"pisell2.product-select.search": "検索",
+		"pisell2.venue.create.form": "フォームを作成"
 	},
 	pt: {
 		"pisell2.venue.step.select": "Escolher quadra",
@@ -622,7 +626,8 @@ var locales_default = {
 		"pisell2.appointment.policy": "Você leu e concordou com esta política",
 		"pisell2.appointment.policy.confirm": "Confirmar",
 		"pisell2.appointment.booking.empty.data": "Sem dados",
-		"pisell2.product-select.search": "Pesquisar"
+		"pisell2.product-select.search": "Pesquisar",
+		"pisell2.venue.create.form": "Criar formulário"
 	}
 };
 //#endregion

package/lib/plus/invoice/README.md

@@ -77,8 +77,14 @@ type OrderInvoiceHandle = {
 
 OS `OrderInvoicePreview` 从模板 language 中提供 `languageOptions` 和
 `selectedLanguage`；宿主选择器调用实例 `selectLanguage(code)`，不重新准备订单或
-加载低代码页面。`result.locale` 为主语言，`secondaryLocale` 仅在 `cn_en` 时为
-`zh_CN`。页面 UI 的 `locale` 不随此选择改变。
+加载低代码页面。`result.locale` 为主语言；`cn_en` 沿用英语在前、简体中文在后，
+`ja_en` 为日语在前、英语在后，`secondaryLocale` 为对应的第二语言。
+页面 UI 的 `locale` 不随此选择改变。
+
+POS Invoice 预览从同一份 `getInvoiceTemplateSettings()` 配置取得 modules 和
+language，展示首个启用的语言模式（打印份数不重复预览），并请求该模式所需的所有
+语言快照。双语模式任一语言缺失时保留重试提示，不静默降级为单语。旧 OS 仅提供
+layout 或 DEFAULT 模板未指定语言时，继续按界面语言选择。
 
 物料使用 `receipt_key` 关联来源相同的双语节点，保留仅次语言有内容的行。
 `receipt_item_kind` / `receipt_value_kind` 区分共享值和翻译文本，避免时间、编号和

package/lib/plus/invoice/ReceiptRenderer.js

@@ -29,7 +29,7 @@ function ReceiptRows({ locale, rows }) {
 		return /* @__PURE__ */ react.default.createElement("div", {
 			className: `${PREFIX}__receipt-row ${row.size === 2 ? `${PREFIX}__receipt-row--strong` : ""} ${singleValue ? `${PREFIX}__receipt-row--single` : ""} ${alignment ? `${PREFIX}__receipt-row--align-${alignment}` : ""}`,
 			key: `${row.item}-${row.value}-${index}`
-		}, row.item ? /* @__PURE__ */ react.default.createElement("span", null, label(String(row.item), locale)) : null, row.value ? /* @__PURE__ */ react.default.createElement("span", null, row.value) : null);
+		}, row.item ? /* @__PURE__ */ react.default.createElement("span", null, label(String(row.item), row.labelLocale || locale)) : null, row.value ? /* @__PURE__ */ react.default.createElement("span", null, row.value) : null);
 	}));
 }
 function ReceiptSectionTitle({ children }) {

package/lib/plus/invoice/receipt.d.ts

@@ -10,6 +10,8 @@ interface InvoiceLayoutConfig {
   module: InvoiceModuleConfig[];
 }
 interface SmallTicketItem {
+  /** View-only locale retained when primary and secondary rows are merged. */
+  labelLocale?: string;
   receipt_key?: string;
   receipt_value_kind?: 'shared' | 'text';
   receipt_item_kind?: 'shared' | 'text';

package/lib/plus/invoice/receipt.js

@@ -320,12 +320,8 @@ function findLocaleKey(data, candidate) {
 	const lowerCandidate = candidate.toLowerCase().replace(/-/g, "_");
 	return Object.keys(data).find((key) => key.toLowerCase().replace(/-/g, "_") === lowerCandidate);
 }
-function selectSmallTicketLocale(data, appLocale, primaryLocale) {
-	const candidates = [
-		...localeCandidates(appLocale),
-		"en",
-		...localeCandidates(primaryLocale || "")
-	];
+function selectSmallTicketLocale(data, appLocale, primaryLocale, allowFallback = true) {
+	const candidates = [...localeCandidates(appLocale), ...allowFallback ? ["en", ...localeCandidates(primaryLocale || "")] : []];
 	for (const candidate of candidates) {
 		const key = findLocaleKey(data, candidate);
 		if (key && hasLocalePayload(data[key])) return {
@@ -333,7 +329,7 @@ function selectSmallTicketLocale(data, appLocale, primaryLocale) {
 			locale: key
 		};
 	}
-	const first = Object.keys(data).find((key) => hasLocalePayload(data[key]));
+	const first = allowFallback ? Object.keys(data).find((key) => hasLocalePayload(data[key])) : void 0;
 	return first ? {
 		data: data[first],
 		locale: first
@@ -365,6 +361,40 @@ function _resolveInvoiceLayoutConfig() {
 	});
 	return _resolveInvoiceLayoutConfig.apply(this, arguments);
 }
+const INVOICE_PREVIEW_LANGUAGES = {
+	en: ["en"],
+	zh_cn: ["zh_CN"],
+	zh_hk: ["zh_HK"],
+	ja: ["ja"],
+	pt: ["pt"],
+	cn_en: ["en", "zh_CN"],
+	ja_en: ["ja", "en"]
+};
+/** Use the first enabled print mode once, regardless of its copy count. */
+function resolveInvoicePreviewConfig(_x2) {
+	return _resolveInvoicePreviewConfig.apply(this, arguments);
+}
+function _resolveInvoicePreviewConfig() {
+	_resolveInvoicePreviewConfig = require_asyncToGenerator._asyncToGenerator(function* (salesModule) {
+		if (typeof (salesModule === null || salesModule === void 0 ? void 0 : salesModule.getInvoiceTemplateSettings) === "function") {
+			const settings = yield salesModule.getInvoiceTemplateSettings();
+			if (isRecord(settings)) {
+				const layout = normalizeInvoiceLayoutConfig({ module: settings.modules });
+				if (typeof settings.template === "string" && settings.template.trim() && settings.template.trim().toUpperCase() !== "DEFAULT" && isRecord(settings.language)) for (const [rawCode, count] of Object.entries(settings.language)) {
+					if (typeof count !== "number" || !Number.isFinite(count) || count <= 0) continue;
+					const locales = INVOICE_PREVIEW_LANGUAGES[rawCode.trim().toLowerCase().replace(/-/g, "_")];
+					if (Array.isArray(locales)) return {
+						layout,
+						locales: [...locales]
+					};
+				}
+				return { layout };
+			}
+		}
+		return { layout: yield resolveInvoiceLayoutConfig(salesModule) };
+	});
+	return _resolveInvoicePreviewConfig.apply(this, arguments);
+}
 function text(value) {
 	return value === void 0 || value === null ? "" : String(value).trim();
 }
@@ -906,7 +936,7 @@ exports.getReceiptProductTotal = getReceiptProductTotal;
 exports.isSmallTicketData = isSmallTicketData;
 exports.multiplyReceiptMoney = multiplyReceiptMoney;
 exports.receiptMoneyValuesDiffer = receiptMoneyValuesDiffer;
-exports.resolveInvoiceLayoutConfig = resolveInvoiceLayoutConfig;
+exports.resolveInvoicePreviewConfig = resolveInvoicePreviewConfig;
 exports.resolveSmallTicketData = resolveSmallTicketData;
 exports.selectSmallTicketLocale = selectSmallTicketLocale;
 exports.subtractReceiptMoney = subtractReceiptMoney;

package/lib/plus/invoice/receiptTranslations.js

@@ -42,9 +42,14 @@ function receiptLabel(receipt, key) {
 	return bilingualText(require_receipt.getReceiptLabel(receipt.locale, key), receipt.secondary && require_receipt.getReceiptLabel(receipt.secondary.locale, key));
 }
 function mergeTranslatedRows(primary, secondary, locale, secondaryLocale, sharedValues = false) {
+	const primaryRows = new Set(primary);
 	return pairReceiptEntries(primary, secondary, (row) => row.receipt_key).flatMap(({ primary: row, secondary: other }) => {
-		const item = require_receipt.getReceiptLabel(locale, row.item || "");
-		const result = [require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, row), {}, { item })];
+		const labelLocale = primaryRows.has(row) ? locale : secondaryLocale;
+		const item = require_receipt.getReceiptLabel(labelLocale, row.item || "");
+		const result = [require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, row), {}, {
+			item,
+			labelLocale
+		})];
 		if (!other) return result;
 		let secondItem = require_receipt.getReceiptLabel(secondaryLocale, other.item || "");
 		if (row.receipt_key === "settlement/tax-included") secondItem = secondItem.replace(/\s-?[^\s\d]*\d[\d,.]*\s(?=\()/, " ");
@@ -53,6 +58,7 @@ function mergeTranslatedRows(primary, secondary, locale, secondaryLocale, shared
 		if (!secondItem && !secondValue) return result;
 		result.push(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, other), {}, {
 			item: secondItem,
+			labelLocale: secondaryLocale,
 			value: secondValue,
 			receipt_key: `${other.receipt_key}/secondary`
 		}));