@pisell/private-materials 6.12.355 → 6.12.357

package/lib/plus/saleDetail/tmpl/B/components/Invoice/useInvoiceReceiptPreview.js

@@ -82,13 +82,12 @@ function useInvoiceReceiptPreview(context) {
 		setState(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, LOADING_STATE), {}, { scope }));
 		(function() {
 			var _ref3 = require_asyncToGenerator._asyncToGenerator(function* () {
-				var _bookingTicket$getFor;
 				const { appLocale, bookingTicket, engineContext, orderId, platform, previewCreatedAt, salesDetail, salesModule, tempOrder } = scope;
-				const layout = yield require_receipt.resolveInvoiceLayoutConfig(salesModule);
+				const { layout, locales } = yield require_receipt.resolveInvoicePreviewConfig(salesModule);
 				if (cancelled) return null;
 				const mustFilter = require_invoiceVisibility.requiresInvoiceDataFiltering(layout);
 				const needsPaymentTimeKeys = require_invoiceVisibility.requiresInvoicePaymentTimeKeys(layout);
-				const useSharedConfig = require_invoiceVisibility.hasInvoiceDetailSettings(layout) || mustFilter;
+				const useSharedConfig = require_invoiceVisibility.hasInvoiceDetailSettings(layout) || mustFilter || Boolean(locales);
 				const isVirtualOrder = require_index.isVirtualSettlementTempOrder(tempOrder) || require_index.isVirtualSettlementTempOrder(salesDetail === null || salesDetail === void 0 ? void 0 : salesDetail.raw);
 				const legacyVirtualResult = {
 					receipt: null,
@@ -98,11 +97,12 @@ function useInvoiceReceiptPreview(context) {
 				};
 				if (isVirtualOrder && !useSharedConfig) return legacyVirtualResult;
 				const requiresSource = isVirtualOrder && useSharedConfig;
+				const requiresFreshSnapshot = mustFilter || needsPaymentTimeKeys || requiresSource || ((locales === null || locales === void 0 ? void 0 : locales.length) || 0) > 1;
 				const embeddedSnapshot = require_receipt.resolveSmallTicketData(salesDetail, tempOrder);
 				const { snapshot, source } = yield function() {
 					var _ref2 = require_asyncToGenerator._asyncToGenerator(function* () {
 						if (platform !== "h5" && orderId !== null && orderId !== void 0) try {
-							const freshSnapshot = yield require_serve.getLocalOrderReceiptSnapshot(orderId, [appLocale], layout);
+							const freshSnapshot = yield require_serve.getLocalOrderReceiptSnapshot(orderId, locales || [appLocale], layout);
 							if (!freshSnapshot || !require_receipt.isSmallTicketData(freshSnapshot.small_ticket_data)) throw new Error("Receipt snapshot is unavailable");
 							if (mustFilter && freshSnapshot.template_visibility_applied !== true) throw new Error("Receipt snapshot does not support template filtering");
 							if (needsPaymentTimeKeys && !require_invoiceVisibility.hasInvoicePaymentTimeKeys(freshSnapshot.small_ticket_data)) throw new Error("Receipt snapshot does not identify payment history times");
@@ -112,10 +112,10 @@ function useInvoiceReceiptPreview(context) {
 								source: freshSnapshot.source || null
 							};
 						} catch (error) {
-							if (mustFilter || needsPaymentTimeKeys || requiresSource) throw error;
+							if (requiresFreshSnapshot) throw error;
 							console.warn("[SaleDetail.Invoice] Failed to rebuild local receipt snapshot", error);
 						}
-						if (mustFilter || needsPaymentTimeKeys || requiresSource) throw new Error("A template-aware local receipt snapshot is required");
+						if (requiresFreshSnapshot) throw new Error("A template-aware local receipt snapshot is required");
 						return {
 							snapshot: embeddedSnapshot || (orderId !== null && orderId !== void 0 ? yield require_serve.getOrderSmallTicketData(orderId) : null),
 							source: null
@@ -129,17 +129,23 @@ function useInvoiceReceiptPreview(context) {
 				const isVirtualSource = require_index.isVirtualSettlementTempOrder(source);
 				if (isVirtualSource && !useSharedConfig) return legacyVirtualResult;
 				const shopInfo = getShopInfo(engineContext);
-				const selected = require_receipt.selectSmallTicketLocale(require_invoiceVisibility.isInvoiceResourceTitleVisible(layout) ? require_formTitleDisplay.withDisplayedReceiptFormTitles(snapshot, (bookingTicket === null || bookingTicket === void 0 || (_bookingTicket$getFor = bookingTicket.getFormTitleMap) === null || _bookingTicket$getFor === void 0 ? void 0 : _bookingTicket$getFor.call(bookingTicket)) || {}, appLocale, (salesDetail === null || salesDetail === void 0 ? void 0 : salesDetail.bookings) || []) : snapshot, appLocale, shopInfo.primary_locale);
-				if (!selected) throw new Error("Receipt language data is unavailable");
-				return {
-					receipt: require_receipt.buildInvoiceReceiptViewModel({
-						data: selected.data,
+				const buildReceipt = (locale) => {
+					var _bookingTicket$getFor;
+					const selected = require_receipt.selectSmallTicketLocale(snapshot, locale, shopInfo.primary_locale, !locales);
+					if (!selected) throw new Error(`Receipt language data is unavailable: ${locale}`);
+					return require_receipt.buildInvoiceReceiptViewModel({
+						data: require_invoiceVisibility.isInvoiceResourceTitleVisible(layout) ? require_formTitleDisplay.withDisplayedReceiptFormTitles(selected.data, (bookingTicket === null || bookingTicket === void 0 || (_bookingTicket$getFor = bookingTicket.getFormTitleMap) === null || _bookingTicket$getFor === void 0 ? void 0 : _bookingTicket$getFor.call(bookingTicket)) || {}, selected.locale, (salesDetail === null || salesDetail === void 0 ? void 0 : salesDetail.bookings) || []) : selected.data,
 						layout,
 						locale: selected.locale,
 						previewTime: require_receipt.formatReceiptPreviewTime(previewCreatedAt, selected.locale),
 						shopLogo: getShopLogo(shopInfo),
 						taxNumberLabel: shopInfo.tax_number_title || (String(shopInfo.tax_country_code || "").toUpperCase() === "AU" ? "ABN" : void 0)
-					}),
+					});
+				};
+				const receipt = buildReceipt((locales === null || locales === void 0 ? void 0 : locales[0]) || appLocale);
+				if (locales === null || locales === void 0 ? void 0 : locales[1]) receipt.secondary = buildReceipt(locales[1]);
+				return {
+					receipt,
 					source,
 					useLegacyVirtualCurrencyInvoice: false,
 					useVirtualCurrencyReceipt: useSharedConfig && isVirtualSource

package/lib/utils/buildCartHolderParams.js

@@ -0,0 +1,172 @@
+const require_objectSpread2 = require("../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js");
+const require_holderConfig = require("./holderConfig.js");
+const require_utils = require("../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 = require_utils.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: require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, holder), {}, { 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 || !require_holderConfig.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 && require_holderConfig.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 (!require_holderConfig.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 = require_utils.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
+exports.buildCartHolderOption = buildCartHolderOption;
+exports.buildCartHolderParams = buildCartHolderParams;
+exports.getAppointmentCartHolderConfig = getAppointmentCartHolderConfig;
+exports.getSkuRelationFormId = getSkuRelationFormId;
+exports.getVenueCartHolderConfig = getVenueCartHolderConfig;
+exports.handleCartHolderFormSuccess = handleCartHolderFormSuccess;
+exports.validateRequiredCartHolders = validateRequiredCartHolders;

package/lib/utils/holderConfig.js

@@ -0,0 +1,7 @@
+//#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
+exports.isHolderConfigEnabled = isHolderConfigEnabled;
+exports.isHolderConfigRequired = isHolderConfigRequired;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.12.355",
+  "version": "6.12.357",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -74,10 +74,10 @@
     "styled-components": "^6.0.0-rc.3",
     "use-sync-external-store": "^1.6.0",
     "@pisell/pi-payment-sdk": "0.0.4",
+    "@pisell/materials": "6.12.86",
     "@pisell/utils": "3.0.7",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.12",
-    "@pisell/materials": "6.12.86"
+    "@pisell/date-picker": "3.0.12"
   },
   "peerDependencies": {
     "react": "^18.0.0",