@pisell/private-materials 6.12.157 → 6.12.158

package/lib/components/checkout/PaymentModal.js

@@ -32,6 +32,7 @@ const require_index$11 = require("./components/SearchAndClientModule/index.js");
 const require_voucherPayment = require("./utils/voucherPayment.js");
 const require_usePaymentModalBaseSales = require("./hooks/usePaymentModalBaseSales.js");
 const require_useCustomerGuard = require("./hooks/useCustomerGuard.js");
+const require_useCheckoutPaymentScanActivity = require("./hooks/useCheckoutPaymentScanActivity.js");
 let react = require("react");
 react = require_runtime.__toESM(react);
 let antd = require("antd");
@@ -471,6 +472,8 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 	const [paymentOptionsTitle, setPaymentOptionsTitle] = (0, react.useState)(_pisell_utils.locales.getText("cards.and.digitals") || "Cards & Digitals");
 	require_OsKeyContext.useOsKey();
 	const paymentChannel = (0, react.useMemo)(() => String((getData === null || getData === void 0 ? void 0 : getData("channel")) || "pos").trim().toLowerCase(), [getData]);
+	const paymentScanActivity = require_useCheckoutPaymentScanActivity.default(paymentChannel === "kiosk");
+	const activeKioskPaymentActivityRef = (0, react.useRef)();
 	const paymentOptionList = (0, react.useMemo)(() => {
 		return paymentMethods.filter((item) => {
 			var _item$channel_applica;
@@ -531,6 +534,98 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 	const isPriceAdjustEnabled = (config === null || config === void 0 ? void 0 : config.enablePriceAdjust) !== false;
 	const [priceAdjustProductExpectAmount, setPriceAdjustProductExpectAmount] = (0, react.useState)();
 	const logger = require_usePaymentLogger.default();
+	const notifyScanBlockedByPayment = (0, ahooks.useMemoizedFn)(() => {
+		var _Toast$info;
+		Toast === null || Toast === void 0 || (_Toast$info = Toast.info) === null || _Toast$info === void 0 || _Toast$info.call(Toast, _pisell_utils.locales.getText("pisell2.checkout.scan-blocked-by-payment"));
+	});
+	const notifyPaymentBlockedByScan = (0, ahooks.useMemoizedFn)(() => {
+		var _Toast$info2;
+		Toast === null || Toast === void 0 || (_Toast$info2 = Toast.info) === null || _Toast$info2 === void 0 || _Toast$info2.call(Toast, _pisell_utils.locales.getText("pisell2.checkout.payment-blocked-by-scan"));
+	});
+	const beginKioskScanActivity = (0, ahooks.useMemoizedFn)(() => {
+		if (paymentScanActivity.getIsPaymentProcessing() || syncingLock) {
+			notifyScanBlockedByPayment();
+			return null;
+		}
+		if (paymentScanActivity.getIsScanProcessing()) {
+			var _Toast$info3;
+			Toast === null || Toast === void 0 || (_Toast$info3 = Toast.info) === null || _Toast$info3 === void 0 || _Toast$info3.call(Toast, _pisell_utils.locales.getText("pisell2.checkout.wallet-scan-processing"));
+			return null;
+		}
+		return paymentScanActivity.tryBeginScan();
+	});
+	const finishActiveKioskPaymentActivity = (0, ahooks.useMemoizedFn)((reason, expectedSourcePrefix) => {
+		var _logger$addLog;
+		const activity = activeKioskPaymentActivityRef.current;
+		if (!activity) return;
+		if (expectedSourcePrefix && !activity.source.startsWith(expectedSourcePrefix)) return;
+		if (activity.deferRelease) return;
+		activity.release();
+		logger === null || logger === void 0 || (_logger$addLog = logger.addLog) === null || _logger$addLog === void 0 || _logger$addLog.call(logger, {
+			type: "info",
+			title: "Kiosk checkout payment activity finished",
+			metadata: {
+				reason,
+				source: activity.source
+			}
+		});
+	});
+	const beginKioskPaymentActivity = (0, ahooks.useMemoizedFn)((source) => {
+		var _logger$addLog2;
+		if (paymentChannel !== "kiosk") {
+			const release = (() => void 0);
+			release.isActive = () => true;
+			return release;
+		}
+		if (paymentScanActivity.getIsScanProcessing()) {
+			notifyPaymentBlockedByScan();
+			return null;
+		}
+		if (paymentScanActivity.getIsPaymentProcessing()) {
+			var _Toast$info4;
+			Toast === null || Toast === void 0 || (_Toast$info4 = Toast.info) === null || _Toast$info4 === void 0 || _Toast$info4.call(Toast, _pisell_utils.locales.getText("payment.processing"));
+			return null;
+		}
+		if (syncingLock) {
+			var _Toast$info5;
+			Toast === null || Toast === void 0 || (_Toast$info5 = Toast.info) === null || _Toast$info5 === void 0 || _Toast$info5.call(Toast, _pisell_utils.locales.getText("payment.processing"));
+			return null;
+		}
+		const releaseActivity = paymentScanActivity.tryBeginPayment();
+		if (!releaseActivity) return null;
+		let released = false;
+		const release = (() => {
+			var _activeKioskPaymentAc;
+			if (released) return;
+			const activeActivity = activeKioskPaymentActivityRef.current;
+			if ((activeActivity === null || activeActivity === void 0 ? void 0 : activeActivity.release) === release && activeActivity.deferRelease) return;
+			released = true;
+			if (((_activeKioskPaymentAc = activeKioskPaymentActivityRef.current) === null || _activeKioskPaymentAc === void 0 ? void 0 : _activeKioskPaymentAc.release) === release) activeKioskPaymentActivityRef.current = void 0;
+			releaseActivity();
+			if (source.startsWith("payment:")) {
+				var _getApp, _getApp$getPlugin, _getApp$getPlugin$res;
+				getApp === null || getApp === void 0 || (_getApp = getApp()) === null || _getApp === void 0 || (_getApp$getPlugin = _getApp.getPlugin) === null || _getApp$getPlugin === void 0 || (_getApp$getPlugin = _getApp$getPlugin.call(_getApp, "screenProtector")) === null || _getApp$getPlugin === void 0 || (_getApp$getPlugin$res = _getApp$getPlugin.resumeIdleTimer) === null || _getApp$getPlugin$res === void 0 || _getApp$getPlugin$res.call(_getApp$getPlugin);
+			}
+		});
+		release.isActive = () => {
+			var _activeKioskPaymentAc2;
+			return !released && ((_activeKioskPaymentAc2 = activeKioskPaymentActivityRef.current) === null || _activeKioskPaymentAc2 === void 0 ? void 0 : _activeKioskPaymentAc2.release) === release;
+		};
+		activeKioskPaymentActivityRef.current = {
+			release,
+			source
+		};
+		logger === null || logger === void 0 || (_logger$addLog2 = logger.addLog) === null || _logger$addLog2 === void 0 || _logger$addLog2.call(logger, {
+			type: "info",
+			title: "Kiosk checkout payment activity started",
+			metadata: { source }
+		});
+		return release;
+	});
+	(0, react.useEffect)(() => {
+		if (!isModalOpen) finishActiveKioskPaymentActivity("modal-closed");
+	}, [isModalOpen]);
+	(0, react.useEffect)(() => () => finishActiveKioskPaymentActivity("component-unmounted"), []);
 	const currency = getData("shop_currency_code") || "USD";
 	const open_deposit = getData("bookingv2_deposit") || 0;
 	const currentBaseSales = baseSales;
@@ -730,14 +825,14 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 			const payments = params.forceUseParamsPayment && Array.isArray(params.payments) ? params.payments : yield readBaseSalesPaymentItems(params.payments);
 			const submitResult = (_params$syncResult6 = params.syncResult) === null || _params$syncResult6 === void 0 ? void 0 : _params$syncResult6.submitResult;
 			if (isBaseSalesSubmitRejected(submitResult)) {
-				var _logger$addLog2, _Toast$error2;
+				var _logger$addLog4, _Toast$error2;
 				const backendResponse = getNormalizedBaseSalesSubmitResponse(submitResult);
 				const message = getBaseSalesSubmitErrorMessage(backendResponse) || _pisell_utils.locales.getText("pisell2.checkout.order-sync-failed");
 				console.error(`[PaymentModal] Sales checkout backend rejected: ${message}`, createBaseSalesSubmitErrorDebug(submitResult, payments));
 				require_PaymentResultToastV2Provider.closePaymentResultToastV2();
 				if ((config === null || config === void 0 ? void 0 : config.keepOpenOnSyncFailure) === true) {
-					var _logger$addLog, _Toast$error;
-					logger === null || logger === void 0 || (_logger$addLog = logger.addLog) === null || _logger$addLog === void 0 || _logger$addLog.call(logger, {
+					var _logger$addLog3, _Toast$error;
+					logger === null || logger === void 0 || (_logger$addLog3 = logger.addLog) === null || _logger$addLog3 === void 0 || _logger$addLog3.call(logger, {
 						type: "error",
 						title: "BaseSales payment sync rejected; waiting for kiosk retry",
 						metadata: {
@@ -761,7 +856,7 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 					(_currentBaseSales$del = currentBaseSales.deleteOrderPayment) === null || _currentBaseSales$del === void 0 || _currentBaseSales$del.call(currentBaseSales, params.rollbackPaymentIdentity);
 					setPaymentItems(yield readBaseSalesPaymentItems());
 				}
-				logger === null || logger === void 0 || (_logger$addLog2 = logger.addLog) === null || _logger$addLog2 === void 0 || _logger$addLog2.call(logger, {
+				logger === null || logger === void 0 || (_logger$addLog4 = logger.addLog) === null || _logger$addLog4 === void 0 || _logger$addLog4.call(logger, {
 					type: "error",
 					title: "BaseSales payment sync rejected by backend",
 					metadata: {
@@ -836,28 +931,42 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 				app,
 				handler: function() {
 					var _ref15 = require_asyncToGenerator._asyncToGenerator(function* (command) {
+						if (command.command === "authorization_close") {
+							finishActiveKioskPaymentActivity("authorization-closed", "authorization:");
+							return;
+						}
 						if (command.command !== "payment_result") return;
 						const params = command.params;
-						globalApp.runFunction("closeAuthorization");
-						if ((params === null || params === void 0 ? void 0 : params.status) === "cancelled") return;
-						const payments = Array.isArray(params === null || params === void 0 ? void 0 : params.payments) ? params.payments : [];
-						if (params === null || params === void 0 ? void 0 : params.ok) {
-							var _params$syncResult9, _params$syncResult10, _params$syncResult11;
-							if ((params === null || params === void 0 || (_params$syncResult9 = params.syncResult) === null || _params$syncResult9 === void 0 ? void 0 : _params$syncResult9.isDepositFullyPaid) && !(params === null || params === void 0 || (_params$syncResult10 = params.syncResult) === null || _params$syncResult10 === void 0 ? void 0 : _params$syncResult10.isOrderFullyPaid)) return;
-							yield handleBaseSalesPaymentSyncSuccess({
-								syncResult: params.syncResult,
+						const authorizationActivity = activeKioskPaymentActivityRef.current;
+						if (authorizationActivity === null || authorizationActivity === void 0 ? void 0 : authorizationActivity.source.startsWith("authorization:")) authorizationActivity.deferRelease = true;
+						try {
+							if ((params === null || params === void 0 ? void 0 : params.status) === "cancelled") return;
+							const payments = Array.isArray(params === null || params === void 0 ? void 0 : params.payments) ? params.payments : [];
+							if (params === null || params === void 0 ? void 0 : params.ok) {
+								var _params$syncResult9, _params$syncResult10, _params$syncResult11;
+								if ((params === null || params === void 0 || (_params$syncResult9 = params.syncResult) === null || _params$syncResult9 === void 0 ? void 0 : _params$syncResult9.isDepositFullyPaid) && !(params === null || params === void 0 || (_params$syncResult10 = params.syncResult) === null || _params$syncResult10 === void 0 ? void 0 : _params$syncResult10.isOrderFullyPaid)) return;
+								yield handleBaseSalesPaymentSyncSuccess({
+									syncResult: params.syncResult,
+									payments,
+									changeGivenAmount: getPaymentChangeGivenAmount(payments),
+									forceUseParamsPayment: true,
+									orderTotalAmount: params === null || params === void 0 || (_params$syncResult11 = params.syncResult) === null || _params$syncResult11 === void 0 ? void 0 : _params$syncResult11.orderExpectedAmount
+								});
+								return;
+							}
+							yield handleBaseSalesPaymentSyncFailure({
+								error: (params === null || params === void 0 ? void 0 : params.error) || new Error(_pisell_utils.locales.getText("pisell2.checkout.order-sync-failed")),
 								payments,
-								changeGivenAmount: getPaymentChangeGivenAmount(payments),
-								forceUseParamsPayment: true,
-								orderTotalAmount: params === null || params === void 0 || (_params$syncResult11 = params.syncResult) === null || _params$syncResult11 === void 0 ? void 0 : _params$syncResult11.orderExpectedAmount
+								changeGivenAmount: getPaymentChangeGivenAmount(payments)
 							});
-							return;
+						} finally {
+							if (authorizationActivity && activeKioskPaymentActivityRef.current === authorizationActivity) authorizationActivity.deferRelease = false;
+							try {
+								globalApp.runFunction("closeAuthorization");
+							} finally {
+								finishActiveKioskPaymentActivity("payment-result", "authorization:");
+							}
 						}
-						yield handleBaseSalesPaymentSyncFailure({
-							error: (params === null || params === void 0 ? void 0 : params.error) || new Error(_pisell_utils.locales.getText("pisell2.checkout.order-sync-failed")),
-							payments,
-							changeGivenAmount: getPaymentChangeGivenAmount(payments)
-						});
 					});
 					return function handler(_x22) {
 						return _ref15.apply(this, arguments);
@@ -899,16 +1008,16 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 	}());
 	const handleBaseSalesPaymentSyncFailure = (0, ahooks.useMemoizedFn)(function() {
 		var _ref18 = require_asyncToGenerator._asyncToGenerator(function* (params) {
-			var _logger$addLog5, _params$error5, _params$error6, _Toast$error4, _params$error7;
+			var _logger$addLog7, _params$error5, _params$error6, _Toast$error4, _params$error7;
 			const payments = yield readBaseSalesPaymentItems(params.payments);
 			const backendErrorResponse = getNormalizedBaseSalesSubmitResponse(extractBackendErrorResponse(params.error));
 			const isBackendRejected = !!backendErrorResponse;
 			const isDeferredNetworkSync = !backendErrorResponse && isNetworkOrTimeoutError(params.error);
 			const message = isBackendRejected ? getBaseSalesSubmitErrorMessage(backendErrorResponse) || _pisell_utils.locales.getText("pisell2.checkout.order-sync-failed") : params.error instanceof Error ? params.error.message : String(params.error);
 			if ((config === null || config === void 0 ? void 0 : config.keepOpenOnSyncFailure) === true) {
-				var _logger$addLog3, _params$error, _params$error2, _Toast$error3, _params$error3;
+				var _logger$addLog5, _params$error, _params$error2, _Toast$error3, _params$error3;
 				require_PaymentResultToastV2Provider.closePaymentResultToastV2();
-				logger === null || logger === void 0 || (_logger$addLog3 = logger.addLog) === null || _logger$addLog3 === void 0 || _logger$addLog3.call(logger, {
+				logger === null || logger === void 0 || (_logger$addLog5 = logger.addLog) === null || _logger$addLog5 === void 0 || _logger$addLog5.call(logger, {
 					type: "error",
 					title: "BaseSales payment sync failed; waiting for kiosk retry",
 					metadata: {
@@ -933,7 +1042,7 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 				require_PaymentResultToastV2Provider.closePaymentResultToastV2();
 			} else console.error("[PaymentModal] Sales checkout submit failed", params.error);
 			if (isDeferredNetworkSync) {
-				var _logger$addLog4, _params$error4, _Toast$info, _params$changeGivenAm3;
+				var _logger$addLog6, _params$error4, _Toast$info6, _params$changeGivenAm3;
 				const deferredMessage = _pisell_utils.locales.getText("pisell2.checkout.order-saved-sync-later");
 				const nextOrderInfo = getBaseSalesOrderInfo(currentBaseSales);
 				if (nextOrderInfo) {
@@ -944,7 +1053,7 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 				}
 				const nextPayments = yield readBaseSalesPaymentItems(payments);
 				setPaymentItems(nextPayments);
-				logger === null || logger === void 0 || (_logger$addLog4 = logger.addLog) === null || _logger$addLog4 === void 0 || _logger$addLog4.call(logger, {
+				logger === null || logger === void 0 || (_logger$addLog6 = logger.addLog) === null || _logger$addLog6 === void 0 || _logger$addLog6.call(logger, {
 					type: "info",
 					title: "BaseSales payment saved locally, backend sync deferred",
 					metadata: {
@@ -953,7 +1062,7 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 						payments: nextPayments
 					}
 				});
-				Toast === null || Toast === void 0 || (_Toast$info = Toast.info) === null || _Toast$info === void 0 || _Toast$info.call(Toast, deferredMessage);
+				Toast === null || Toast === void 0 || (_Toast$info6 = Toast.info) === null || _Toast$info6 === void 0 || _Toast$info6.call(Toast, deferredMessage);
 				const syncResult = {
 					isFullyPaid: true,
 					submitResult: {
@@ -979,7 +1088,7 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 				(_currentBaseSales$del2 = currentBaseSales.deleteOrderPayment) === null || _currentBaseSales$del2 === void 0 || _currentBaseSales$del2.call(currentBaseSales, params.rollbackPaymentIdentity);
 				setPaymentItems(yield readBaseSalesPaymentItems());
 			}
-			logger === null || logger === void 0 || (_logger$addLog5 = logger.addLog) === null || _logger$addLog5 === void 0 || _logger$addLog5.call(logger, {
+			logger === null || logger === void 0 || (_logger$addLog7 = logger.addLog) === null || _logger$addLog7 === void 0 || _logger$addLog7.call(logger, {
 				type: "error",
 				title: "BaseSales payment sync failed",
 				metadata: {
@@ -1240,7 +1349,7 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 					draftResult
 				};
 			} catch (error) {
-				var _logger$addLog6, _Toast$hide5, _Toast$error7;
+				var _logger$addLog8, _Toast$hide5, _Toast$error7;
 				if (paymentAdded) try {
 					if (paymentNumber) yield deletePendingEftposPayment(paymentNumber, { persistDraft: false });
 					else if (typeof (currentBaseSales === null || currentBaseSales === void 0 ? void 0 : currentBaseSales.setOrderPayments) === "function") {
@@ -1251,7 +1360,7 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 					console.error("Failed to rollback pending EFTPOS payment:", rollbackError);
 				}
 				const message = error instanceof Error ? error.message : String(error);
-				logger === null || logger === void 0 || (_logger$addLog6 = logger.addLog) === null || _logger$addLog6 === void 0 || _logger$addLog6.call(logger, {
+				logger === null || logger === void 0 || (_logger$addLog8 = logger.addLog) === null || _logger$addLog8 === void 0 || _logger$addLog8.call(logger, {
 					type: "error",
 					title: "EFTPOS pending payment draft failed",
 					metadata: {
@@ -1298,9 +1407,9 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 		};
 	}());
 	const handleEftposUpdateError = (0, ahooks.useMemoizedFn)((error, paymentNumber) => {
-		var _logger$addLog7, _Toast$error8;
+		var _logger$addLog9, _Toast$error8;
 		const message = error instanceof Error ? error.message : String(error);
-		logger === null || logger === void 0 || (_logger$addLog7 = logger.addLog) === null || _logger$addLog7 === void 0 || _logger$addLog7.call(logger, {
+		logger === null || logger === void 0 || (_logger$addLog9 = logger.addLog) === null || _logger$addLog9 === void 0 || _logger$addLog9.call(logger, {
 			type: "error",
 			title: "EFTPOS payment update failed",
 			metadata: {
@@ -1312,6 +1421,8 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 	});
 	const handleAddCashPayment = function() {
 		var _ref25 = require_asyncToGenerator._asyncToGenerator(function* (result) {
+			const finishPaymentActivity = beginKioskPaymentActivity("cash");
+			if (!finishPaymentActivity) return;
 			try {
 				var _interaction$utils, _interaction$utils$po, _result$actual_paid_a;
 				if (!canAddOrderPayment(result.amount)) return;
@@ -1347,9 +1458,9 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 					}
 				});
 			} catch (error) {
-				var _logger$addLog8, _Toast$error9;
+				var _logger$addLog10, _Toast$error9;
 				const message = error instanceof Error ? error.message : String(error);
-				logger === null || logger === void 0 || (_logger$addLog8 = logger.addLog) === null || _logger$addLog8 === void 0 || _logger$addLog8.call(logger, {
+				logger === null || logger === void 0 || (_logger$addLog10 = logger.addLog) === null || _logger$addLog10 === void 0 || _logger$addLog10.call(logger, {
 					type: "error",
 					title: "Cash payment failed",
 					metadata: {
@@ -1358,6 +1469,8 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 					}
 				});
 				Toast === null || Toast === void 0 || (_Toast$error9 = Toast.error) === null || _Toast$error9 === void 0 || _Toast$error9.call(Toast, message);
+			} finally {
+				finishPaymentActivity();
 			}
 		});
 		return function handleAddCashPayment(_x32) {
@@ -1375,319 +1488,347 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 	const screenProtector = ((_context$appHelper$ut = context.appHelper.utils) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getApp) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.call(_context$appHelper$ut)).getPlugin("screenProtector");
 	const onPaymentOptionClick = function() {
 		var _ref29 = require_asyncToGenerator._asyncToGenerator(function* (method) {
-			var _method$totalAmount;
 			if (syncingLock) return;
-			if (screenProtector) screenProtector === null || screenProtector === void 0 || screenProtector.pauseIdleTimer();
-			const { id, code, name, type } = method || {};
-			const finalAmount = (_method$totalAmount = method.totalAmount) !== null && _method$totalAmount !== void 0 ? _method$totalAmount : effectiveCustomAmount;
-			const isSciPayment = require_constants.SCI_PAYMENT_CODES.includes(code || "");
-			const isSpiPayment = require_constants.SPI_PAYMENT_CODES.includes(code || "");
-			if (isSciPayment || isSpiPayment) {
-				var _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper, _context$appHelper$is, _currentBaseSales$get9, _getBaseSalesSubmitDa, _app$storage2, _app$storage2$getStor;
-				const payType = isSpiPayment ? "mx51" : "eftpos";
-				const _app = (_context$appHelper$ut3 = context.appHelper.utils) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut4 = _context$appHelper$ut3.getApp) === null || _context$appHelper$ut4 === void 0 ? void 0 : _context$appHelper$ut4.call(_context$appHelper$ut3);
-				const usePiPayment = !!(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 = _context$appHelper.businessUtils) === null || _context$appHelper === void 0 || (_context$appHelper$is = _context$appHelper.isPiPaymentEnabled) === null || _context$appHelper$is === void 0 ? void 0 : _context$appHelper$is.call(_context$appHelper));
-				const piPaymentProvider = require_constants.resolvePiPaymentProvider((method === null || method === void 0 ? void 0 : method.code) || "", usePiPayment);
-				const shouldUsePiPayment = !!piPaymentProvider;
-				if (!shouldUsePiPayment && isSpiPayment) {
-					var _currentBaseSales$get7, _paymentMethodRuntime;
-					const orderId = currentBaseSales === null || currentBaseSales === void 0 || (_currentBaseSales$get7 = currentBaseSales.getOrderIdentity) === null || _currentBaseSales$get7 === void 0 || (_currentBaseSales$get7 = _currentBaseSales$get7.call(currentBaseSales)) === null || _currentBaseSales$get7 === void 0 ? void 0 : _currentBaseSales$get7.orderId;
-					(_paymentMethodRuntime = paymentMethodRuntimeRef.current) === null || _paymentMethodRuntime === void 0 || _paymentMethodRuntime.onPay(payType, {
-						source: "normal",
-						data: {
-							payMethod: {
-								id,
-								code,
-								name,
-								type
-							},
-							params: {
-								orderId,
-								symbol: getData("shop_symbol"),
-								amount: finalAmount,
-								surcharge: processSurcharge(method.surcharge)
-							},
-							mode: "pay"
-						},
-						callback: function() {
-							var _ref26 = require_asyncToGenerator._asyncToGenerator(function* ({ status, data, msg }) {
-								var _screenProtector$resu;
-								console.log("eftpos_pay_result>>>>>>", status, data, msg);
-								screenProtector && (screenProtector === null || screenProtector === void 0 || (_screenProtector$resu = screenProtector.resumeIdleTimer) === null || _screenProtector$resu === void 0 || _screenProtector$resu.call(screenProtector));
-								if ((data === null || data === void 0 ? void 0 : data.action) === "cancel_order") {
-									onPaymentCancel(true);
-									return;
-								}
-								if (status !== "success") return;
-								const payResultParams = {
-									amount: Number(data === null || data === void 0 ? void 0 : data.amount),
+			const finishPaymentActivity = beginKioskPaymentActivity(`payment:${(method === null || method === void 0 ? void 0 : method.code) || "unknown"}`);
+			if (!finishPaymentActivity) return;
+			let paymentActivityHandedOff = false;
+			const releaseAfterPaymentCallback = (callback) => require_asyncToGenerator._asyncToGenerator(function* (...args) {
+				try {
+					return yield callback(...args);
+				} finally {
+					finishPaymentActivity();
+				}
+			});
+			try {
+				var _method$totalAmount;
+				const { id, code, name, type } = method || {};
+				const finalAmount = (_method$totalAmount = method.totalAmount) !== null && _method$totalAmount !== void 0 ? _method$totalAmount : effectiveCustomAmount;
+				if (screenProtector) screenProtector === null || screenProtector === void 0 || screenProtector.pauseIdleTimer();
+				const isSciPayment = require_constants.SCI_PAYMENT_CODES.includes(code || "");
+				const isSpiPayment = require_constants.SPI_PAYMENT_CODES.includes(code || "");
+				if (isSciPayment || isSpiPayment) {
+					var _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper, _context$appHelper$is, _currentBaseSales$get9, _getBaseSalesSubmitDa, _app$storage2, _app$storage2$getStor;
+					const payType = isSpiPayment ? "mx51" : "eftpos";
+					const _app = (_context$appHelper$ut3 = context.appHelper.utils) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut4 = _context$appHelper$ut3.getApp) === null || _context$appHelper$ut4 === void 0 ? void 0 : _context$appHelper$ut4.call(_context$appHelper$ut3);
+					const usePiPayment = !!(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 = _context$appHelper.businessUtils) === null || _context$appHelper === void 0 || (_context$appHelper$is = _context$appHelper.isPiPaymentEnabled) === null || _context$appHelper$is === void 0 ? void 0 : _context$appHelper$is.call(_context$appHelper));
+					const piPaymentProvider = require_constants.resolvePiPaymentProvider((method === null || method === void 0 ? void 0 : method.code) || "", usePiPayment);
+					const shouldUsePiPayment = !!piPaymentProvider;
+					if (!shouldUsePiPayment && isSpiPayment) {
+						var _currentBaseSales$get7;
+						const orderId = currentBaseSales === null || currentBaseSales === void 0 || (_currentBaseSales$get7 = currentBaseSales.getOrderIdentity) === null || _currentBaseSales$get7 === void 0 || (_currentBaseSales$get7 = _currentBaseSales$get7.call(currentBaseSales)) === null || _currentBaseSales$get7 === void 0 ? void 0 : _currentBaseSales$get7.orderId;
+						const paymentRuntime = paymentMethodRuntimeRef.current;
+						if (!paymentRuntime) return;
+						paymentActivityHandedOff = yield paymentRuntime.onPay(payType, {
+							isActive: finishPaymentActivity.isActive,
+							source: "normal",
+							data: {
+								payMethod: {
+									id,
 									code,
-									custom_payment_id: id,
 									name,
-									custom_payment_type: type,
-									voucher_id: "",
-									service_charge: {},
-									metadata: { unique_payment_number: data === null || data === void 0 ? void 0 : data.uniquePaymentNumber }
-								};
-								if (Number((data === null || data === void 0 ? void 0 : data.surcharge) || 0) !== Number((method === null || method === void 0 ? void 0 : method.surcharge) || 0)) payResultParams.service_charge = {
-									amount: (data === null || data === void 0 ? void 0 : data.surcharge) || "0",
-									percentage: "0"
+									type
+								},
+								params: {
+									orderId,
+									symbol: getData("shop_symbol"),
+									amount: finalAmount,
+									surcharge: processSurcharge(method.surcharge)
+								},
+								mode: "pay"
+							},
+							callback: releaseAfterPaymentCallback(function() {
+								var _ref26 = require_asyncToGenerator._asyncToGenerator(function* ({ status, data, msg }) {
+									var _screenProtector$resu;
+									console.log("eftpos_pay_result>>>>>>", status, data, msg);
+									screenProtector && (screenProtector === null || screenProtector === void 0 || (_screenProtector$resu = screenProtector.resumeIdleTimer) === null || _screenProtector$resu === void 0 || _screenProtector$resu.call(screenProtector));
+									if ((data === null || data === void 0 ? void 0 : data.action) === "cancel_order") {
+										onPaymentCancel(true);
+										return;
+									}
+									if (status !== "success") return;
+									const payResultParams = {
+										amount: Number(data === null || data === void 0 ? void 0 : data.amount),
+										code,
+										custom_payment_id: id,
+										name,
+										custom_payment_type: type,
+										voucher_id: "",
+										service_charge: {},
+										metadata: { unique_payment_number: data === null || data === void 0 ? void 0 : data.uniquePaymentNumber }
+									};
+									if (Number((data === null || data === void 0 ? void 0 : data.surcharge) || 0) !== Number((method === null || method === void 0 ? void 0 : method.surcharge) || 0)) payResultParams.service_charge = {
+										amount: (data === null || data === void 0 ? void 0 : data.surcharge) || "0",
+										percentage: "0"
+									};
+									else payResultParams.service_charge = {
+										amount: (method === null || method === void 0 ? void 0 : method.fixed) || "0",
+										percentage: (method === null || method === void 0 ? void 0 : method.percentage) || "0"
+									};
+									if (!canAddOrderPayment(payResultParams.amount)) return;
+									setIsChangePaymentNotIncludeVoucher === null || setIsChangePaymentNotIncludeVoucher === void 0 || setIsChangePaymentNotIncludeVoucher(true);
+									yield addBaseSalesOrderPayment(currentBaseSales, payResultParams);
+								});
+								return function(_x33) {
+									return _ref26.apply(this, arguments);
 								};
-								else payResultParams.service_charge = {
-									amount: (method === null || method === void 0 ? void 0 : method.fixed) || "0",
-									percentage: (method === null || method === void 0 ? void 0 : method.percentage) || "0"
+							}())
+						});
+						return;
+					}
+					if (!shouldUsePiPayment) {
+						var _app$storage, _app$storage$getStora, _currentBaseSales$get8;
+						const _account = JSON.parse((_app === null || _app === void 0 || (_app$storage = _app.storage) === null || _app$storage === void 0 || (_app$storage$getStora = _app$storage.getStorage) === null || _app$storage$getStora === void 0 ? void 0 : _app$storage$getStora.call(_app$storage, "account")) || "{}");
+						console.log("_account", _account);
+						let orderId = currentBaseSales === null || currentBaseSales === void 0 || (_currentBaseSales$get8 = currentBaseSales.getOrderIdentity) === null || _currentBaseSales$get8 === void 0 || (_currentBaseSales$get8 = _currentBaseSales$get8.call(currentBaseSales)) === null || _currentBaseSales$get8 === void 0 ? void 0 : _currentBaseSales$get8.orderId;
+						if (!orderId || typeof orderId === "string" && orderId.startsWith("LOCAL_")) {
+							var _Toast$loading3;
+							Toast === null || Toast === void 0 || (_Toast$loading3 = Toast.loading) === null || _Toast$loading3 === void 0 || _Toast$loading3.call(Toast, "", 0);
+							let submitResult;
+							try {
+								submitResult = yield submitBaseSalesOrderAsync(currentBaseSales);
+							} catch (error) {
+								Toast === null || Toast === void 0 || Toast.error(error instanceof Error ? error.message : _pisell_utils.locales.getText("pisell2.checkout.order-status-abnormal-restart-app") || "当前订单状态异常，请重启 APP 后再试");
+								return;
+							}
+							if (!(submitResult === null || submitResult === void 0 ? void 0 : submitResult.success) || isBaseSalesSubmitRejected(submitResult === null || submitResult === void 0 ? void 0 : submitResult.response)) {
+								Toast === null || Toast === void 0 || Toast.error(getBaseSalesSubmitErrorMessage(submitResult === null || submitResult === void 0 ? void 0 : submitResult.response) || _pisell_utils.locales.getText("pisell2.checkout.order-status-abnormal-restart-app") || "当前订单状态异常，请重启 APP 后再试");
+								return;
+							}
+							orderId = getBaseSalesSubmitOrderId(submitResult === null || submitResult === void 0 ? void 0 : submitResult.response);
+							if (!orderId) {
+								Toast === null || Toast === void 0 || Toast.error(_pisell_utils.locales.getText("pisell2.checkout.order-status-abnormal-restart-app") || "当前订单状态异常，请重启 APP 后再试");
+								return;
+							}
+						}
+						Toast === null || Toast === void 0 || Toast.hide();
+						const paymentRuntime = paymentMethodRuntimeRef.current;
+						if (!paymentRuntime) return;
+						paymentActivityHandedOff = yield paymentRuntime.onPay(payType, {
+							isActive: finishPaymentActivity.isActive,
+							source: "normal",
+							data: {
+								payMethod: {
+									id,
+									code,
+									name,
+									type
+								},
+								params: {
+									orderId,
+									symbol: getData("shop_symbol"),
+									amount: finalAmount,
+									surcharge: processSurcharge(method.surcharge),
+									operator_id: _account === null || _account === void 0 ? void 0 : _account.id,
+									operator_type: "shop",
+									platform: paymentChannel || "pos"
+								},
+								mode: "pay"
+							},
+							callback: releaseAfterPaymentCallback(function() {
+								var _ref27 = require_asyncToGenerator._asyncToGenerator(function* ({ status, data, msg }) {
+									var _screenProtector$resu2;
+									console.log("eftpos_pay_result>>>>>>", status, data, msg);
+									screenProtector && (screenProtector === null || screenProtector === void 0 || (_screenProtector$resu2 = screenProtector.resumeIdleTimer) === null || _screenProtector$resu2 === void 0 || _screenProtector$resu2.call(screenProtector));
+									if (status !== "success") return;
+									const payResultParams = {
+										amount: finalAmount,
+										code,
+										custom_payment_id: id,
+										name,
+										custom_payment_type: type,
+										voucher_id: "",
+										service_charge: {
+											percentage: data === null || data === void 0 ? void 0 : data.surPercentRate,
+											amount: data === null || data === void 0 ? void 0 : data.surMoney
+										},
+										metadata: {
+											unique_payment_number: data === null || data === void 0 ? void 0 : data.uniquePaymentNumber,
+											manual_marking_flag: data === null || data === void 0 ? void 0 : data.manual_marking_flag
+										}
+									};
+									if (!canAddOrderPayment(payResultParams.amount)) return;
+									setIsChangePaymentNotIncludeVoucher === null || setIsChangePaymentNotIncludeVoucher === void 0 || setIsChangePaymentNotIncludeVoucher(true);
+									yield addBaseSalesOrderPayment(currentBaseSales, payResultParams);
+								});
+								return function(_x34) {
+									return _ref27.apply(this, arguments);
 								};
-								if (!canAddOrderPayment(payResultParams.amount)) return;
-								setIsChangePaymentNotIncludeVoucher === null || setIsChangePaymentNotIncludeVoucher === void 0 || setIsChangePaymentNotIncludeVoucher(true);
-								yield addBaseSalesOrderPayment(currentBaseSales, payResultParams);
-							});
-							return function callback(_x33) {
-								return _ref26.apply(this, arguments);
-							};
-						}()
+							}())
+						});
+						return;
+					}
+					logger === null || logger === void 0 || logger.addLog({
+						type: "info",
+						title: "addPendingEftposPayment_start",
+						metadata: { timestamp: Date.now() }
 					});
-					return;
-				}
-				if (!shouldUsePiPayment) {
-					var _app$storage, _app$storage$getStora, _currentBaseSales$get8, _paymentMethodRuntime2;
-					const _account = JSON.parse((_app === null || _app === void 0 || (_app$storage = _app.storage) === null || _app$storage === void 0 || (_app$storage$getStora = _app$storage.getStorage) === null || _app$storage$getStora === void 0 ? void 0 : _app$storage$getStora.call(_app$storage, "account")) || "{}");
+					const pendingPayment = yield addPendingEftposPayment(method, finalAmount);
+					if (!pendingPayment) return;
+					const { paymentNumber, draftResult } = pendingPayment;
+					const localSalesId = (currentBaseSales === null || currentBaseSales === void 0 || (_currentBaseSales$get9 = currentBaseSales.getOrderIdentity) === null || _currentBaseSales$get9 === void 0 || (_currentBaseSales$get9 = _currentBaseSales$get9.call(currentBaseSales)) === null || _currentBaseSales$get9 === void 0 ? void 0 : _currentBaseSales$get9.externalSaleNumber) || ((_getBaseSalesSubmitDa = getBaseSalesSubmitData(draftResult)) === null || _getBaseSalesSubmitDa === void 0 ? void 0 : _getBaseSalesSubmitDa.external_sale_number);
+					const _account = JSON.parse((_app === null || _app === void 0 || (_app$storage2 = _app.storage) === null || _app$storage2 === void 0 || (_app$storage2$getStor = _app$storage2.getStorage) === null || _app$storage2$getStor === void 0 ? void 0 : _app$storage2$getStor.call(_app$storage2, "account")) || "{}");
 					console.log("_account", _account);
-					let orderId = currentBaseSales === null || currentBaseSales === void 0 || (_currentBaseSales$get8 = currentBaseSales.getOrderIdentity) === null || _currentBaseSales$get8 === void 0 || (_currentBaseSales$get8 = _currentBaseSales$get8.call(currentBaseSales)) === null || _currentBaseSales$get8 === void 0 ? void 0 : _currentBaseSales$get8.orderId;
-					if (!orderId || typeof orderId === "string" && orderId.startsWith("LOCAL_")) {
-						var _Toast$loading3;
-						Toast === null || Toast === void 0 || (_Toast$loading3 = Toast.loading) === null || _Toast$loading3 === void 0 || _Toast$loading3.call(Toast, "", 0);
-						let submitResult;
-						try {
-							submitResult = yield submitBaseSalesOrderAsync(currentBaseSales);
-						} catch (error) {
-							Toast === null || Toast === void 0 || Toast.error(error instanceof Error ? error.message : _pisell_utils.locales.getText("pisell2.checkout.order-status-abnormal-restart-app") || "当前订单状态异常，请重启 APP 后再试");
-							return;
-						}
-						if (!(submitResult === null || submitResult === void 0 ? void 0 : submitResult.success) || isBaseSalesSubmitRejected(submitResult === null || submitResult === void 0 ? void 0 : submitResult.response)) {
-							Toast === null || Toast === void 0 || Toast.error(getBaseSalesSubmitErrorMessage(submitResult === null || submitResult === void 0 ? void 0 : submitResult.response) || _pisell_utils.locales.getText("pisell2.checkout.order-status-abnormal-restart-app") || "当前订单状态异常，请重启 APP 后再试");
-							return;
-						}
-						orderId = getBaseSalesSubmitOrderId(submitResult === null || submitResult === void 0 ? void 0 : submitResult.response);
-						if (!orderId) {
-							Toast === null || Toast === void 0 || Toast.error(_pisell_utils.locales.getText("pisell2.checkout.order-status-abnormal-restart-app") || "当前订单状态异常，请重启 APP 后再试");
-							return;
-						}
+					let shouldPreservePendingEftpos = false;
+					if (!localSalesId || !paymentMethodRuntimeRef.current) {
+						yield deletePendingEftposPayment(paymentNumber);
+						return;
 					}
-					Toast === null || Toast === void 0 || Toast.hide();
-					(_paymentMethodRuntime2 = paymentMethodRuntimeRef.current) === null || _paymentMethodRuntime2 === void 0 || _paymentMethodRuntime2.onPay(payType, {
-						source: "normal",
-						data: {
+					if (!finishPaymentActivity.isActive()) {
+						yield deletePendingEftposPayment(paymentNumber);
+						return;
+					}
+					logger === null || logger === void 0 || logger.addLog({
+						type: "info",
+						title: "addPendingEftposPayment_end",
+						metadata: { timestamp: Date.now() }
+					});
+					if (paymentMethodRuntimeRef.current.openPi(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({
+						provider: piPaymentProvider,
+						mode: "pay",
+						amount: finalAmount,
+						salesId: String(localSalesId),
+						paymentNumber,
+						currency: getData("shop_symbol"),
+						deviceNumber: cardReaderDeviceNumber,
+						metadata: {
 							payMethod: {
 								id,
 								code,
 								name,
 								type
 							},
-							params: {
-								orderId,
-								symbol: getData("shop_symbol"),
-								amount: finalAmount,
-								surcharge: processSurcharge(method.surcharge),
-								operator_id: _account === null || _account === void 0 ? void 0 : _account.id,
-								operator_type: "shop",
-								platform: paymentChannel || "pos"
-							},
-							mode: "pay"
+							symbol: getData("shop_symbol"),
+							payment_number: paymentNumber
 						},
-						callback: function() {
-							var _ref27 = require_asyncToGenerator._asyncToGenerator(function* ({ status, data, msg }) {
-								var _screenProtector$resu2;
-								console.log("eftpos_pay_result>>>>>>", status, data, msg);
-								screenProtector && (screenProtector === null || screenProtector === void 0 || (_screenProtector$resu2 = screenProtector.resumeIdleTimer) === null || _screenProtector$resu2 === void 0 || _screenProtector$resu2.call(screenProtector));
-								if (status !== "success") return;
-								const payResultParams = {
-									amount: finalAmount,
-									code,
-									custom_payment_id: id,
-									name,
-									custom_payment_type: type,
-									voucher_id: "",
-									service_charge: {
-										percentage: data === null || data === void 0 ? void 0 : data.surPercentRate,
-										amount: data === null || data === void 0 ? void 0 : data.surMoney
-									},
-									metadata: {
-										unique_payment_number: data === null || data === void 0 ? void 0 : data.uniquePaymentNumber,
-										manual_marking_flag: data === null || data === void 0 ? void 0 : data.manual_marking_flag
+						operator: {
+							id: _account === null || _account === void 0 ? void 0 : _account.id,
+							type: "shop"
+						}
+					}, paymentChannel === "kiosk" ? { slots: { failed: /* @__PURE__ */ react.default.createElement(antd.Button, {
+						block: true,
+						type: "primary",
+						className: "pi-payment-action-button",
+						onClick: () => onPaymentCancel(true, false, "start-new-order"),
+						style: { marginTop: "10px" }
+					}, _pisell_utils.locales.getText("order.start-new-order")) } } : {}), {}, {
+						platform: paymentChannel || "pos",
+						usageScene: paymentChannel === "kiosk" ? "user" : "merchant",
+						onChange: function() {
+							var _ref28 = require_asyncToGenerator._asyncToGenerator(function* (event) {
+								const isTerminalEvent = event.type === "success" || event.type === "closed" || event.type === "printOnTimeout";
+								console.log("pi_payment_eftpos_event>>>>>>", event);
+								try {
+									const eventTransactionNumber = event.transactionNumber;
+									if (eventTransactionNumber) shouldPreservePendingEftpos = true;
+									if (event.type === "processing") {
+										var _screenProtector$paus;
+										screenProtector && (screenProtector === null || screenProtector === void 0 || (_screenProtector$paus = screenProtector.pauseIdleTimer) === null || _screenProtector$paus === void 0 || _screenProtector$paus.call(screenProtector));
 									}
-								};
-								if (!canAddOrderPayment(payResultParams.amount)) return;
-								setIsChangePaymentNotIncludeVoucher === null || setIsChangePaymentNotIncludeVoucher === void 0 || setIsChangePaymentNotIncludeVoucher(true);
-								yield addBaseSalesOrderPayment(currentBaseSales, payResultParams);
-							});
-							return function callback(_x34) {
-								return _ref27.apply(this, arguments);
-							};
-						}()
-					});
-					return;
-				}
-				logger === null || logger === void 0 || logger.addLog({
-					type: "info",
-					title: "addPendingEftposPayment_start",
-					metadata: { timestamp: Date.now() }
-				});
-				const pendingPayment = yield addPendingEftposPayment(method, finalAmount);
-				if (!pendingPayment) return;
-				const { paymentNumber, draftResult } = pendingPayment;
-				const localSalesId = (currentBaseSales === null || currentBaseSales === void 0 || (_currentBaseSales$get9 = currentBaseSales.getOrderIdentity) === null || _currentBaseSales$get9 === void 0 || (_currentBaseSales$get9 = _currentBaseSales$get9.call(currentBaseSales)) === null || _currentBaseSales$get9 === void 0 ? void 0 : _currentBaseSales$get9.externalSaleNumber) || ((_getBaseSalesSubmitDa = getBaseSalesSubmitData(draftResult)) === null || _getBaseSalesSubmitDa === void 0 ? void 0 : _getBaseSalesSubmitDa.external_sale_number);
-				const _account = JSON.parse((_app === null || _app === void 0 || (_app$storage2 = _app.storage) === null || _app$storage2 === void 0 || (_app$storage2$getStor = _app$storage2.getStorage) === null || _app$storage2$getStor === void 0 ? void 0 : _app$storage2$getStor.call(_app$storage2, "account")) || "{}");
-				console.log("_account", _account);
-				let shouldPreservePendingEftpos = false;
-				if (!localSalesId || !paymentMethodRuntimeRef.current) {
-					yield deletePendingEftposPayment(paymentNumber);
-					return;
-				}
-				logger === null || logger === void 0 || logger.addLog({
-					type: "info",
-					title: "addPendingEftposPayment_end",
-					metadata: { timestamp: Date.now() }
-				});
-				if (!paymentMethodRuntimeRef.current.openPi(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({
-					provider: piPaymentProvider,
-					mode: "pay",
-					amount: finalAmount,
-					salesId: String(localSalesId),
-					paymentNumber,
-					currency: getData("shop_symbol"),
-					deviceNumber: cardReaderDeviceNumber,
-					metadata: {
-						payMethod: {
-							id,
-							code,
-							name,
-							type
-						},
-						symbol: getData("shop_symbol"),
-						payment_number: paymentNumber
-					},
-					operator: {
-						id: _account === null || _account === void 0 ? void 0 : _account.id,
-						type: "shop"
-					}
-				}, paymentChannel === "kiosk" ? { slots: { failed: /* @__PURE__ */ react.default.createElement(antd.Button, {
-					block: true,
-					type: "primary",
-					className: "pi-payment-action-button",
-					onClick: () => onPaymentCancel(true, false, "start-new-order"),
-					style: { marginTop: "10px" }
-				}, _pisell_utils.locales.getText("order.start-new-order")) } } : {}), {}, {
-					platform: paymentChannel || "pos",
-					usageScene: paymentChannel === "kiosk" ? "user" : "merchant",
-					onChange: function() {
-						var _ref28 = require_asyncToGenerator._asyncToGenerator(function* (event) {
-							console.log("pi_payment_eftpos_event>>>>>>", event);
-							try {
-								const eventTransactionNumber = event.transactionNumber;
-								if (eventTransactionNumber) shouldPreservePendingEftpos = true;
-								if (event.type === "processing") {
-									var _screenProtector$paus;
-									screenProtector && (screenProtector === null || screenProtector === void 0 || (_screenProtector$paus = screenProtector.pauseIdleTimer) === null || _screenProtector$paus === void 0 || _screenProtector$paus.call(screenProtector));
-								}
-								if (event.type === "printOnTimeout") {
-									var _logger$addLog9;
-									yield submitBaseSalesOrder(currentBaseSales, { confirmPendingVoucherPayments: true });
-									if (!(currentBaseSales === null || currentBaseSales === void 0 ? void 0 : currentBaseSales.printLocalOrderReceipt)) return;
-									logger === null || logger === void 0 || (_logger$addLog9 = logger.addLog) === null || _logger$addLog9 === void 0 || _logger$addLog9.call(logger, {
-										type: "info",
-										title: "eftpos支付异常，请求本地打印小票"
-									});
-									try {
-										var _logger$addLog10;
-										const res = yield currentBaseSales.printLocalOrderReceipt();
-										logger === null || logger === void 0 || (_logger$addLog10 = logger.addLog) === null || _logger$addLog10 === void 0 || _logger$addLog10.call(logger, {
-											type: "info",
-											title: "eftpos支付异常，请求本地打印小票结果",
-											metadata: { res }
-										});
-									} catch (error) {
+									if (event.type === "printOnTimeout") {
 										var _logger$addLog11;
-										console.error("handleButtonClick_print-receipt_error>>>>", error);
+										yield submitBaseSalesOrder(currentBaseSales, { confirmPendingVoucherPayments: true });
+										if (!(currentBaseSales === null || currentBaseSales === void 0 ? void 0 : currentBaseSales.printLocalOrderReceipt)) return;
 										logger === null || logger === void 0 || (_logger$addLog11 = logger.addLog) === null || _logger$addLog11 === void 0 || _logger$addLog11.call(logger, {
-											type: "error",
-											title: "eftpos支付异常，请求本地打印小票失败",
-											metadata: { error: error instanceof Error ? error.message : String(error) }
+											type: "info",
+											title: "eftpos支付异常，请求本地打印小票"
 										});
+										try {
+											var _logger$addLog12;
+											const res = yield currentBaseSales.printLocalOrderReceipt();
+											logger === null || logger === void 0 || (_logger$addLog12 = logger.addLog) === null || _logger$addLog12 === void 0 || _logger$addLog12.call(logger, {
+												type: "info",
+												title: "eftpos支付异常，请求本地打印小票结果",
+												metadata: { res }
+											});
+										} catch (error) {
+											var _logger$addLog13;
+											console.error("handleButtonClick_print-receipt_error>>>>", error);
+											logger === null || logger === void 0 || (_logger$addLog13 = logger.addLog) === null || _logger$addLog13 === void 0 || _logger$addLog13.call(logger, {
+												type: "error",
+												title: "eftpos支付异常，请求本地打印小票失败",
+												metadata: { error: error instanceof Error ? error.message : String(error) }
+											});
+										}
+										onPaymentCancel(true);
+										_app.history.replace("/home");
 									}
-									onPaymentCancel(true);
-									_app.history.replace("/home");
-								}
-								if (event.type === "success" || event.type === "failed") {
-									var _screenProtector$resu3, _event$surcharge, _event$surcharge2;
-									screenProtector && (screenProtector === null || screenProtector === void 0 || (_screenProtector$resu3 = screenProtector.resumeIdleTimer) === null || _screenProtector$resu3 === void 0 || _screenProtector$resu3.call(screenProtector));
-									shouldPreservePendingEftpos = true;
-									if (event.type !== "success") return;
-									const paymentAmount = event.amount || finalAmount;
-									const serviceCharge = {
-										percentage: ((_event$surcharge = event.surcharge) === null || _event$surcharge === void 0 ? void 0 : _event$surcharge.ratePercent) ? new decimal_js.default(event.surcharge.ratePercent).div(100).toString() : void 0,
-										amount: (_event$surcharge2 = event.surcharge) === null || _event$surcharge2 === void 0 ? void 0 : _event$surcharge2.fixedAmount
-									};
-									yield updateEftposPayment({
-										paymentNumber,
-										transactionNumber: eventTransactionNumber,
-										updates: {
-											amount: paymentAmount,
-											service_charge: serviceCharge,
-											service_fee: calculateEftposServiceFee(paymentAmount, serviceCharge),
-											metadata: {
-												manual_marking_flag: event.manuallyConfirmed ? 1 : void 0,
-												card_reader_snapshot: event.readerSnapshot
+									if (event.type === "success" || event.type === "failed") {
+										var _screenProtector$resu3, _event$surcharge, _event$surcharge2;
+										screenProtector && (screenProtector === null || screenProtector === void 0 || (_screenProtector$resu3 = screenProtector.resumeIdleTimer) === null || _screenProtector$resu3 === void 0 || _screenProtector$resu3.call(screenProtector));
+										shouldPreservePendingEftpos = true;
+										if (event.type !== "success") return;
+										const paymentAmount = event.amount || finalAmount;
+										const serviceCharge = {
+											percentage: ((_event$surcharge = event.surcharge) === null || _event$surcharge === void 0 ? void 0 : _event$surcharge.ratePercent) ? new decimal_js.default(event.surcharge.ratePercent).div(100).toString() : void 0,
+											amount: (_event$surcharge2 = event.surcharge) === null || _event$surcharge2 === void 0 ? void 0 : _event$surcharge2.fixedAmount
+										};
+										yield updateEftposPayment({
+											paymentNumber,
+											transactionNumber: eventTransactionNumber,
+											updates: {
+												amount: paymentAmount,
+												service_charge: serviceCharge,
+												service_fee: calculateEftposServiceFee(paymentAmount, serviceCharge),
+												metadata: {
+													manual_marking_flag: event.manuallyConfirmed ? 1 : void 0,
+													card_reader_snapshot: event.readerSnapshot
+												}
 											}
-										}
-									});
-									return;
-								}
-								if (event.type === "closed" && !shouldPreservePendingEftpos) {
-									var _screenProtector$resu4;
-									screenProtector && (screenProtector === null || screenProtector === void 0 || (_screenProtector$resu4 = screenProtector.resumeIdleTimer) === null || _screenProtector$resu4 === void 0 || _screenProtector$resu4.call(screenProtector));
-									yield deletePendingEftposPayment(paymentNumber);
+										});
+										return;
+									}
+									if (event.type === "closed" && !shouldPreservePendingEftpos) {
+										var _screenProtector$resu4;
+										screenProtector && (screenProtector === null || screenProtector === void 0 || (_screenProtector$resu4 = screenProtector.resumeIdleTimer) === null || _screenProtector$resu4 === void 0 || _screenProtector$resu4.call(screenProtector));
+										yield deletePendingEftposPayment(paymentNumber);
+									}
+								} catch (error) {
+									handleEftposUpdateError(error, paymentNumber);
+								} finally {
+									if (isTerminalEvent) finishPaymentActivity();
 								}
-							} catch (error) {
-								handleEftposUpdateError(error, paymentNumber);
-							}
+							});
+							return function onChange(_x35) {
+								return _ref28.apply(this, arguments);
+							};
+						}()
+					}))) paymentActivityHandedOff = true;
+					else yield deletePendingEftposPayment(paymentNumber);
+				} else {
+					var _metadata, _screenProtector$resu5;
+					let service_charge = null;
+					if ((method === null || method === void 0 ? void 0 : method.fixed) || (method === null || method === void 0 ? void 0 : method.percentage)) service_charge = {
+						amount: (method === null || method === void 0 ? void 0 : method.fixed) || "0",
+						percentage: (method === null || method === void 0 ? void 0 : method.percentage) || "0"
+					};
+					if (!canAddOrderPayment(finalAmount)) return;
+					if (method.type === "custom" && ((_metadata = method.metadata) === null || _metadata === void 0 ? void 0 : _metadata.order_open_cash_drawer)) {
+						var _interaction$utils2, _interaction$utils2$p;
+						logger === null || logger === void 0 || logger.addLog({
+							type: "info",
+							title: "open_till",
+							metadata: {}
 						});
-						return function onChange(_x35) {
-							return _ref28.apply(this, arguments);
-						};
-					}()
-				}))) yield deletePendingEftposPayment(paymentNumber);
-			} else {
-				var _metadata, _screenProtector$resu5;
-				let service_charge = null;
-				if ((method === null || method === void 0 ? void 0 : method.fixed) || (method === null || method === void 0 ? void 0 : method.percentage)) service_charge = {
-					amount: (method === null || method === void 0 ? void 0 : method.fixed) || "0",
-					percentage: (method === null || method === void 0 ? void 0 : method.percentage) || "0"
-				};
-				if (!canAddOrderPayment(finalAmount)) return;
-				if (method.type === "custom" && ((_metadata = method.metadata) === null || _metadata === void 0 ? void 0 : _metadata.order_open_cash_drawer)) {
-					var _interaction$utils2, _interaction$utils2$p;
-					logger === null || logger === void 0 || logger.addLog({
-						type: "info",
-						title: "open_till",
-						metadata: {}
-					});
-					interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || (_interaction$utils2$p = _interaction$utils2.postMessageToApp) === null || _interaction$utils2$p === void 0 || _interaction$utils2$p.call(_interaction$utils2, {
-						module: "till",
-						key: "open_till",
-						data: { type: "cash" }
+						interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || (_interaction$utils2$p = _interaction$utils2.postMessageToApp) === null || _interaction$utils2$p === void 0 || _interaction$utils2$p.call(_interaction$utils2, {
+							module: "till",
+							key: "open_till",
+							data: { type: "cash" }
+						});
+					}
+					setIsChangePaymentNotIncludeVoucher === null || setIsChangePaymentNotIncludeVoucher === void 0 || setIsChangePaymentNotIncludeVoucher(true);
+					yield addBaseSalesOrderPayment(currentBaseSales, {
+						amount: finalAmount,
+						code: method.code,
+						custom_payment_id: method.id,
+						name: method.name,
+						custom_payment_type: method.type,
+						voucher_id: 0,
+						service_charge
 					});
+					screenProtector && (screenProtector === null || screenProtector === void 0 || (_screenProtector$resu5 = screenProtector.resumeIdleTimer) === null || _screenProtector$resu5 === void 0 || _screenProtector$resu5.call(screenProtector));
 				}
-				setIsChangePaymentNotIncludeVoucher === null || setIsChangePaymentNotIncludeVoucher === void 0 || setIsChangePaymentNotIncludeVoucher(true);
-				yield addBaseSalesOrderPayment(currentBaseSales, {
-					amount: finalAmount,
-					code: method.code,
-					custom_payment_id: method.id,
-					name: method.name,
-					custom_payment_type: method.type,
-					voucher_id: 0,
-					service_charge
-				});
-				screenProtector && (screenProtector === null || screenProtector === void 0 || (_screenProtector$resu5 = screenProtector.resumeIdleTimer) === null || _screenProtector$resu5 === void 0 || _screenProtector$resu5.call(screenProtector));
+			} finally {
+				if (!paymentActivityHandedOff) finishPaymentActivity();
 			}
 		});
 		return function onPaymentOptionClick(_x36) {
@@ -1816,13 +1957,16 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 	const [confirmLoading, setConfirmLoading] = (0, react.useState)(false);
 	const handleWalletPassConfirmPay = function() {
 		var _ref34 = require_asyncToGenerator._asyncToGenerator(function* (action) {
+			if (action === "cancel") return;
+			const finishPaymentActivity = beginKioskPaymentActivity("wallet-confirm");
+			if (!finishPaymentActivity) return;
 			let confirmPendingVoucherPayments = true;
-			if (action === "save-without-deduct") {
-				confirmPendingVoucherPayments = false;
-				yield clearPendingWalletPassPaymentsForMode();
-			} else if (action === "cancel") return;
 			setConfirmLoading(true);
 			try {
+				if (action === "save-without-deduct") {
+					confirmPendingVoucherPayments = false;
+					yield clearPendingWalletPassPaymentsForMode();
+				}
 				const result = confirmPendingVoucherPayments ? yield confirmBaseSalesWalletPayment(currentBaseSales) : yield submitBaseSalesOrder(currentBaseSales, { confirmPendingVoucherPayments: false });
 				if (result.success) yield cacheSubmittedOrderResult(result);
 				yield showSuccessToast === null || showSuccessToast === void 0 ? void 0 : showSuccessToast(require_objectSpread2._objectSpread2({}, result));
@@ -1842,6 +1986,7 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 				console.error("Failed to submit base sales order:", error);
 			} finally {
 				setConfirmLoading(false);
+				finishPaymentActivity();
 			}
 		});
 		return function handleWalletPassConfirmPay(_x41) {
@@ -1885,13 +2030,21 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 	};
 	const shouldShowCashPayment = moduleConfig.showCashPayment && showCashPayment;
 	const paymentOptionsColumnCount = (_config$paymentOption = config === null || config === void 0 ? void 0 : config.paymentOptionsColumnCount) !== null && _config$paymentOption !== void 0 ? _config$paymentOption : shouldShowCashPayment ? 1 : 2;
-	const handleSearch = (0, react.useCallback)((keyword) => {
-		if (walletPassRef.current) return walletPassRef.current.handleSearchIdentificationCode(keyword);
-	}, []);
+	const isKioskCheckoutActivityLocked = paymentChannel === "kiosk" && (syncingLock || paymentScanActivity.isScanProcessing || paymentScanActivity.isPaymentProcessing);
+	const handleSearch = (0, ahooks.useMemoizedFn)(function() {
+		var _ref37 = require_asyncToGenerator._asyncToGenerator(function* (keyword) {
+			if (!walletPassRef.current) return void 0;
+			if (paymentChannel !== "kiosk") return walletPassRef.current.handleSearchIdentificationCode(keyword);
+			return walletPassRef.current.handleSearchIdentificationCode(keyword, { waitForApply: true });
+		});
+		return function(_x43) {
+			return _ref37.apply(this, arguments);
+		};
+	}());
 	(0, react.useEffect)(() => {
 		let isCancelled = false;
 		(function() {
-			var _ref38 = require_asyncToGenerator._asyncToGenerator(function* () {
+			var _ref39 = require_asyncToGenerator._asyncToGenerator(function* () {
 				var _currentBaseSales$get14, _amountSnapshot$summa;
 				if (!currentBaseSales) {
 					setPriceAdjustProductExpectAmount(void 0);
@@ -1900,16 +2053,16 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 				const amountSnapshot = (_currentBaseSales$get14 = currentBaseSales.getOrderAmountSnapshot) === null || _currentBaseSales$get14 === void 0 ? void 0 : _currentBaseSales$get14.call(currentBaseSales);
 				let productExpectAmount = amountSnapshot === null || amountSnapshot === void 0 || (_amountSnapshot$summa = amountSnapshot.summary) === null || _amountSnapshot$summa === void 0 ? void 0 : _amountSnapshot$summa.product_expect_amount;
 				try {
-					var _currentBaseSales$get15, _ref37, _summary$product_expe, _summary$summary;
+					var _currentBaseSales$get15, _ref38, _summary$product_expe, _summary$summary;
 					const summary = yield (_currentBaseSales$get15 = currentBaseSales.getSummary) === null || _currentBaseSales$get15 === void 0 ? void 0 : _currentBaseSales$get15.call(currentBaseSales);
-					productExpectAmount = (_ref37 = (_summary$product_expe = summary === null || summary === void 0 ? void 0 : summary.product_expect_amount) !== null && _summary$product_expe !== void 0 ? _summary$product_expe : summary === null || summary === void 0 || (_summary$summary = summary.summary) === null || _summary$summary === void 0 ? void 0 : _summary$summary.product_expect_amount) !== null && _ref37 !== void 0 ? _ref37 : productExpectAmount;
+					productExpectAmount = (_ref38 = (_summary$product_expe = summary === null || summary === void 0 ? void 0 : summary.product_expect_amount) !== null && _summary$product_expe !== void 0 ? _summary$product_expe : summary === null || summary === void 0 || (_summary$summary = summary.summary) === null || _summary$summary === void 0 ? void 0 : _summary$summary.product_expect_amount) !== null && _ref38 !== void 0 ? _ref38 : productExpectAmount;
 				} catch (error) {
 					console.error("Failed to read BaseSales summary:", error);
 				}
 				if (!isCancelled) setPriceAdjustProductExpectAmount(productExpectAmount);
 			});
 			return function readProductExpectAmount() {
-				return _ref38.apply(this, arguments);
+				return _ref39.apply(this, arguments);
 			};
 		})()();
 		return () => {
@@ -1922,8 +2075,8 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 		balanceDueTotalAmount
 	]);
 	const priceAdjustOriginalAmount = (0, react.useMemo)(() => {
-		var _ref39, _ref40;
-		return Number((_ref39 = (_ref40 = priceAdjustProductExpectAmount !== null && priceAdjustProductExpectAmount !== void 0 ? priceAdjustProductExpectAmount : currentTotalPrice) !== null && _ref40 !== void 0 ? _ref40 : orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.totalAmount) !== null && _ref39 !== void 0 ? _ref39 : 0);
+		var _ref40, _ref41;
+		return Number((_ref40 = (_ref41 = priceAdjustProductExpectAmount !== null && priceAdjustProductExpectAmount !== void 0 ? priceAdjustProductExpectAmount : currentTotalPrice) !== null && _ref41 !== void 0 ? _ref41 : orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.totalAmount) !== null && _ref40 !== void 0 ? _ref40 : 0);
 	}, [
 		priceAdjustProductExpectAmount,
 		currentTotalPrice,
@@ -1933,7 +2086,7 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 		return new decimal_js.default(priceAdjustOriginalAmount).minus(shopDiscount || 0).toNumber();
 	}, [shopDiscount, priceAdjustOriginalAmount]);
 	const handleSelectWalletChange = (0, ahooks.useMemoizedFn)(function() {
-		var _ref41 = require_asyncToGenerator._asyncToGenerator(function* (select) {
+		var _ref42 = require_asyncToGenerator._asyncToGenerator(function* (select) {
 			if (walletPassMode === "shared") {
 				var _currentBaseSales$get16;
 				setPaymentItems((currentBaseSales === null || currentBaseSales === void 0 || (_currentBaseSales$get16 = currentBaseSales.getOrderPayments) === null || _currentBaseSales$get16 === void 0 ? void 0 : _currentBaseSales$get16.call(currentBaseSales)) || []);
@@ -1989,8 +2142,8 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 					}
 				});
 				if (typeof (currentBaseSales === null || currentBaseSales === void 0 ? void 0 : currentBaseSales.updateVoucherOrderPaymentsAsync) !== "function" && typeof (currentBaseSales === null || currentBaseSales === void 0 ? void 0 : currentBaseSales.updateVoucherOrderPayments) !== "function") {
-					var _logger$addLog12;
-					logger === null || logger === void 0 || (_logger$addLog12 = logger.addLog) === null || _logger$addLog12 === void 0 || _logger$addLog12.call(logger, {
+					var _logger$addLog14;
+					logger === null || logger === void 0 || (_logger$addLog14 = logger.addLog) === null || _logger$addLog14 === void 0 || _logger$addLog14.call(logger, {
 						type: "error",
 						title: "BaseSales updateVoucherOrderPayments is not available",
 						metadata: {
@@ -2006,8 +2159,8 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 				if (walletPassRef.current) setWalletPassData(walletPassRef.current.getWalletPassData(select));
 			}
 		});
-		return function(_x43) {
-			return _ref41.apply(this, arguments);
+		return function(_x44) {
+			return _ref42.apply(this, arguments);
 		};
 	}());
 	const handleWalletDiscountChange = (0, ahooks.useMemoizedFn)((detail) => {
@@ -2024,7 +2177,7 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 		}
 	});
 	const handlePriceAdjustConfirm = function() {
-		var _ref42 = require_asyncToGenerator._asyncToGenerator(function* (discountAmount) {
+		var _ref43 = require_asyncToGenerator._asyncToGenerator(function* (discountAmount) {
 			if (!isPriceAdjustEnabled) {
 				setShowPriceAdjustModal(false);
 				return;
@@ -2048,12 +2201,12 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 			}
 			setShowPriceAdjustModal(false);
 		});
-		return function handlePriceAdjustConfirm(_x44) {
-			return _ref42.apply(this, arguments);
+		return function handlePriceAdjustConfirm(_x45) {
+			return _ref43.apply(this, arguments);
 		};
 	}();
 	const handleButtonClick = function() {
-		var _ref43 = require_asyncToGenerator._asyncToGenerator(function* (key) {
+		var _ref44 = require_asyncToGenerator._asyncToGenerator(function* (key) {
 			console.log("handleButtonClick", key);
 			switch (key) {
 				case "order-note":
@@ -2066,24 +2219,24 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 					setShowSplitPaymentKeyboard(true);
 					break;
 				case "print-receipt":
-					var _logger$addLog13;
+					var _logger$addLog15;
 					if (!(currentBaseSales === null || currentBaseSales === void 0 ? void 0 : currentBaseSales.printLocalOrderReceipt)) return;
-					logger === null || logger === void 0 || (_logger$addLog13 = logger.addLog) === null || _logger$addLog13 === void 0 || _logger$addLog13.call(logger, {
+					logger === null || logger === void 0 || (_logger$addLog15 = logger.addLog) === null || _logger$addLog15 === void 0 || _logger$addLog15.call(logger, {
 						type: "info",
 						title: "支付弹窗请求本地打印小票"
 					});
 					try {
-						var _logger$addLog14;
+						var _logger$addLog16;
 						const res = yield currentBaseSales.printLocalOrderReceipt();
-						logger === null || logger === void 0 || (_logger$addLog14 = logger.addLog) === null || _logger$addLog14 === void 0 || _logger$addLog14.call(logger, {
+						logger === null || logger === void 0 || (_logger$addLog16 = logger.addLog) === null || _logger$addLog16 === void 0 || _logger$addLog16.call(logger, {
 							type: "info",
 							title: "支付弹窗请求本地打印小票结果",
 							metadata: { res }
 						});
 					} catch (error) {
-						var _logger$addLog15;
+						var _logger$addLog17;
 						console.error("handleButtonClick_print-receipt_error>>>>", error);
-						logger === null || logger === void 0 || (_logger$addLog15 = logger.addLog) === null || _logger$addLog15 === void 0 || _logger$addLog15.call(logger, {
+						logger === null || logger === void 0 || (_logger$addLog17 = logger.addLog) === null || _logger$addLog17 === void 0 || _logger$addLog17.call(logger, {
 							type: "error",
 							title: "支付弹窗请求本地打印小票失败",
 							metadata: { error: error instanceof Error ? error.message : String(error) }
@@ -2114,8 +2267,8 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 					break;
 			}
 		});
-		return function handleButtonClick(_x45) {
-			return _ref43.apply(this, arguments);
+		return function handleButtonClick(_x46) {
+			return _ref44.apply(this, arguments);
 		};
 	}();
 	(0, react.useImperativeHandle)(ref, () => ({
@@ -2141,7 +2294,7 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 		};
 	};
 	const handleSendCustomerPaymentLink = function() {
-		var _ref44 = require_asyncToGenerator._asyncToGenerator(function* (data) {
+		var _ref45 = require_asyncToGenerator._asyncToGenerator(function* (data) {
 			var _currentBaseSales$get20, _Toast$loading4, _currentBaseSales$get23, _Toast$hide6;
 			let orderId = currentBaseSales === null || currentBaseSales === void 0 || (_currentBaseSales$get20 = currentBaseSales.getOrderIdentity) === null || _currentBaseSales$get20 === void 0 || (_currentBaseSales$get20 = _currentBaseSales$get20.call(currentBaseSales)) === null || _currentBaseSales$get20 === void 0 ? void 0 : _currentBaseSales$get20.orderId;
 			const order = getBaseSalesOrderInfo(currentBaseSales);
@@ -2180,8 +2333,8 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 				}, 1e3);
 			} else Toast === null || Toast === void 0 || Toast.error(res.message || _pisell_utils.locales.getText("pisell2.checkout.send-payment-link.error"));
 		});
-		return function handleSendCustomerPaymentLink(_x46) {
-			return _ref44.apply(this, arguments);
+		return function handleSendCustomerPaymentLink(_x47) {
+			return _ref45.apply(this, arguments);
 		};
 	}();
 	const handleClientChange = (0, react.useCallback)((nextClient) => {
@@ -2224,12 +2377,12 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 		customerGuard.isCustomerChangeLocked
 	]);
 	const roundingFunction = (0, react.useCallback)(function() {
-		var _ref45 = require_asyncToGenerator._asyncToGenerator(function* (amount) {
+		var _ref46 = require_asyncToGenerator._asyncToGenerator(function* (amount) {
 			var _currentBaseSales$rou;
 			return yield currentBaseSales === null || currentBaseSales === void 0 || (_currentBaseSales$rou = currentBaseSales.roundAmount) === null || _currentBaseSales$rou === void 0 ? void 0 : _currentBaseSales$rou.call(currentBaseSales, { amount });
 		});
-		return function(_x47) {
-			return _ref45.apply(this, arguments);
+		return function(_x48) {
+			return _ref46.apply(this, arguments);
 		};
 	}(), [currentBaseSales]);
 	const handleModalClick = (0, react.useCallback)((event) => {
@@ -2239,13 +2392,13 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 		padding: "12px 16px",
 		border: "1px solid #d0d5dd",
 		borderRadius: 8
-	} }, (moduleConfig.showCustomerModule || moduleConfig.showCustomerSelect) && /* @__PURE__ */ react.default.createElement(require_index$11.default, require_objectSpread2._objectSpread2({
+	} }, (moduleConfig.showCustomerModule || moduleConfig.showCustomerSelect) && /* @__PURE__ */ react.default.createElement(require_index$11.default, require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({
 		onClientChange: handleClientChange,
 		clientInfo: displayClient,
 		onSearch: handleSearch,
 		baseSales: currentBaseSales,
 		showCustomerSelect: moduleConfig.showCustomerSelect
-	}, searchAndClientProps)), moduleConfig.showWalletPass && /* @__PURE__ */ react.default.createElement(require_index$8.default, {
+	}, searchAndClientProps), {}, { beginScanActivity: paymentChannel === "kiosk" ? beginKioskScanActivity : void 0 })), moduleConfig.showWalletPass && /* @__PURE__ */ react.default.createElement(require_index$8.default, {
 		clientId: (_displayClient$id2 = displayClient === null || displayClient === void 0 ? void 0 : displayClient.id) !== null && _displayClient$id2 !== void 0 ? _displayClient$id2 : displayClient === null || displayClient === void 0 ? void 0 : displayClient.customer_id,
 		customAmount: balanceDueAmount,
 		orderInfo: orderInfo || void 0,
@@ -2276,13 +2429,19 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 		shouldUseNormalPayment: hasNonDepositOrderPayment,
 		enablePriceAdjust: isPriceAdjustEnabled,
 		showPaymentType: (config === null || config === void 0 ? void 0 : config.showPaymentType) !== false
-	}), /* @__PURE__ */ react.default.createElement("div", { className: shouldShowCashPayment ? "payment-grid-layout" : "payment-flex-layout" }, shouldShowCashPayment && /* @__PURE__ */ react.default.createElement("div", { style: shouldShowCashPayment ? {
-		gridColumn: "1",
-		gridRow: (paymentOptionList === null || paymentOptionList === void 0 ? void 0 : paymentOptionList.length) === 1 ? "span 2" : "1"
-	} : {} }, /* @__PURE__ */ react.default.createElement(require_index$4.default, {
+	}), /* @__PURE__ */ react.default.createElement("div", { className: shouldShowCashPayment ? "payment-grid-layout" : "payment-flex-layout" }, shouldShowCashPayment && /* @__PURE__ */ react.default.createElement("div", {
+		"aria-disabled": isKioskCheckoutActivityLocked,
+		style: require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, shouldShowCashPayment ? {
+			gridColumn: "1",
+			gridRow: (paymentOptionList === null || paymentOptionList === void 0 ? void 0 : paymentOptionList.length) === 1 ? "span 2" : "1"
+		} : {}), isKioskCheckoutActivityLocked ? {
+			opacity: .6,
+			pointerEvents: "none"
+		} : {})
+	}, /* @__PURE__ */ react.default.createElement(require_index$4.default, {
 		disabled: isOrderFree,
 		isModalOpen,
-		syncingLock,
+		syncingLock: syncingLock || isKioskCheckoutActivityLocked,
 		amountSymbol: getData("shop_symbol"),
 		orderInfo: orderInfo || void 0,
 		onPaymentComplete: handleAddCashPayment,
@@ -2305,7 +2464,7 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 		paymentMethods,
 		customAmount: effectiveCustomAmount,
 		title: paymentOptionsTitle,
-		disabled: isOrderFree,
+		disabled: isOrderFree || isKioskCheckoutActivityLocked,
 		showCashPayment: shouldShowCashPayment,
 		channel: paymentChannel,
 		columnCount: paymentOptionsColumnCount,
@@ -2313,6 +2472,7 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 		directCustomPayment: (config === null || config === void 0 ? void 0 : config.directCustomPayment) === true,
 		isModalOpen,
 		paymentMethodsReady,
+		beginKioskPaymentActivity,
 		currentBaseSales,
 		autoTriggerSinglePaymentOption: (config === null || config === void 0 ? void 0 : config.autoTriggerSinglePaymentOption) === true
 	})), moduleConfig.showAdditionalModule && /* @__PURE__ */ react.default.createElement("div", {
@@ -2417,8 +2577,8 @@ const PaymentModal = ({ open, baseSales, baseSalesModuleName, walletPassMode = "
 	const cardReaderFetchPromiseRef = (0, react.useRef)(null);
 	const [totalAmount, setTotalAmount] = (0, react.useState)(0);
 	const displayTotalAmount = (0, react.useMemo)(() => {
-		var _ref46, _orderInfo$totalAmoun;
-		return Number((_ref46 = (_orderInfo$totalAmoun = orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.totalAmount) !== null && _orderInfo$totalAmoun !== void 0 ? _orderInfo$totalAmoun : totalAmount) !== null && _ref46 !== void 0 ? _ref46 : 0);
+		var _ref47, _orderInfo$totalAmoun;
+		return Number((_ref47 = (_orderInfo$totalAmoun = orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.totalAmount) !== null && _orderInfo$totalAmoun !== void 0 ? _orderInfo$totalAmoun : totalAmount) !== null && _ref47 !== void 0 ? _ref47 : 0);
 	}, [orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.totalAmount, totalAmount]);
 	const [actualShowCashPayment, setActualShowCashPayment] = (0, react.useState)(true);
 	const [windowHeight, setWindowHeight] = (0, react.useState)(0);
@@ -2452,7 +2612,7 @@ const PaymentModal = ({ open, baseSales, baseSalesModuleName, walletPassMode = "
 		Toast
 	]);
 	const handleRetry = function() {
-		var _ref47 = require_asyncToGenerator._asyncToGenerator(function* () {
+		var _ref48 = require_asyncToGenerator._asyncToGenerator(function* () {
 			if (isRetryingPaymentSync) return;
 			setIsRetryingPaymentSync(true);
 			try {
@@ -2465,7 +2625,7 @@ const PaymentModal = ({ open, baseSales, baseSalesModuleName, walletPassMode = "
 			}
 		});
 		return function handleRetry() {
-			return _ref47.apply(this, arguments);
+			return _ref48.apply(this, arguments);
 		};
 	}();
 	(0, react.useEffect)(() => {
@@ -2483,7 +2643,7 @@ const PaymentModal = ({ open, baseSales, baseSalesModuleName, walletPassMode = "
 	(0, react.useEffect)(() => {
 		var _interaction$utils4;
 		const initTillButtonData = function() {
-			var _ref48 = require_asyncToGenerator._asyncToGenerator(function* () {
+			var _ref49 = require_asyncToGenerator._asyncToGenerator(function* () {
 				console.log("准备获取tillButton数据");
 				try {
 					var _interaction$utils3, _interaction$utils3$a;
@@ -2501,7 +2661,7 @@ const PaymentModal = ({ open, baseSales, baseSalesModuleName, walletPassMode = "
 				}
 			});
 			return function initTillButtonData() {
-				return _ref48.apply(this, arguments);
+				return _ref49.apply(this, arguments);
 			};
 		}();
 		if (interaction === null || interaction === void 0 || (_interaction$utils4 = interaction.utils) === null || _interaction$utils4 === void 0 ? void 0 : _interaction$utils4.asyncDataManager) initTillButtonData();
@@ -2556,7 +2716,7 @@ const PaymentModal = ({ open, baseSales, baseSalesModuleName, walletPassMode = "
 	const [orderNote, setOrderNote] = (0, react.useState)("");
 	const [noteModalSource, setNoteModalSource] = (0, react.useState)("payment-content");
 	const handleNoteConfirm = function() {
-		var _ref49 = require_asyncToGenerator._asyncToGenerator(function* (noteValue) {
+		var _ref50 = require_asyncToGenerator._asyncToGenerator(function* (noteValue) {
 			if (noteModalSource === "payment-result-toast") {
 				var _baseSalesModule$getO;
 				const baseSalesModule = currentBaseSales;
@@ -2589,12 +2749,12 @@ const PaymentModal = ({ open, baseSales, baseSalesModuleName, walletPassMode = "
 			setNoteModalOpen(false);
 			setNoteModalSource("payment-content");
 		});
-		return function handleNoteConfirm(_x48) {
-			return _ref49.apply(this, arguments);
+		return function handleNoteConfirm(_x49) {
+			return _ref50.apply(this, arguments);
 		};
 	}();
 	const handleNoteDelete = function() {
-		var _ref50 = require_asyncToGenerator._asyncToGenerator(function* () {
+		var _ref51 = require_asyncToGenerator._asyncToGenerator(function* () {
 			try {
 				const baseSalesModule = currentBaseSales;
 				if (baseSalesModule) {
@@ -2612,7 +2772,7 @@ const PaymentModal = ({ open, baseSales, baseSalesModuleName, walletPassMode = "
 			setNoteModalSource("payment-content");
 		});
 		return function handleNoteDelete() {
-			return _ref50.apply(this, arguments);
+			return _ref51.apply(this, arguments);
 		};
 	}();
 	const handleNoteCancel = () => {
@@ -2685,7 +2845,7 @@ const PaymentModal = ({ open, baseSales, baseSalesModuleName, walletPassMode = "
 		});
 	};
 	const handlePaymentCancel = function() {
-		var _ref51 = require_asyncToGenerator._asyncToGenerator(function* (reset, forceCloseWhenSyncing, reason) {
+		var _ref52 = require_asyncToGenerator._asyncToGenerator(function* (reset, forceCloseWhenSyncing, reason) {
 			var _paymentContentRef$cu3, _paymentContentRef$cu4, _baseSalesModule$getO2;
 			const isSyncingLocked = ((_paymentContentRef$cu3 = paymentContentRef.current) === null || _paymentContentRef$cu3 === void 0 || (_paymentContentRef$cu4 = _paymentContentRef$cu3.getSyncingLock) === null || _paymentContentRef$cu4 === void 0 ? void 0 : _paymentContentRef$cu4.call(_paymentContentRef$cu3)) || false;
 			console.log("Payment cancelled, syncingLock:", isSyncingLocked);
@@ -2717,8 +2877,8 @@ const PaymentModal = ({ open, baseSales, baseSalesModuleName, walletPassMode = "
 				paymentResult: currentPaymentResultRef.current
 			}, startNewOrderEvent ? { event: startNewOrderEvent } : {}));
 		});
-		return function handlePaymentCancel(_x49, _x50, _x51) {
-			return _ref51.apply(this, arguments);
+		return function handlePaymentCancel(_x50, _x51, _x52) {
+			return _ref52.apply(this, arguments);
 		};
 	}();
 	const handleBackClose = (0, ahooks.useMemoizedFn)(require_asyncToGenerator._asyncToGenerator(function* () {
@@ -2764,7 +2924,7 @@ const PaymentModal = ({ open, baseSales, baseSalesModuleName, walletPassMode = "
 		});
 	}));
 	(function() {
-		var _ref52 = require_asyncToGenerator._asyncToGenerator(function* (closeModal = false) {
+		var _ref53 = require_asyncToGenerator._asyncToGenerator(function* (closeModal = false) {
 			var _baseSalesModule$getO3, _baseSalesModule$getO4;
 			const baseSalesModule = currentBaseSales;
 			const orderId = baseSalesModule === null || baseSalesModule === void 0 || (_baseSalesModule$getO3 = baseSalesModule.getOrderIdentity) === null || _baseSalesModule$getO3 === void 0 || (_baseSalesModule$getO3 = _baseSalesModule$getO3.call(baseSalesModule)) === null || _baseSalesModule$getO3 === void 0 ? void 0 : _baseSalesModule$getO3.orderId;
@@ -2784,7 +2944,7 @@ const PaymentModal = ({ open, baseSales, baseSalesModuleName, walletPassMode = "
 			}, closeModal);
 		});
 		return function handleSetEditCartMode() {
-			return _ref52.apply(this, arguments);
+			return _ref53.apply(this, arguments);
 		};
 	})();
 	const CustomHeader = () => /* @__PURE__ */ react.default.createElement("div", { className: "payment-modal-custom-header" }, /* @__PURE__ */ react.default.createElement("div", { className: "header__left" }, /* @__PURE__ */ react.default.createElement(antd.Button, {
@@ -2809,7 +2969,7 @@ const PaymentModal = ({ open, baseSales, baseSalesModuleName, walletPassMode = "
 	const unsubscribeRef = (0, react.useRef)(void 0);
 	(0, react.useEffect)(() => {
 		(function() {
-			var _ref53 = require_asyncToGenerator._asyncToGenerator(function* () {
+			var _ref54 = require_asyncToGenerator._asyncToGenerator(function* () {
 				try {
 					const baseSalesModule = currentBaseSales;
 					if (baseSalesModule) {
@@ -2867,7 +3027,7 @@ const PaymentModal = ({ open, baseSales, baseSalesModuleName, walletPassMode = "
 				}
 			});
 			return function initCheckoutData() {
-				return _ref53.apply(this, arguments);
+				return _ref54.apply(this, arguments);
 			};
 		})()();
 	}, []);
@@ -2902,7 +3062,7 @@ const PaymentModal = ({ open, baseSales, baseSalesModuleName, walletPassMode = "
 			require_PaymentResultToastV2Provider.closePaymentResultToastV2();
 		};
 		const handleDetailsClick = function() {
-			var _ref54 = require_asyncToGenerator._asyncToGenerator(function* () {
+			var _ref55 = require_asyncToGenerator._asyncToGenerator(function* () {
 				var _context$appHelper4, _context$appHelper4$a;
 				setTimeout(() => {
 					closeResultToast();
@@ -2917,25 +3077,25 @@ const PaymentModal = ({ open, baseSales, baseSalesModuleName, walletPassMode = "
 				});
 			});
 			return function handleDetailsClick() {
-				return _ref54.apply(this, arguments);
+				return _ref55.apply(this, arguments);
 			};
 		}();
 		const handlePrintReceiptClick = function() {
-			var _ref55 = require_asyncToGenerator._asyncToGenerator(function* () {
-				var _logger$addLog16;
+			var _ref56 = require_asyncToGenerator._asyncToGenerator(function* () {
+				var _logger$addLog18;
 				setTimeout(() => {
 					closeResultToast();
 				}, 0);
 				const baseSalesModule = currentBaseSales;
 				if (!(baseSalesModule === null || baseSalesModule === void 0 ? void 0 : baseSalesModule.printLocalOrderReceipt)) return;
-				(_logger$addLog16 = logger.addLog) === null || _logger$addLog16 === void 0 || _logger$addLog16.call(logger, {
+				(_logger$addLog18 = logger.addLog) === null || _logger$addLog18 === void 0 || _logger$addLog18.call(logger, {
 					type: "info",
 					title: "支付结果弹窗请求本地打印小票"
 				});
 				try {
-					var _logger$addLog17;
+					var _logger$addLog19;
 					const res = yield baseSalesModule.printLocalOrderReceipt(orderId);
-					(_logger$addLog17 = logger.addLog) === null || _logger$addLog17 === void 0 || _logger$addLog17.call(logger, {
+					(_logger$addLog19 = logger.addLog) === null || _logger$addLog19 === void 0 || _logger$addLog19.call(logger, {
 						type: "info",
 						title: "支付结果弹窗请求本地打印小票结果",
 						metadata: { res }
@@ -2946,7 +3106,7 @@ const PaymentModal = ({ open, baseSales, baseSalesModuleName, walletPassMode = "
 				}
 			});
 			return function handlePrintReceiptClick() {
-				return _ref55.apply(this, arguments);
+				return _ref56.apply(this, arguments);
 			};
 		}();
 		const handleRetryClick = () => {