@pisell/private-materials 6.12.367 → 6.12.368

package/lib/plus/invoice/ReceiptRenderer.js

@@ -288,8 +288,9 @@ function bookingHeadersAreVisible(config) {
 	return require_invoiceVisibility.isInvoiceFieldVisible(config, "booking");
 }
 const renderBrand = ({ config, receipt }) => {
-	var _receipt$secondary2, _receipt$secondary3;
+	var _receipt$secondary2, _receipt$secondary3, _receipt$secondary4;
 	const base = receipt.baseData;
+	const isJapaneseEnglish = receipt.locale.toLowerCase().startsWith("ja") && ((_receipt$secondary2 = receipt.secondary) === null || _receipt$secondary2 === void 0 ? void 0 : _receipt$secondary2.locale.toLowerCase().startsWith("en"));
 	const show = (field) => require_invoiceVisibility.isInvoiceFieldVisible(config, field);
 	const logo = show("logo") && receipt.brandLogo;
 	const name = show("store_name") && base.shop_name;
@@ -301,7 +302,7 @@ const renderBrand = ({ config, receipt }) => {
 	return /* @__PURE__ */ react.default.createElement("section", { className: `${PREFIX}__receipt-brand` }, logo ? /* @__PURE__ */ react.default.createElement("img", {
 		alt: "",
 		src: receipt.brandLogo
-	}) : null, name ? /* @__PURE__ */ react.default.createElement("h2", null, require_receiptTranslations.bilingualText(base.shop_name, (_receipt$secondary2 = receipt.secondary) === null || _receipt$secondary2 === void 0 ? void 0 : _receipt$secondary2.baseData.shop_name)) : null, taxNumber ? /* @__PURE__ */ react.default.createElement("div", null, receipt.taxNumberLabel ? `${receipt.taxNumberLabel}: ` : "", base.shop_tax_number) : null, address ? /* @__PURE__ */ react.default.createElement("div", null, require_receiptTranslations.bilingualText(base.shop_address, (_receipt$secondary3 = receipt.secondary) === null || _receipt$secondary3 === void 0 ? void 0 : _receipt$secondary3.baseData.shop_address)) : null, phone ? /* @__PURE__ */ react.default.createElement("div", null, base.shop_phone) : null, title ? /* @__PURE__ */ react.default.createElement("strong", { className: `${PREFIX}__receipt-bill-title` }, require_receiptTranslations.receiptLabel(receipt, receipt.billTitle)) : null);
+	}) : null, name ? /* @__PURE__ */ react.default.createElement("h2", null, require_receiptTranslations.bilingualText(base.shop_name, (_receipt$secondary3 = receipt.secondary) === null || _receipt$secondary3 === void 0 ? void 0 : _receipt$secondary3.baseData.shop_name)) : null, taxNumber ? /* @__PURE__ */ react.default.createElement("div", null, receipt.taxNumberLabel ? `${receipt.taxNumberLabel}: ` : "", base.shop_tax_number) : null, address ? /* @__PURE__ */ react.default.createElement("div", null, require_receiptTranslations.bilingualText(base.shop_address, (_receipt$secondary4 = receipt.secondary) === null || _receipt$secondary4 === void 0 ? void 0 : _receipt$secondary4.baseData.shop_address)) : null, phone ? /* @__PURE__ */ react.default.createElement("div", null, base.shop_phone) : null, title ? /* @__PURE__ */ react.default.createElement("strong", { className: `${PREFIX}__receipt-bill-title` }, isJapaneseEnglish ? label(receipt.billTitle, "en") : require_receiptTranslations.receiptLabel(receipt, receipt.billTitle)) : null);
 };
 /** Stable row keys survive translation; localized labels are never selectors. */
 function visibleSemanticRows(rows, config, fields) {
@@ -329,8 +330,8 @@ const renderOrder = ({ config, receipt }) => {
 	}) : null);
 };
 const renderCustom = ({ config, receipt }) => {
-	var _receipt$secondary4;
-	return renderCustomModule(config, receipt.locale, (_receipt$secondary4 = receipt.secondary) === null || _receipt$secondary4 === void 0 ? void 0 : _receipt$secondary4.locale);
+	var _receipt$secondary5;
+	return renderCustomModule(config, receipt.locale, (_receipt$secondary5 = receipt.secondary) === null || _receipt$secondary5 === void 0 ? void 0 : _receipt$secondary5.locale);
 };
 const MODULE_RENDERERS = {
 	reference: ({ receipt }) => receipt.reference ? /* @__PURE__ */ react.default.createElement("section", { className: `${PREFIX}__receipt-reference` }, /* @__PURE__ */ react.default.createElement("span", null, require_receiptTranslations.receiptLabel(receipt, "Reference")), /* @__PURE__ */ react.default.createElement("strong", null, receipt.reference)) : null,
@@ -349,8 +350,8 @@ const MODULE_RENDERERS = {
 	line_groups: ({ config, receipt }) => {
 		const showBookingHeaders = bookingHeadersAreVisible(config);
 		const lineGroups = showBookingHeaders ? receipt.lineGroups.filter((group) => {
-			var _receipt$secondary5;
-			return group.products.length || lineGroupMetaRows(group, receipt.locale, (_receipt$secondary5 = receipt.secondary) === null || _receipt$secondary5 === void 0 ? void 0 : _receipt$secondary5.locale).length;
+			var _receipt$secondary6;
+			return group.products.length || lineGroupMetaRows(group, receipt.locale, (_receipt$secondary6 = receipt.secondary) === null || _receipt$secondary6 === void 0 ? void 0 : _receipt$secondary6.locale).length;
 		}) : receipt.products.length ? [{
 			key: "all-items",
 			products: receipt.products,
@@ -361,12 +362,12 @@ const MODULE_RENDERERS = {
 			locale: receipt.locale,
 			rows: tableRows
 		}), lineGroups.map((group) => {
-			var _receipt$secondary6;
+			var _receipt$secondary7;
 			return /* @__PURE__ */ react.default.createElement(LineGroup, {
 				group,
 				key: group.key,
 				locale: receipt.locale,
-				secondaryLocale: (_receipt$secondary6 = receipt.secondary) === null || _receipt$secondary6 === void 0 ? void 0 : _receipt$secondary6.locale,
+				secondaryLocale: (_receipt$secondary7 = receipt.secondary) === null || _receipt$secondary7 === void 0 ? void 0 : _receipt$secondary7.locale,
 				config
 			});
 		})) : null;
@@ -402,8 +403,8 @@ const MODULE_RENDERERS = {
 		locale: receipt.locale
 	})) : null,
 	total_savings: ({ config, receipt }) => {
-		var _receipt$secondary7;
-		return receipt.totalSavings ? /* @__PURE__ */ react.default.createElement("section", null, /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}__receipt-savings` }, /* @__PURE__ */ react.default.createElement("strong", null, require_receiptTranslations.receiptLabel(receipt, "Total Savings")), /* @__PURE__ */ react.default.createElement("strong", null, receipt.totalSavings)), require_invoiceVisibility.isInvoiceFieldVisible(config, "description") && receipt.totalSavingsDescription ? /* @__PURE__ */ react.default.createElement("p", { className: `${PREFIX}__receipt-savings-description` }, require_receiptTranslations.bilingualText(receipt.totalSavingsDescription, (_receipt$secondary7 = receipt.secondary) === null || _receipt$secondary7 === void 0 ? void 0 : _receipt$secondary7.totalSavingsDescription)) : null) : null;
+		var _receipt$secondary8;
+		return receipt.totalSavings ? /* @__PURE__ */ react.default.createElement("section", null, /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}__receipt-savings` }, /* @__PURE__ */ react.default.createElement("strong", null, require_receiptTranslations.receiptLabel(receipt, "Total Savings")), /* @__PURE__ */ react.default.createElement("strong", null, receipt.totalSavings)), require_invoiceVisibility.isInvoiceFieldVisible(config, "description") && receipt.totalSavingsDescription ? /* @__PURE__ */ react.default.createElement("p", { className: `${PREFIX}__receipt-savings-description` }, require_receiptTranslations.bilingualText(receipt.totalSavingsDescription, (_receipt$secondary8 = receipt.secondary) === null || _receipt$secondary8 === void 0 ? void 0 : _receipt$secondary8.totalSavingsDescription)) : null) : null;
 	},
 	custom_3: renderCustom,
 	barcode: ({ receipt }) => receipt.barcodeValue ? /* @__PURE__ */ react.default.createElement("section", { className: `${PREFIX}__receipt-barcode` }, /* @__PURE__ */ react.default.createElement(_pisell_materials.QRCode, {

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

@@ -566,11 +566,17 @@ const SalesSdkProvider = ({ osKey, enableMultiCurrencySettlement = false, soluti
 			snapshotPreserved: false
 		};
 	});
+	const isOrderBootstrapPending = lifecycleOwner === "provider" && (autoRestoreOnInit || Boolean(autoBootstrap && orderId)) && settledBootstrapKey !== bootstrapKey;
+	const syncBusinessCode = businessCode || moduleOtherParams.businessCode || (otherParams === null || otherParams === void 0 ? void 0 : otherParams.business_code);
 	const { publishTempOrder } = require_useSalesSdkTempOrderSync.useSalesSdkTempOrderSync({
 		enabled: enableTempOrderSync,
-		ready: !(lifecycleOwner === "provider" && (autoRestoreOnInit || Boolean(autoBootstrap && orderId)) && settledBootstrapKey !== bootstrapKey),
+		ready: !isOrderBootstrapPending,
 		isActive,
 		osKey: (osKey === null || osKey === void 0 || (_osKey$replace = osKey.replace) === null || _osKey$replace === void 0 ? void 0 : _osKey$replace.call(osKey, "bookingTicket-", "")) || osKey,
+		salesContext: typeof syncBusinessCode === "string" && syncBusinessCode.trim() ? {
+			businessCode: syncBusinessCode,
+			channel: productLoadChannel
+		} : void 0,
 		bookingTicket,
 		refreshRootSnapshot
 	});

package/lib/plus/salesSdk/hooks/useSalesSdkTempOrderSync.js

@@ -18,6 +18,13 @@ function getPayloadRevision(payload) {
 function getPayloadSourceKey(payload) {
 	return `${payload.osKey}:${payload.sourceId}`;
 }
+function getSalesContextKey(salesContext) {
+	return JSON.stringify([salesContext === null || salesContext === void 0 ? void 0 : salesContext.businessCode, salesContext === null || salesContext === void 0 ? void 0 : salesContext.channel]);
+}
+function isSalesContextAlignedWithOrder(tempOrder, salesContext) {
+	const orderBusinessCode = tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.business_code;
+	return !salesContext || typeof orderBusinessCode !== "string" || !orderBusinessCode.trim() || orderBusinessCode === salesContext.businessCode;
+}
 function resolvePayloadDiscountState(payload) {
 	var _payload$tempOrder;
 	if (payload.discountState) return (0, lodash.cloneDeep)(payload.discountState);
@@ -51,7 +58,7 @@ function isWalletSnapshotAlignedWithCurrentOrder(bookingTicket, snapshot) {
 * 两端都可发布本地变更、接收同 osKey 快照；页面激活时向更早激活的对端补拉。
 * 远端快照应用期间禁止再次发布，避免 replaceTempOrder 触发 refresh 后形成回环。
 */
-function useSalesSdkTempOrderSync({ enabled, ready = true, isActive = true, osKey, bookingTicket, refreshRootSnapshot }) {
+function useSalesSdkTempOrderSync({ enabled, ready = true, isActive = true, osKey, salesContext, bookingTicket, refreshRootSnapshot }) {
 	var _context$appHelper, _context$appHelper$ge, _app$getPlugin, _unifiedCommunication;
 	const context = require_useEngineContext.default();
 	const app = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getApp) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper);
@@ -80,13 +87,19 @@ function useSalesSdkTempOrderSync({ enabled, ready = true, isActive = true, osKe
 	const latestOfferedRevisionBySourceRef = (0, react.useRef)(/* @__PURE__ */ new Map());
 	const applyQueueRef = (0, react.useRef)(Promise.resolve());
 	const lastAppliedRemoteOriginRef = (0, react.useRef)(null);
+	const salesContextKey = getSalesContextKey(salesContext);
+	const previousSalesContextKeyRef = (0, react.useRef)(salesContextKey);
 	isActiveRef.current = isActive;
 	readyRef.current = ready;
 	const getPeerTarget = (0, ahooks.useMemoizedFn)((role) => require_tempOrderSync.resolveTempOrderSyncPeerTarget(role, endpoints));
-	/** 在触发发布时一次性深拷贝订单与折扣上下文，避免防抖期间 OS 原地修改造成版本错配。 */
+	/** 发布时一起拷贝订单、业务与折扣上下文，避免防抖期间 OS 原地修改造成版本错配。 */
 	const captureRuntimeSnapshot = (0, ahooks.useMemoizedFn)((tempOrder, causalOrigin) => {
 		const snapshot = {
 			tempOrder,
+			salesContext: require_tempOrderSync.resolveTempOrderSyncSalesContext({
+				tempOrder,
+				salesContext
+			}),
 			causalOrigin
 		};
 		if (!bookingTicket) return require_tempOrderSync.cloneTempOrderSyncSnapshot(snapshot);
@@ -113,6 +126,12 @@ function useSalesSdkTempOrderSync({ enabled, ready = true, isActive = true, osKe
 		var _ref = require_asyncToGenerator._asyncToGenerator(function* (snapshot, options = {}) {
 			if (!enabled || !ready || !screenRole || !isActiveRef.current) return;
 			if (remoteApplyingRef.current && !options.responseToRequestId) return;
+			if (!isSalesContextAlignedWithOrder(snapshot.tempOrder, snapshot.salesContext)) return;
+			const currentSalesContext = require_tempOrderSync.resolveTempOrderSyncSalesContext({
+				tempOrder: snapshot.tempOrder,
+				salesContext
+			});
+			if (getSalesContextKey(snapshot.salesContext) !== getSalesContextKey(currentSalesContext)) return;
 			if (options.incrementRevision !== false) revisionRef.current += 1;
 			try {
 				var _snapshot$causalOrigi, _unifiedCommunication2, _unifiedCommunication3;
@@ -135,6 +154,7 @@ function useSalesSdkTempOrderSync({ enabled, ready = true, isActive = true, osKe
 						timestamp: Date.now(),
 						isActive: true,
 						tempOrder: snapshot.tempOrder,
+						salesContext: snapshot.salesContext,
 						discountState: snapshot.discountState,
 						walletAssetsSnapshot: snapshot.walletAssetsSnapshot
 					},
@@ -162,7 +182,7 @@ function useSalesSdkTempOrderSync({ enabled, ready = true, isActive = true, osKe
 	});
 	const publishTempOrder = (0, ahooks.useMemoizedFn)((tempOrder, options = {}) => {
 		var _lastAppliedRemoteOri;
-		if (!enabled || !ready || !screenRole || !isActiveRef.current || remoteApplyingRef.current) return;
+		if (!enabled || !ready || !screenRole || !isActiveRef.current || remoteApplyingRef.current || !isSalesContextAlignedWithOrder(tempOrder, salesContext)) return;
 		const causalOrigin = options.preserveRemoteOrigin ? (_lastAppliedRemoteOri = lastAppliedRemoteOriginRef.current) !== null && _lastAppliedRemoteOri !== void 0 ? _lastAppliedRemoteOri : void 0 : void 0;
 		if (!options.preserveRemoteOrigin) {
 			lastAppliedRemoteOriginRef.current = null;
@@ -477,6 +497,26 @@ function useSalesSdkTempOrderSync({ enabled, ready = true, isActive = true, osKe
 		applyPayload,
 		cancelDebouncedPublish
 	]);
+	(0, react.useEffect)(() => {
+		var _bookingTicket$getTem5, _bookingTicket$getTem6;
+		if (previousSalesContextKeyRef.current === salesContextKey) return;
+		cancelDebouncedPublish();
+		if (!enabled || !ready || !isActive || screenRole !== "main" || !salesContext || !bookingTicket || remoteApplyingRef.current) return;
+		const tempOrder = (_bookingTicket$getTem5 = (_bookingTicket$getTem6 = bookingTicket.getTempOrder) === null || _bookingTicket$getTem6 === void 0 ? void 0 : _bookingTicket$getTem6.call(bookingTicket)) !== null && _bookingTicket$getTem5 !== void 0 ? _bookingTicket$getTem5 : null;
+		if (!isSalesContextAlignedWithOrder(tempOrder, salesContext)) return;
+		previousSalesContextKeyRef.current = salesContextKey;
+		publishTempOrder(tempOrder);
+	}, [
+		salesContextKey,
+		bookingTicket,
+		enabled,
+		ready,
+		isActive,
+		osKey,
+		screenRole,
+		publishTempOrder,
+		cancelDebouncedPublish
+	]);
 	(0, react.useEffect)(() => () => {
 		activationEpochRef.current += 1;
 		activationKeyRef.current = null;

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

@@ -0,0 +1 @@
+export { };

package/lib/plus/salesSdk/tempOrderSync.js

@@ -21,6 +21,16 @@ function getMessageData(event) {
 function isRecord(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
+function isSalesContext(value) {
+	return isRecord(value) && typeof value.businessCode === "string" && value.businessCode.trim().length > 0 && (value.channel === void 0 || typeof value.channel === "string" && value.channel.trim().length > 0);
+}
+/** 旧发送端只有订单字段；它无法证明销售渠道，因此不推测 channel。 */
+function resolveTempOrderSyncSalesContext(payload) {
+	var _payload$tempOrder;
+	if (payload.salesContext) return payload.salesContext;
+	const businessCode = (_payload$tempOrder = payload.tempOrder) === null || _payload$tempOrder === void 0 ? void 0 : _payload$tempOrder.business_code;
+	return typeof businessCode === "string" && businessCode.trim() ? { businessCode } : void 0;
+}
 function isWalletAssetsSnapshot(value) {
 	if (!isRecord(value) || !isRecord(value.state)) return false;
 	const state = value.state;
@@ -42,6 +52,7 @@ function getTempOrderSyncPayload(event) {
 	if (payload.activeSince !== void 0 && !Number.isFinite(payload.activeSince)) return null;
 	if (!Object.prototype.hasOwnProperty.call(payload, "tempOrder")) return null;
 	if (payload.tempOrder !== null && (typeof payload.tempOrder !== "object" || Array.isArray(payload.tempOrder))) return null;
+	if (payload.salesContext !== void 0 && !isSalesContext(payload.salesContext)) return null;
 	if (payload.discountState !== void 0) {
 		if (!payload.discountState || typeof payload.discountState !== "object" || Array.isArray(payload.discountState) || !Array.isArray(payload.discountState.discountList) || !Array.isArray(payload.discountState.originalDiscountList)) return null;
 	}
@@ -93,6 +104,7 @@ exports.cloneTempOrderSyncSnapshot = cloneTempOrderSyncSnapshot;
 exports.getTempOrderSyncPayload = getTempOrderSyncPayload;
 exports.getTempOrderSyncRequestPayload = getTempOrderSyncRequestPayload;
 exports.resolveTempOrderSyncPeerTarget = resolveTempOrderSyncPeerTarget;
+exports.resolveTempOrderSyncSalesContext = resolveTempOrderSyncSalesContext;
 exports.resolveTempOrderSyncScreenRole = resolveTempOrderSyncScreenRole;
 exports.shouldApplySharedTempOrderPayload = shouldApplySharedTempOrderPayload;
 exports.shouldRespondToTempOrderSyncRequest = shouldRespondToTempOrderSyncRequest;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.12.367",
+  "version": "6.12.368",
   "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/date-picker": "3.0.12",
     "@pisell/utils": "3.0.7",
     "@pisell/materials": "6.12.87",
-    "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.12"
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",