@pisell/private-materials 6.12.157 → 6.12.158

package/lib/components/checkout/components/PaymentOptionsModule/PaymentMethodItem.js

@@ -13,7 +13,7 @@ let classnames = require("classnames");
 classnames = require_runtime.__toESM(classnames);
 require("./index.less");
 //#region src/components/checkout/components/PaymentOptionsModule/PaymentMethodItem.tsx
-const PaymentMethodItem = ({ method, amountSymbol, customAmount, disabled = false, onClick, getText, size = "default", surchargeDisplay, directCustomPayment = false, currentBaseSales }) => {
+const PaymentMethodItem = ({ method, amountSymbol, customAmount, disabled = false, onClick, getText, size = "default", surchargeDisplay, directCustomPayment = false, beginKioskPaymentActivity, currentBaseSales }) => {
 	var _context$appHelper;
 	const context = require_useEngineContext.default();
 	const { getData, getApp } = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {};
@@ -72,17 +72,25 @@ const PaymentMethodItem = ({ method, amountSymbol, customAmount, disabled = fals
 		var _ref = require_asyncToGenerator._asyncToGenerator(function* () {
 			if (isEftpos) return;
 			if (paymentChannel === "kiosk") {
+				const finishPaymentActivity = beginKioskPaymentActivity === null || beginKioskPaymentActivity === void 0 ? void 0 : beginKioskPaymentActivity(`authorization:${method.code || "unknown"}`);
+				if (beginKioskPaymentActivity && !finishPaymentActivity) return;
 				try {
 					var _currentBaseSales$get, _window;
 					const otherParams = (yield Promise.resolve(currentBaseSales === null || currentBaseSales === void 0 || (_currentBaseSales$get = currentBaseSales.getOtherParams) === null || _currentBaseSales$get === void 0 ? void 0 : _currentBaseSales$get.call(currentBaseSales))) || (currentBaseSales === null || currentBaseSales === void 0 ? void 0 : currentBaseSales.otherParams) || {};
-					(_window = window) === null || _window === void 0 || (_window = _window.app) === null || _window === void 0 || _window.applicationManager.get("global").runFunction("authorizeAction", { params: {
-						action: "pay",
-						business_code: otherParams.businessCode || otherParams.business_code,
-						paymentMethodCode: method.code,
-						paymentMethodType: method.type,
-						amount: customAmount
-					} });
+					if (finishPaymentActivity && !finishPaymentActivity.isActive()) return;
+					const authorizationResult = yield Promise.resolve((_window = window) === null || _window === void 0 || (_window = _window.app) === null || _window === void 0 ? void 0 : _window.applicationManager.get("global").runFunction("authorizeAction", {
+						onClose: finishPaymentActivity,
+						params: {
+							action: "pay",
+							business_code: otherParams.businessCode || otherParams.business_code,
+							paymentMethodCode: method.code,
+							paymentMethodType: method.type,
+							amount: customAmount
+						}
+					}));
+					if (String((authorizationResult === null || authorizationResult === void 0 ? void 0 : authorizationResult.status) || "").toLowerCase() !== "success") finishPaymentActivity === null || finishPaymentActivity === void 0 || finishPaymentActivity();
 				} catch (error) {
+					finishPaymentActivity === null || finishPaymentActivity === void 0 || finishPaymentActivity();
 					console.error("[PaymentMethodItem] request payment authorization failed", error);
 				}
 				return;

package/lib/components/checkout/components/PaymentOptionsModule/index.js

@@ -13,7 +13,7 @@ classnames = require_runtime.__toESM(classnames);
 let ahooks = require("ahooks");
 require("./index.less");
 //#region src/components/checkout/components/PaymentOptionsModule/index.tsx
-function PaymentOptionsModule({ amountSymbol, orderInfo, onClick, paymentMethods = [], customAmount, title, disabled = false, showCashPayment = false, channel = "pos", columnCount, sciSurchargeDisplayMap = {}, directCustomPayment = false, isModalOpen = false, paymentMethodsReady = false, autoTriggerSinglePaymentOption = false, currentBaseSales }) {
+function PaymentOptionsModule({ amountSymbol, orderInfo, onClick, paymentMethods = [], customAmount, title, disabled = false, showCashPayment = false, channel = "pos", columnCount, sciSurchargeDisplayMap = {}, directCustomPayment = false, isModalOpen = false, paymentMethodsReady = false, autoTriggerSinglePaymentOption = false, beginKioskPaymentActivity, currentBaseSales }) {
 	var _context$appHelper, _context$appHelper$ge, _context$appHelper$ge2, _context$appHelper$ut;
 	const context = require_useEngineContext.default();
 	_pisell_utils.locales.init(require_locales.default, ((_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 || (_context$appHelper$ge = _context$appHelper$ge.call(_context$appHelper)) === null || _context$appHelper$ge === void 0 || (_context$appHelper$ge = _context$appHelper$ge.locales) === null || _context$appHelper$ge === void 0 || (_context$appHelper$ge2 = _context$appHelper$ge.getLocale) === null || _context$appHelper$ge2 === void 0 ? void 0 : _context$appHelper$ge2.call(_context$appHelper$ge)) || ((_context$appHelper$ut = context.appHelper.utils) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut = _context$appHelper$ut.storage) === null || _context$appHelper$ut === void 0 ? void 0 : _context$appHelper$ut.get("umi_locale")) || "en");
@@ -89,6 +89,7 @@ function PaymentOptionsModule({ amountSymbol, orderInfo, onClick, paymentMethods
 		getText,
 		surchargeDisplay: sciSurchargeDisplayMap[String(method.id)],
 		directCustomPayment,
+		beginKioskPaymentActivity,
 		currentBaseSales
 	})))));
 }

package/lib/components/checkout/components/SearchAndClientModule/index.js

@@ -73,7 +73,7 @@ function extractContactsInfo(customer) {
 }
 const SearchAndClientModule = (props) => {
 	var _context$appHelper2, _baseSales$getBooking, _baseSales$getBooking2, _bookingConfig$config, _context$appHelper4;
-	const { disabledSwitch, clientInfo, onSearch, onClientChange, baseSales: propBaseSales, baseSalesModuleName, enableScanner = true, showCustomerSelect = true } = props;
+	const { disabledSwitch, clientInfo, onSearch, beginScanActivity, onClientChange, baseSales: propBaseSales, baseSalesModuleName, enableScanner = true, showCustomerSelect = true } = props;
 	const [loading, setLoading] = (0, react.useState)(false);
 	const [customerLoading, setCustomerLoading] = (0, react.useState)(false);
 	const [customerLoadingMore, setCustomerLoadingMore] = (0, react.useState)(false);
@@ -113,9 +113,15 @@ const SearchAndClientModule = (props) => {
 	const handleFindSearch = (0, react.useCallback)(function() {
 		var _ref2 = require_asyncToGenerator._asyncToGenerator(function* (keyword) {
 			if (!(keyword === null || keyword === void 0 ? void 0 : keyword.trim())) return;
+			const finishScanActivity = beginScanActivity === null || beginScanActivity === void 0 ? void 0 : beginScanActivity();
+			if (beginScanActivity && !finishScanActivity) {
+				var _findRef$current;
+				(_findRef$current = findRef.current) === null || _findRef$current === void 0 || _findRef$current.setKeyword("");
+				return;
+			}
 			setLoading(true);
 			try {
-				var _findRef$current;
+				var _findRef$current2;
 				const res = yield onSearch === null || onSearch === void 0 ? void 0 : onSearch(keyword);
 				const sharedAsset = res === null || res === void 0 ? void 0 : res.asset;
 				if (!(Boolean(sharedAsset) || (Array.isArray(res === null || res === void 0 ? void 0 : res.data) ? res.data.length > 0 : Boolean(res === null || res === void 0 ? void 0 : res.data)))) {
@@ -137,11 +143,12 @@ const SearchAndClientModule = (props) => {
 						return;
 					}
 					const _customer = require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, customer), {}, { latest_wallet_detail: rest });
-					(_clientSelectorRef$cu = clientSelectorRef.current) === null || _clientSelectorRef$cu === void 0 || (_clientSelectorRef$cu2 = _clientSelectorRef$cu.handleSetClient) === null || _clientSelectorRef$cu2 === void 0 || _clientSelectorRef$cu2.call(_clientSelectorRef$cu, _customer, { sameClientTip: _pisell_utils.locales.getText("pisell2.checkout.client-card.tip.same-client") });
+					yield (_clientSelectorRef$cu = clientSelectorRef.current) === null || _clientSelectorRef$cu === void 0 || (_clientSelectorRef$cu2 = _clientSelectorRef$cu.handleSetClient) === null || _clientSelectorRef$cu2 === void 0 ? void 0 : _clientSelectorRef$cu2.call(_clientSelectorRef$cu, _customer, { sameClientTip: _pisell_utils.locales.getText("pisell2.checkout.client-card.tip.same-client") });
 				}
-				(_findRef$current = findRef.current) === null || _findRef$current === void 0 || _findRef$current.setKeyword("");
+				(_findRef$current2 = findRef.current) === null || _findRef$current2 === void 0 || _findRef$current2.setKeyword("");
 			} catch (error) {} finally {
 				setLoading(false);
+				finishScanActivity === null || finishScanActivity === void 0 || finishScanActivity();
 			}
 		});
 		return function(_x) {
@@ -149,6 +156,7 @@ const SearchAndClientModule = (props) => {
 		};
 	}(), [
 		Toast,
+		beginScanActivity,
 		disabledSwitch,
 		onSearch
 	]);

package/lib/components/checkout/hooks/useCheckoutPaymentScanActivity.js

@@ -0,0 +1,81 @@
+require("../../../_virtual/_rolldown/runtime.js");
+let react = require("react");
+let ahooks = require("ahooks");
+//#region src/components/checkout/hooks/useCheckoutPaymentScanActivity.ts
+const NOOP_RELEASE = () => void 0;
+/**
+* Checkout 内部的支付/扫码双向活动锁。
+*
+* 同步 ref 用于事件回调的竞态判断，React state 只用于驱动禁用态。
+* 同一时刻只允许一个活动成功占锁，避免扫码和支付在 React rerender 前同时进入。
+*/
+function useCheckoutPaymentScanActivity(enabled) {
+	const activeActivityRef = (0, react.useRef)();
+	const mountedRef = (0, react.useRef)(true);
+	const [isPaymentProcessing, setIsPaymentProcessing] = (0, react.useState)(false);
+	const [isScanProcessing, setIsScanProcessing] = (0, react.useState)(false);
+	const tryBeginActivity = (0, ahooks.useMemoizedFn)((type) => {
+		if (!enabled) return NOOP_RELEASE;
+		if (activeActivityRef.current) return null;
+		const token = Symbol(type);
+		activeActivityRef.current = {
+			token,
+			type
+		};
+		if (mountedRef.current) {
+			setIsPaymentProcessing(type === "payment");
+			setIsScanProcessing(type === "scan");
+		}
+		let released = false;
+		return () => {
+			var _activeActivityRef$cu;
+			if (released) return;
+			released = true;
+			if (((_activeActivityRef$cu = activeActivityRef.current) === null || _activeActivityRef$cu === void 0 ? void 0 : _activeActivityRef$cu.token) !== token) return;
+			activeActivityRef.current = void 0;
+			if (mountedRef.current) {
+				setIsPaymentProcessing(false);
+				setIsScanProcessing(false);
+			}
+		};
+	});
+	const tryBeginPayment = (0, ahooks.useMemoizedFn)(() => tryBeginActivity("payment"));
+	const tryBeginScan = (0, ahooks.useMemoizedFn)(() => tryBeginActivity("scan"));
+	const getIsPaymentProcessing = (0, ahooks.useMemoizedFn)(() => {
+		var _activeActivityRef$cu2;
+		return enabled && ((_activeActivityRef$cu2 = activeActivityRef.current) === null || _activeActivityRef$cu2 === void 0 ? void 0 : _activeActivityRef$cu2.type) === "payment";
+	});
+	const getIsScanProcessing = (0, ahooks.useMemoizedFn)(() => {
+		var _activeActivityRef$cu3;
+		return enabled && ((_activeActivityRef$cu3 = activeActivityRef.current) === null || _activeActivityRef$cu3 === void 0 ? void 0 : _activeActivityRef$cu3.type) === "scan";
+	});
+	(0, react.useEffect)(() => {
+		mountedRef.current = true;
+		return () => {
+			mountedRef.current = false;
+		};
+	}, []);
+	(0, react.useEffect)(() => {
+		if (enabled) return;
+		activeActivityRef.current = void 0;
+		setIsPaymentProcessing(false);
+		setIsScanProcessing(false);
+	}, [enabled]);
+	return (0, react.useMemo)(() => ({
+		tryBeginPayment,
+		tryBeginScan,
+		getIsPaymentProcessing,
+		getIsScanProcessing,
+		isPaymentProcessing,
+		isScanProcessing
+	}), [
+		tryBeginPayment,
+		tryBeginScan,
+		getIsPaymentProcessing,
+		getIsScanProcessing,
+		isPaymentProcessing,
+		isScanProcessing
+	]);
+}
+//#endregion
+exports.default = useCheckoutPaymentScanActivity;

package/lib/components/checkout/hooks/useSharedWalletPass.js

@@ -65,6 +65,8 @@ function useSharedWalletPass(props) {
 	const [loadingAction, setLoadingAction] = (0, react.useState)(false);
 	const deferWalletStateRef = (0, react.useRef)(false);
 	const deferredWalletStateRef = (0, react.useRef)(null);
+	const pendingSearchApplyRef = (0, react.useRef)(null);
+	const pendingSearchApplyAttachedRef = (0, react.useRef)(false);
 	(0, react.useEffect)(() => {
 		var _baseSales$getWalletA2, _baseSales$getDiscoun2;
 		const current = baseSales === null || baseSales === void 0 || (_baseSales$getWalletA2 = baseSales.getWalletAssetsState) === null || _baseSales$getWalletA2 === void 0 ? void 0 : _baseSales$getWalletA2.call(baseSales);
@@ -95,8 +97,35 @@ function useSharedWalletPass(props) {
 		};
 	}, [baseSales]);
 	(0, react.useEffect)(() => {
-		onSelectChange === null || onSelectChange === void 0 || onSelectChange(toSelection(state));
+		let notification;
+		try {
+			notification = onSelectChange === null || onSelectChange === void 0 ? void 0 : onSelectChange(toSelection(state));
+		} catch (error) {
+			var _pendingSearchApplyRe;
+			(_pendingSearchApplyRe = pendingSearchApplyRef.current) === null || _pendingSearchApplyRe === void 0 || _pendingSearchApplyRe.call(pendingSearchApplyRef);
+			pendingSearchApplyRef.current = null;
+			pendingSearchApplyAttachedRef.current = false;
+			throw error;
+		}
+		const resolvePendingSearch = pendingSearchApplyRef.current;
+		if (resolvePendingSearch && !pendingSearchApplyAttachedRef.current) {
+			pendingSearchApplyAttachedRef.current = true;
+			const finishPendingSearch = () => {
+				if (pendingSearchApplyRef.current === resolvePendingSearch) {
+					pendingSearchApplyRef.current = null;
+					pendingSearchApplyAttachedRef.current = false;
+				}
+				resolvePendingSearch();
+			};
+			Promise.resolve(notification).then(finishPendingSearch, finishPendingSearch);
+		}
 	}, [onSelectChange, state.revision]);
+	(0, react.useEffect)(() => () => {
+		var _pendingSearchApplyRe2;
+		(_pendingSearchApplyRe2 = pendingSearchApplyRef.current) === null || _pendingSearchApplyRe2 === void 0 || _pendingSearchApplyRe2.call(pendingSearchApplyRef);
+		pendingSearchApplyRef.current = null;
+		pendingSearchApplyAttachedRef.current = false;
+	}, []);
 	const selectedWalletIds = (0, react.useMemo)(() => [...state.selectedIds || [], ...state.committedIds || []], [state.committedIds, state.selectedIds]);
 	const committedKeys = (0, react.useMemo)(() => new Set((state.committedIds || []).map((id) => String(id))), [state.committedIds]);
 	const selectedItemByKey = (0, react.useMemo)(() => new Map((state.selectedItems || []).map((asset) => {
@@ -181,14 +210,17 @@ function useSharedWalletPass(props) {
 		}
 	}));
 	const handleSearchIdentificationCode = (0, ahooks.useMemoizedFn)(function() {
-		var _ref7 = require_asyncToGenerator._asyncToGenerator(function* (code) {
+		var _ref7 = require_asyncToGenerator._asyncToGenerator(function* (code, options) {
 			if (!(baseSales === null || baseSales === void 0 ? void 0 : baseSales.scanWalletAsset)) return null;
 			setLoadingAction(true);
 			deferWalletStateRef.current = true;
 			deferredWalletStateRef.current = null;
+			let searchCompleted = false;
+			const initialRevision = state.revision;
 			try {
 				var _asset$customer_id, _asset$holder, _baseSales$getOrderCu, _ref6, _currentCustomer$id;
 				const result = yield baseSales.scanWalletAsset(code);
+				searchCompleted = true;
 				const asset = result === null || result === void 0 ? void 0 : result.asset;
 				const customerId = Number((_asset$customer_id = asset === null || asset === void 0 ? void 0 : asset.customer_id) !== null && _asset$customer_id !== void 0 ? _asset$customer_id : asset === null || asset === void 0 || (_asset$holder = asset.holder) === null || _asset$holder === void 0 ? void 0 : _asset$holder.customer_id);
 				const currentCustomer = baseSales === null || baseSales === void 0 || (_baseSales$getOrderCu = baseSales.getOrderCustomerSnapshot) === null || _baseSales$getOrderCu === void 0 ? void 0 : _baseSales$getOrderCu.call(baseSales);
@@ -208,11 +240,26 @@ function useSharedWalletPass(props) {
 				deferWalletStateRef.current = false;
 				const finalState = (baseSales === null || baseSales === void 0 || (_baseSales$getWalletA3 = baseSales.getWalletAssetsState) === null || _baseSales$getWalletA3 === void 0 ? void 0 : _baseSales$getWalletA3.call(baseSales)) || deferredWalletStateRef.current;
 				deferredWalletStateRef.current = null;
-				if (finalState) setState(finalState);
-				setLoadingAction(false);
+				let waitForApply;
+				try {
+					if (finalState) {
+						if ((options === null || options === void 0 ? void 0 : options.waitForApply) && searchCompleted && !Object.is(finalState.revision, initialRevision)) {
+							var _pendingSearchApplyRe3;
+							(_pendingSearchApplyRe3 = pendingSearchApplyRef.current) === null || _pendingSearchApplyRe3 === void 0 || _pendingSearchApplyRe3.call(pendingSearchApplyRef);
+							pendingSearchApplyAttachedRef.current = false;
+							waitForApply = new Promise((resolve) => {
+								pendingSearchApplyRef.current = resolve;
+							});
+						}
+						setState(finalState);
+					}
+					yield waitForApply;
+				} finally {
+					setLoadingAction(false);
+				}
 			}
 		});
-		return function(_x2) {
+		return function(_x2, _x3) {
 			return _ref7.apply(this, arguments);
 		};
 	}());
@@ -241,7 +288,7 @@ function useSharedWalletPass(props) {
 				setLoadingAction(false);
 			}
 		});
-		return function(_x3) {
+		return function(_x4) {
 			return _ref8.apply(this, arguments);
 		};
 	}());
@@ -284,7 +331,7 @@ function useSharedWalletPass(props) {
 				setLoadingAction(false);
 			}
 		});
-		return function(_x4, _x5, _x6) {
+		return function(_x5, _x6, _x7) {
 			return _ref9.apply(this, arguments);
 		};
 	}());

package/lib/components/checkout/hooks/useWalletPass.js

@@ -121,6 +121,8 @@ const useWalletPass = (props) => {
 	const historyDiscountIdsRef = (0, react.useRef)(/* @__PURE__ */ new Set());
 	const historyDiscountOrderKeyRef = (0, react.useRef)("");
 	const activeClientKeyRef = (0, react.useRef)("");
+	const pendingSearchApplyRef = (0, react.useRef)(null);
+	const pendingSearchApplyAttachedRef = (0, react.useRef)(false);
 	const [searchIdentificationCodeList, setSearchIdentificationCodeList] = (0, react.useState)([]);
 	const [orderInfo, setOrderInfo] = (0, react.useState)({});
 	const [selectedWallet, setSelectedWallet] = (0, react.useState)([]);
@@ -454,10 +456,37 @@ const useWalletPass = (props) => {
 		baseSales
 	]);
 	(0, ahooks.useDebounceEffect)(() => {
-		notifySelectChange(selectedWithDetails);
+		let notification;
+		try {
+			notification = notifySelectChange(selectedWithDetails);
+		} catch (error) {
+			var _pendingSearchApplyRe;
+			(_pendingSearchApplyRe = pendingSearchApplyRef.current) === null || _pendingSearchApplyRe === void 0 || _pendingSearchApplyRe.call(pendingSearchApplyRef);
+			pendingSearchApplyRef.current = null;
+			pendingSearchApplyAttachedRef.current = false;
+			throw error;
+		}
 		setWalletSelect(selectedWithDetails);
 		setLoading(false);
+		const resolvePendingSearch = pendingSearchApplyRef.current;
+		if (resolvePendingSearch && !pendingSearchApplyAttachedRef.current) {
+			pendingSearchApplyAttachedRef.current = true;
+			const finishPendingSearch = () => {
+				if (pendingSearchApplyRef.current === resolvePendingSearch) {
+					pendingSearchApplyRef.current = null;
+					pendingSearchApplyAttachedRef.current = false;
+				}
+				resolvePendingSearch();
+			};
+			Promise.resolve(notification).then(finishPendingSearch, finishPendingSearch);
+		}
 	}, [selectedWithDetails], { wait: 200 });
+	(0, react.useEffect)(() => () => {
+		var _pendingSearchApplyRe2;
+		(_pendingSearchApplyRe2 = pendingSearchApplyRef.current) === null || _pendingSearchApplyRe2 === void 0 || _pendingSearchApplyRe2.call(pendingSearchApplyRef);
+		pendingSearchApplyRef.current = null;
+		pendingSearchApplyAttachedRef.current = false;
+	}, []);
 	const data = (0, react.useMemo)(() => {
 		return require_utils$1.formatMachineCodeServer2CardList((0, _pisell_utils.uniqueByKey)(mergeDataWithInitialOrder([
 			...selectedWithDetails,
@@ -589,6 +618,7 @@ const useWalletPass = (props) => {
 		setNoApplicableVoucher(allDisabledData);
 		setWalletSelect(newValues);
 		setSelectedVoucherIds(newValues.map((item) => item.id));
+		return isAvailableData.length === 1;
 	});
 	const applyWalletInitResult = (0, ahooks.useMemoizedFn)((result) => {
 		var _baseSales$getOrderSn5, _walletApi$getStoredW;
@@ -761,23 +791,31 @@ const useWalletPass = (props) => {
 				select
 			}
 		});
-		onSelectChange === null || onSelectChange === void 0 || onSelectChange(select);
+		return onSelectChange === null || onSelectChange === void 0 ? void 0 : onSelectChange(select);
 	});
 	const handleSearchIdentificationCode = (0, ahooks.useMemoizedFn)(function() {
-		var _ref12 = require_asyncToGenerator._asyncToGenerator(function* (value) {
+		var _ref12 = require_asyncToGenerator._asyncToGenerator(function* (value, options) {
 			var _walletApi$formatWall3;
 			if (!(walletApi === null || walletApi === void 0 ? void 0 : walletApi.searchIdentificationCodeAsync)) return null;
 			const result = yield walletApi.searchIdentificationCodeAsync({
 				code: value,
 				prepare_payments: ((_walletApi$formatWall3 = walletApi.formatWalletPassList2PreparePayments) === null || _walletApi$formatWall3 === void 0 ? void 0 : _walletApi$formatWall3.call(walletApi, selectedWithDetails)) || []
 			});
-			handleSearchIdentificationCodeCompleted({
+			const willApplySelection = handleSearchIdentificationCodeCompleted({
 				currentSearchResults: (result === null || result === void 0 ? void 0 : result.data) || [],
 				cachedSearchResults: searchIdentificationCodeList
 			});
+			if ((options === null || options === void 0 ? void 0 : options.waitForApply) && willApplySelection) {
+				var _pendingSearchApplyRe3;
+				(_pendingSearchApplyRe3 = pendingSearchApplyRef.current) === null || _pendingSearchApplyRe3 === void 0 || _pendingSearchApplyRe3.call(pendingSearchApplyRef);
+				pendingSearchApplyAttachedRef.current = false;
+				yield new Promise((resolve) => {
+					pendingSearchApplyRef.current = resolve;
+				});
+			}
 			return result;
 		});
-		return function(_x3) {
+		return function(_x3, _x4) {
 			return _ref12.apply(this, arguments);
 		};
 	}());
@@ -927,7 +965,7 @@ const useWalletPass = (props) => {
 				setLoading(false);
 			}
 		});
-		return function(_x4, _x5) {
+		return function(_x5, _x6) {
 			return _ref13.apply(this, arguments);
 		};
 	}());
@@ -983,7 +1021,7 @@ const useWalletPass = (props) => {
 			var _ref14 = require_asyncToGenerator._asyncToGenerator(function* (value, index, data) {
 				return true;
 			});
-			return function(_x6, _x7, _x8) {
+			return function(_x7, _x8, _x9) {
 				return _ref14.apply(this, arguments);
 			};
 		}()),

package/lib/components/checkout/locales.js

@@ -45,6 +45,9 @@ var locales_default = {
 		"payment.failed": "Payment Failed",
 		"payment.cancelled": "Payment Cancelled",
 		"payment.processing": "Processing Payment",
+		"pisell2.checkout.scan-blocked-by-payment": "Payment is processing. This scan was not applied. Please scan again after payment is complete.",
+		"pisell2.checkout.payment-blocked-by-scan": "A wallet pass is being applied. Please wait before starting payment.",
+		"pisell2.checkout.wallet-scan-processing": "A wallet pass is being applied. Please wait before scanning again.",
 		"close": "Close",
 		"cancel": "Cancel",
 		"confirm": "Confirm",
@@ -245,6 +248,9 @@ var locales_default = {
 		"payment.failed": "支付失败",
 		"payment.cancelled": "支付取消",
 		"payment.processing": "支付处理中",
+		"pisell2.checkout.scan-blocked-by-payment": "支付处理中，本次扫码未生效，请在支付完成后重新扫码",
+		"pisell2.checkout.payment-blocked-by-scan": "卡券处理中，请稍后再支付",
+		"pisell2.checkout.wallet-scan-processing": "卡券处理中，请稍后再扫码",
 		"close": "关闭",
 		"cancel": "取消",
 		"confirm": "确认",
@@ -447,6 +453,9 @@ var locales_default = {
 		"payment.failed": "支付失敗",
 		"payment.cancelled": "支付取消",
 		"payment.processing": "支付處理中",
+		"pisell2.checkout.scan-blocked-by-payment": "支付處理中，本次掃碼未生效，請在支付完成後重新掃碼",
+		"pisell2.checkout.payment-blocked-by-scan": "卡券處理中，請稍後再支付",
+		"pisell2.checkout.wallet-scan-processing": "卡券處理中，請稍後再掃碼",
 		"close": "關閉",
 		"cancel": "取消",
 		"confirm": "確認",
@@ -649,6 +658,9 @@ var locales_default = {
 		"payment.failed": "支払い失敗",
 		"payment.cancelled": "支払いキャンセル",
 		"payment.processing": "支払い処理中",
+		"pisell2.checkout.scan-blocked-by-payment": "支払い処理中のため、このスキャンは適用されませんでした。支払い完了後にもう一度スキャンしてください。",
+		"pisell2.checkout.payment-blocked-by-scan": "ウォレットパスを処理中です。処理完了後に支払いを開始してください。",
+		"pisell2.checkout.wallet-scan-processing": "ウォレットパスを処理中です。処理完了後にもう一度スキャンしてください。",
 		"close": "閉じる",
 		"cancel": "キャンセル",
 		"confirm": "確認",
@@ -848,6 +860,9 @@ var locales_default = {
 		"payment.failed": "Pagamento Falhou",
 		"payment.cancelled": "Pagamento Cancelado",
 		"payment.processing": "Processando Pagamento",
+		"pisell2.checkout.scan-blocked-by-payment": "O pagamento está sendo processado. Esta leitura não foi aplicada. Leia novamente após a conclusão do pagamento.",
+		"pisell2.checkout.payment-blocked-by-scan": "Um passe da carteira está sendo aplicado. Aguarde antes de iniciar o pagamento.",
+		"pisell2.checkout.wallet-scan-processing": "Um passe da carteira está sendo aplicado. Aguarde antes de ler novamente.",
 		"close": "Fechar",
 		"cancel": "Cancelar",
 		"confirm": "Confirmar",

package/lib/components/checkout/paymentRuntime/PaymentMethodRuntime.js

@@ -71,8 +71,8 @@ const PaymentMethodRuntime = (0, react.forwardRef)(function PaymentMethodRuntime
 	};
 	(0, react.useImperativeHandle)(ref, () => ({
 		onPay: (type, params) => {
-			var _paymentMethodsRef$cu;
-			return (_paymentMethodsRef$cu = paymentMethodsRef.current) === null || _paymentMethodsRef$cu === void 0 ? void 0 : _paymentMethodsRef$cu.onPay(type, params);
+			var _paymentMethodsRef$cu, _paymentMethodsRef$cu2;
+			return (_paymentMethodsRef$cu = (_paymentMethodsRef$cu2 = paymentMethodsRef.current) === null || _paymentMethodsRef$cu2 === void 0 ? void 0 : _paymentMethodsRef$cu2.onPay(type, params)) !== null && _paymentMethodsRef$cu !== void 0 ? _paymentMethodsRef$cu : Promise.resolve(false);
 		},
 		openPi: (options) => {
 			var _piPaymentRef$current;
@@ -112,8 +112,17 @@ const PaymentMethodRuntime = (0, react.forwardRef)(function PaymentMethodRuntime
 				const configuredSurcharge = calculateSurcharge(method, amount);
 				const formattedSurcharge = String((0, _pisell_utils.formatAmount)(configuredSurcharge, 2));
 				if (require_constants.SPI_PAYMENT_CODES.includes(code)) return new Promise((resolve) => {
-					var _paymentMethodsRef$cu2, _baseSales$getOrderId3;
-					(_paymentMethodsRef$cu2 = paymentMethodsRef.current) === null || _paymentMethodsRef$cu2 === void 0 || _paymentMethodsRef$cu2.onPay("mx51", {
+					var _baseSales$getOrderId3;
+					const paymentMethods = paymentMethodsRef.current;
+					if (!paymentMethods) {
+						resolve({
+							status: "failed",
+							amount,
+							message: "Payment method is unavailable."
+						});
+						return;
+					}
+					paymentMethods.onPay("mx51", {
 						source: "normal",
 						data: {
 							payMethod: method,
@@ -165,6 +174,12 @@ const PaymentMethodRuntime = (0, react.forwardRef)(function PaymentMethodRuntime
 								raw: data
 							});
 						}
+					}).then((opened) => {
+						if (!opened) resolve({
+							status: "failed",
+							amount,
+							message: "Payment method is unavailable."
+						});
 					});
 				});
 				const usePiPayment = !!(context === null || context === void 0 || (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.businessUtils) === null || _context$appHelper2 === void 0 || (_context$appHelper2$i = _context$appHelper2.isPiPaymentEnabled) === null || _context$appHelper2$i === void 0 ? void 0 : _context$appHelper2$i.call(_context$appHelper2));
@@ -275,8 +290,16 @@ const PaymentMethodRuntime = (0, react.forwardRef)(function PaymentMethodRuntime
 				}
 				const orderId = yield ensureRemoteOrderId(baseSales);
 				return new Promise((resolve) => {
-					var _paymentMethodsRef$cu3;
-					(_paymentMethodsRef$cu3 = paymentMethodsRef.current) === null || _paymentMethodsRef$cu3 === void 0 || _paymentMethodsRef$cu3.onPay("eftpos", {
+					const paymentMethods = paymentMethodsRef.current;
+					if (!paymentMethods) {
+						resolve({
+							status: "failed",
+							amount,
+							message: "Payment method is unavailable."
+						});
+						return;
+					}
+					paymentMethods.onPay("eftpos", {
 						source: "normal",
 						data: {
 							payMethod: method,
@@ -324,6 +347,12 @@ const PaymentMethodRuntime = (0, react.forwardRef)(function PaymentMethodRuntime
 								raw: data
 							});
 						}
+					}).then((opened) => {
+						if (!opened) resolve({
+							status: "failed",
+							amount,
+							message: "Payment method is unavailable."
+						});
 					});
 				});
 			});

package/lib/components/pay/toB/components/EFTPOS/index.js

@@ -20,12 +20,14 @@ const updateTransactionReceiveStatus = function() {
 }();
 const EFTPOS = (props, ref) => {
 	var _context$appHelper;
-	const { interaction } = ((_context$appHelper = require_useEngineContext.default().appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {};
+	const { interaction, getData } = ((_context$appHelper = require_useEngineContext.default().appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {};
+	const paymentChannel = String((getData === null || getData === void 0 ? void 0 : getData("channel")) || "pos").trim().toLowerCase();
 	const logger = require_useLogger.default();
 	const network = (0, ahooks.useNetwork)();
 	const [visible, setVisible] = (0, react.useState)(false);
 	const eftposRef = (0, react.useRef)(null);
 	const payCallbackRef = (0, react.useRef)(null);
+	const openResultResolveRef = (0, react.useRef)(null);
 	const eftposHandlingRef = (0, react.useRef)(false);
 	const eftposOpenParamsRef = (0, react.useRef)(null);
 	const eftposInitDataRef = (0, react.useRef)(null);
@@ -36,11 +38,23 @@ const EFTPOS = (props, ref) => {
 			(_eftposRef$current = eftposRef.current) === null || _eftposRef$current === void 0 || (_eftposRef$current$up = _eftposRef$current.updateNetwork) === null || _eftposRef$current$up === void 0 || _eftposRef$current$up.call(_eftposRef$current, { network: network.online });
 		}
 	}, [network.online]);
+	const settleOpenResult = (accepted) => {
+		const resolve = openResultResolveRef.current;
+		if (!resolve) return;
+		openResultResolveRef.current = null;
+		resolve(accepted);
+	};
 	const closeModal = () => {
+		settleOpenResult(false);
 		setIsEftposLoading(false);
 		eftposHandlingRef.current = false;
 		setVisible(false);
 	};
+	(0, react.useEffect)(() => () => {
+		const resolve = openResultResolveRef.current;
+		openResultResolveRef.current = null;
+		resolve === null || resolve === void 0 || resolve(false);
+	}, []);
 	/**
 	* @title: 打开支付弹窗
 	* @param {ToBPayParams} data 支付参数
@@ -48,26 +62,45 @@ const EFTPOS = (props, ref) => {
 	* @param {string} source 支付来源（正常支付、恢复支付）
 	*/
 	const onOpen = function() {
-		var _ref2 = require_asyncToGenerator._asyncToGenerator(function* ({ source, data, payCallback }) {
+		var _ref2 = require_asyncToGenerator._asyncToGenerator(function* ({ source, data, payCallback, isActive }) {
 			if (eftposHandlingRef.current || visible) {
 				logger === null || logger === void 0 || logger.addLog({
 					type: "info",
 					title: "ToB_EFTPOS_onOpen 重复触发被拦截",
 					metadata: { data }
 				});
-				return;
+				return false;
 			}
 			eftposHandlingRef.current = true;
-			let device_number = "";
-			try {
+			const openResult = new Promise((resolve) => {
+				openResultResolveRef.current = resolve;
+			});
+			const initializationResult = yield Promise.race([Promise.resolve().then(() => {
 				var _interaction$utils, _interaction$utils$as;
-				device_number = yield interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$as = _interaction$utils.asyncDataManager) === null || _interaction$utils$as === void 0 ? void 0 : _interaction$utils$as.call(_interaction$utils, {
+				return interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$as = _interaction$utils.asyncDataManager) === null || _interaction$utils$as === void 0 ? void 0 : _interaction$utils$as.call(_interaction$utils, {
 					module: "get",
 					key: "device_number"
 				});
-			} catch (error) {
+			}).then((deviceNumber) => ({
+				status: "ready",
+				deviceNumber: deviceNumber || ""
+			})).catch((error) => {
 				console.error("获取设备编号失败", error);
+				return {
+					status: "ready",
+					deviceNumber: ""
+				};
+			}), openResult.then((accepted) => ({
+				status: "settled",
+				accepted
+			}))]);
+			if (initializationResult.status === "settled") return initializationResult.accepted;
+			if (isActive && !isActive()) {
+				eftposHandlingRef.current = false;
+				settleOpenResult(false);
+				return false;
 			}
+			const device_number = initializationResult.deviceNumber;
 			const { type, payMethod, params, mode } = data;
 			const newData = {
 				type,
@@ -110,6 +143,7 @@ const EFTPOS = (props, ref) => {
 			};
 			setVisible(true);
 			setIsEftposLoading(true);
+			return openResult;
 		});
 		return function onOpen(_x2) {
 			return _ref2.apply(this, arguments);
@@ -122,6 +156,7 @@ const EFTPOS = (props, ref) => {
 			metadata: { status }
 		});
 		setIsEftposLoading(false);
+		settleOpenResult(status);
 		if (!status) closeModal();
 	};
 	const onAfterOpenChange = (v) => {
@@ -162,6 +197,7 @@ const EFTPOS = (props, ref) => {
 				params
 			}
 		});
+		if (status === "success" || status === "fail") settleOpenResult(true);
 		handleResult(status, params);
 		if (status === "success" || status === "fail") {
 			var _payCallbackRef$curre;
@@ -179,6 +215,7 @@ const EFTPOS = (props, ref) => {
 	return /* @__PURE__ */ react.default.createElement(antd.Modal, {
 		open: visible,
 		onCancel: closeModal,
+		keyboard: paymentChannel !== "kiosk",
 		footer: null,
 		closable: false,
 		width: "fit-content",