@pisell/private-materials 6.11.803 → 6.11.804

package/es/components/bigSale/templates/Kiosk/index.js

@@ -542,7 +542,8 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 		}
 	}, [isActive]);
 	const handleReturnToAdvertisement = (replace = true, reason) => {
-		if (replace && (paymentPageSessionRef.current || getHasScanRequest() || renderCatalog && (getIsProcessing() || getIsPaymentProcessing()))) return;
+		if (paymentPageSessionRef.current) return;
+		if (replace && (getHasScanRequest() || renderCatalog && (getIsProcessing() || getIsPaymentProcessing()))) return;
 		if (returningToAdvertisementRef.current) return;
 		returningToAdvertisementRef.current = true;
 		setIsReturningToAdvertisement(true);
@@ -670,6 +671,7 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 				businessCode,
 				checkoutSnapshot: preparation.runtimeSnapshot
 			}));
+			const paymentStatus = payload.orderSnapshot.payment_status === "partially_paid" ? "partially_paid" : "paid";
 			persistKioskSessionView(context.sales.bookingTicket, "catalog");
 			try {
 				yield context.sales.clearCartAndReset();
@@ -678,7 +680,7 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 			}
 			try {
 				if (!isActiveRef.current || paymentPageSessionRef.current !== session) return;
-				if (!(yield handOffPaidCheckout(payload))) {
+				if (!(paymentStatus === "paid" && (yield handOffPaidCheckout(payload)))) {
 					var _payload$paymentResul;
 					setPaymentResult((_payload$paymentResul = payload.paymentResult) !== null && _payload$paymentResul !== void 0 ? _payload$paymentResul : null);
 					setView("success");
@@ -686,7 +688,7 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 				onOrderComplete === null || onOrderComplete === void 0 || onOrderComplete({
 					type: "checkout",
 					data: _objectSpread2(_objectSpread2({}, payload), {}, {
-						status: "paid",
+						status: paymentStatus,
 						reason: "paid"
 					}),
 					order_id: payload.orderId,

package/es/components/bigSale/templates/Kiosk/payment/index.js

@@ -87,17 +87,17 @@ function KioskPaymentPage({ context, checkoutPreparation, channel, onBack, onPai
 	const acceptOutcome = useMemoizedFn(function() {
 		var _ref = _asyncToGenerator(function* (outcome, external) {
 			if (!mountedRef.current || stateRef.current === "complete") return;
-			if (outcome.kind === "paid") {
+			if (outcome.kind === "paid" || outcome.kind === "partial" && external) {
 				var _external$orderSnapsh, _baseSales$getTempOrd2, _utils$getData;
 				transition("complete");
 				retryRef.current = void 0;
 				const orderSnapshot = cloneDeep((external === null || external === void 0 || (_external$orderSnapsh = external.orderSnapshot) === null || _external$orderSnapsh === void 0 ? void 0 : _external$orderSnapsh.tempOrder) || (external === null || external === void 0 ? void 0 : external.orderSnapshot) || ((_baseSales$getTempOrd2 = baseSales.getTempOrder) === null || _baseSales$getTempOrd2 === void 0 ? void 0 : _baseSales$getTempOrd2.call(baseSales)) || {});
 				if (external === null || external === void 0 ? void 0 : external.payments) orderSnapshot.payments = cloneDeep(external.payments);
 				orderSnapshot.order_id = outcome.orderId;
-				orderSnapshot.payment_status = "paid";
+				orderSnapshot.payment_status = outcome.kind === "partial" ? "partially_paid" : "paid";
 				const paymentResult = presentBaseSalesPaymentResult({
 					baseSales,
-					status: "success",
+					status: outcome.kind === "partial" ? "partially-paid" : "success",
 					displayMode: "page",
 					currencySymbol,
 					payments: external === null || external === void 0 ? void 0 : external.payments,
@@ -196,7 +196,7 @@ function KioskPaymentPage({ context, checkoutPreparation, channel, onBack, onPai
 		}
 	}));
 	const beginAuthorization = useMemoizedFn((_source) => {
-		var _readPaymentAmount;
+		var _globalThis$crypto, _globalThis$crypto$ra;
 		if (stateRef.current !== "idle") return null;
 		if (!authorizationAvailableRef.current) {
 			toast.fail(locales.getText("pisell2.checkout.self-service.empty"));
@@ -208,11 +208,10 @@ function KioskPaymentPage({ context, checkoutPreparation, channel, onBack, onPai
 			toast.fail(error instanceof Error ? error.message : String(error));
 			return null;
 		}
-		const token = Symbol("authorization");
+		const token = ((_globalThis$crypto = globalThis.crypto) === null || _globalThis$crypto === void 0 || (_globalThis$crypto$ra = _globalThis$crypto.randomUUID) === null || _globalThis$crypto$ra === void 0 ? void 0 : _globalThis$crypto$ra.call(_globalThis$crypto)) || `kiosk-payment-${Date.now()}-${Math.random().toString(36).slice(2)}`;
 		authorizationRef.current = {
 			token,
-			settling: false,
-			amount: (_readPaymentAmount = readPaymentAmount(baseSales)) !== null && _readPaymentAmount !== void 0 ? _readPaymentAmount : 0
+			settling: false
 		};
 		transition("authorizing");
 		const release = (() => {
@@ -221,6 +220,7 @@ function KioskPaymentPage({ context, checkoutPreparation, channel, onBack, onPai
 			authorizationRef.current = void 0;
 			transition("idle");
 		});
+		release.paymentRequestId = token;
 		release.isActive = () => {
 			var _authorizationRef$cur;
 			return mountedRef.current && ((_authorizationRef$cur = authorizationRef.current) === null || _authorizationRef$cur === void 0 ? void 0 : _authorizationRef$cur.token) === token;
@@ -242,30 +242,15 @@ function KioskPaymentPage({ context, checkoutPreparation, channel, onBack, onPai
 						const authorization = authorizationRef.current;
 						if (!authorization || authorization.settling) return;
 						if (command !== "payment_result") return;
+						if (params.requestId !== authorization.token) return;
 						authorization.settling = true;
 						try {
 							if (params.status === "cancelled") {
 								yield acceptOutcome({ kind: "cancelled" });
 								return;
 							}
-							if (params.ok === true) try {
-								const outcome = inspectPaymentCompletion(baseSales, params.syncResult);
-								if (outcome.kind === "partial") {
-									var _baseSales$getTempOrd3, _baseSales$getTempOrd4;
-									const currentOrderId = String((_baseSales$getTempOrd3 = (_baseSales$getTempOrd4 = baseSales.getTempOrder) === null || _baseSales$getTempOrd4 === void 0 || (_baseSales$getTempOrd4 = _baseSales$getTempOrd4.call(baseSales)) === null || _baseSales$getTempOrd4 === void 0 ? void 0 : _baseSales$getTempOrd4.order_id) !== null && _baseSales$getTempOrd3 !== void 0 ? _baseSales$getTempOrd3 : "").trim();
-									if (currentOrderId === String(outcome.orderId)) yield context.sales.refreshSalesDetail({ forceRemote: true });
-									else if (!currentOrderId || /^local[_-]/i.test(currentOrderId)) {
-										const remoteOrderId = Number(outcome.orderId);
-										if (!Number.isFinite(remoteOrderId) || remoteOrderId <= 0) throw new Error("The paid order cannot be refreshed.");
-										yield context.sales.loadDetailByRemote(remoteOrderId);
-									} else throw new Error("The current order changed before payment synchronization.");
-									const nextAmount = readPaymentAmount(baseSales);
-									if (nextAmount === void 0 || nextAmount >= authorization.amount) yield acceptOutcome({ kind: "uncertain" });
-									else {
-										preparationRef.current = yield context.sales.prepareCheckout();
-										yield acceptOutcome(outcome);
-									}
-								} else yield acceptOutcome(outcome, params);
+							if (params.ok === true && (params.status === void 0 || params.status === "success")) try {
+								yield acceptOutcome(inspectPaymentCompletion(baseSales, params.syncResult, "main-screen"), params);
 							} catch (error) {
 								yield acceptOutcome({
 									kind: "uncertain",

package/es/components/bigSale/templates/Kiosk/payment/transaction.js

@@ -25,28 +25,45 @@ function submitData(submitResult) {
 	var _submitResult$data;
 	return (submitResult === null || submitResult === void 0 || (_submitResult$data = submitResult.data) === null || _submitResult$data === void 0 ? void 0 : _submitResult$data.data) || (submitResult === null || submitResult === void 0 ? void 0 : submitResult.data) || submitResult;
 }
-/** An approved terminal response is insufficient: require the submitted order too. */
-function inspectPaymentCompletion(baseSales, result) {
-	var _sync$isOrderFullyPai, _ref3, _data$order_id, _baseSales$getTempOrd2;
+/** Sale numbers survive local-to-remote id changes; never settle onto another cart. */
+function capturePaymentOrder(baseSales) {
+	var _baseSales$getTempOrd2, _order$order_id;
+	const order = (_baseSales$getTempOrd2 = baseSales.getTempOrder) === null || _baseSales$getTempOrd2 === void 0 ? void 0 : _baseSales$getTempOrd2.call(baseSales);
+	const saleNumber = String((order === null || order === void 0 ? void 0 : order.external_sale_number) || "").trim();
+	const orderId = String((_order$order_id = order === null || order === void 0 ? void 0 : order.order_id) !== null && _order$order_id !== void 0 ? _order$order_id : "").trim();
+	return () => {
+		var _baseSales$getTempOrd3, _current$order_id;
+		const current = (_baseSales$getTempOrd3 = baseSales.getTempOrder) === null || _baseSales$getTempOrd3 === void 0 ? void 0 : _baseSales$getTempOrd3.call(baseSales);
+		return saleNumber ? String((current === null || current === void 0 ? void 0 : current.external_sale_number) || "").trim() === saleNumber : orderId ? String((_current$order_id = current === null || current === void 0 ? void 0 : current.order_id) !== null && _current$order_id !== void 0 ? _current$order_id : "").trim() === orderId : Boolean(order) && current === order;
+	};
+}
+/**
+* Require a successful order submission as well as payment completion.
+* Main-screen POS checkout persists paid orders locally before background sync;
+* device payments still require a cloud-confirmed order before fulfillment.
+*/
+function inspectPaymentCompletion(baseSales, result, submissionSource = "kiosk") {
+	var _sync$isOrderFullyPai, _ref3, _ref4, _data$order_id, _baseSales$getTempOrd4;
+	const isMainScreen = submissionSource === "main-screen";
 	const sync = (result === null || result === void 0 ? void 0 : result.syncResult) || result;
 	const submitted = sync === null || sync === void 0 ? void 0 : sync.submitResult;
 	const data = submitData(submitted);
-	const amount = readPaymentAmount(baseSales);
+	const amount = isMainScreen ? void 0 : readPaymentAmount(baseSales);
 	const fullyPaid = (_sync$isOrderFullyPai = sync === null || sync === void 0 ? void 0 : sync.isOrderFullyPaid) !== null && _sync$isOrderFullyPai !== void 0 ? _sync$isOrderFullyPai : sync === null || sync === void 0 ? void 0 : sync.isFullyPaid;
-	if ([
+	if (!isMainScreen && [
 		data === null || data === void 0 ? void 0 : data.need_sync,
 		submitted === null || submitted === void 0 ? void 0 : submitted.need_sync,
 		sync === null || sync === void 0 ? void 0 : sync.need_sync
 	].some((value) => Number(value) === 1)) throw new Error("Order sync is not complete.");
 	if (!isSalesOrderSubmitSuccess(submitted)) throw new Error((data === null || data === void 0 ? void 0 : data.message) || (submitted === null || submitted === void 0 ? void 0 : submitted.message) || "Order sync is not complete.");
-	const orderId = (_ref3 = (_data$order_id = data === null || data === void 0 ? void 0 : data.order_id) !== null && _data$order_id !== void 0 ? _data$order_id : data === null || data === void 0 ? void 0 : data.orderId) !== null && _ref3 !== void 0 ? _ref3 : baseSales === null || baseSales === void 0 || (_baseSales$getTempOrd2 = baseSales.getTempOrder) === null || _baseSales$getTempOrd2 === void 0 || (_baseSales$getTempOrd2 = _baseSales$getTempOrd2.call(baseSales)) === null || _baseSales$getTempOrd2 === void 0 ? void 0 : _baseSales$getTempOrd2.order_id;
+	const orderId = (_ref3 = (_ref4 = (_data$order_id = data === null || data === void 0 ? void 0 : data.order_id) !== null && _data$order_id !== void 0 ? _data$order_id : data === null || data === void 0 ? void 0 : data.orderId) !== null && _ref4 !== void 0 ? _ref4 : isMainScreen ? data === null || data === void 0 ? void 0 : data.external_sale_number : void 0) !== null && _ref3 !== void 0 ? _ref3 : baseSales === null || baseSales === void 0 || (_baseSales$getTempOrd4 = baseSales.getTempOrder) === null || _baseSales$getTempOrd4 === void 0 || (_baseSales$getTempOrd4 = _baseSales$getTempOrd4.call(baseSales)) === null || _baseSales$getTempOrd4 === void 0 ? void 0 : _baseSales$getTempOrd4.order_id;
 	const orderStatus = String((data === null || data === void 0 ? void 0 : data.payment_status) || "").toLowerCase();
-	if (orderId === void 0 || orderId === null || String(orderId).trim() === "" || /^local[_-]/i.test(String(orderId))) throw new Error("The submitted order has no remote order id.");
-	if (fullyPaid === false && amount !== void 0 && amount > 0) return {
+	if (orderId === void 0 || orderId === null || String(orderId).trim() === "" || !isMainScreen && /^local[_-]/i.test(String(orderId))) throw new Error("The submitted order has no valid order id.");
+	if (fullyPaid === false && (isMainScreen || amount !== void 0 && amount > 0)) return {
 		kind: "partial",
 		orderId
 	};
-	if (orderStatus && orderStatus !== "paid" || (data === null || data === void 0 ? void 0 : data.order_wait_pay_amount) !== void 0 && Number(data.order_wait_pay_amount) !== 0 || fullyPaid === false || fullyPaid !== true && amount !== 0) throw new Error("The submitted order has not been confirmed as fully paid.");
+	if (orderStatus && orderStatus !== "paid" || (data === null || data === void 0 ? void 0 : data.order_wait_pay_amount) !== void 0 && Number(data.order_wait_pay_amount) !== 0 || fullyPaid === false || fullyPaid !== true && (isMainScreen ? orderStatus !== "paid" : amount !== 0)) throw new Error("The submitted order has not been confirmed as fully paid.");
 	return {
 		kind: "paid",
 		orderId,
@@ -57,18 +74,21 @@ function syncConfirmedPayments(_x) {
 	return _syncConfirmedPayments.apply(this, arguments);
 }
 function _syncConfirmedPayments() {
-	_syncConfirmedPayments = _asyncToGenerator(function* (baseSales) {
-		const retry = () => syncConfirmedPayments(baseSales);
+	_syncConfirmedPayments = _asyncToGenerator(function* (baseSales, isCurrentOrder = capturePaymentOrder(baseSales)) {
+		const retry = () => syncConfirmedPayments(baseSales, isCurrentOrder);
+		if (!isCurrentOrder()) return { kind: "uncertain" };
 		try {
 			var _baseSales$getOrderPa3;
 			if (!(baseSales === null || baseSales === void 0 ? void 0 : baseSales.syncPaymentsToOrder)) throw new Error("Order sync is unavailable.");
-			return inspectPaymentCompletion(baseSales, yield baseSales.syncPaymentsToOrder({
+			const result = yield baseSales.syncPaymentsToOrder({
 				payments: ((_baseSales$getOrderPa3 = baseSales.getOrderPayments) === null || _baseSales$getOrderPa3 === void 0 ? void 0 : _baseSales$getOrderPa3.call(baseSales)) || [],
 				paymentStatus: "paid",
 				submitWhenPaid: true,
 				smallTicketDataFlag: 1,
 				confirmPendingVoucherPayments: true
-			}));
+			});
+			if (!isCurrentOrder()) return { kind: "uncertain" };
+			return inspectPaymentCompletion(baseSales, result);
 		} catch (error) {
 			return {
 				kind: "sync-failed",
@@ -86,14 +106,15 @@ function messageOf(error) {
 * A retry resumes this same confirmed payment; it never invokes a provider again.
 * Pending insertion avoids addOrderPayment's fire-and-forget paid synchronization.
 */
-function createFinalizer({ baseSales, method, confirmed, preparedPaymentNumber }) {
+function createFinalizer({ baseSales, method, confirmed, preparedPaymentNumber, isCurrentOrder }) {
 	var _confirmed$metadata;
 	let paymentNumber = preparedPaymentNumber;
 	const transactionNumber = (_confirmed$metadata = confirmed.metadata) === null || _confirmed$metadata === void 0 ? void 0 : _confirmed$metadata.unique_payment_number;
 	const attemptId = `kiosk-${Date.now()}-${Math.random().toString(36).slice(2)}`;
 	const metadata = _objectSpread2(_objectSpread2({}, confirmed.metadata), {}, { unique_payment_number: transactionNumber || attemptId });
 	return function() {
-		var _ref4 = _asyncToGenerator(function* () {
+		var _ref5 = _asyncToGenerator(function* () {
+			if (!isCurrentOrder()) return { kind: "uncertain" };
 			try {
 				var _baseSales$getOrderPa4;
 				let payments = ((_baseSales$getOrderPa4 = baseSales.getOrderPayments) === null || _baseSales$getOrderPa4 === void 0 ? void 0 : _baseSales$getOrderPa4.call(baseSales)) || [];
@@ -123,10 +144,11 @@ function createFinalizer({ baseSales, method, confirmed, preparedPaymentNumber }
 						return ((_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.unique_payment_number) === metadata.unique_payment_number;
 					});
 				}
+				if (!isCurrentOrder()) return { kind: "uncertain" };
 				paymentNumber = String((payment === null || payment === void 0 ? void 0 : payment.payment_number) || "").trim();
 				if (!paymentNumber) throw new Error("The recorded payment has no payment number.");
-				if (payment.status === "paid") return syncConfirmedPayments(baseSales);
-				return inspectPaymentCompletion(baseSales, preparedPaymentNumber ? yield completePendingEftposPayment({
+				if (payment.status === "paid") return syncConfirmedPayments(baseSales, isCurrentOrder);
+				const result = preparedPaymentNumber ? yield completePendingEftposPayment({
 					baseSales,
 					paymentNumber,
 					amount: confirmed.amount,
@@ -142,7 +164,9 @@ function createFinalizer({ baseSales, method, confirmed, preparedPaymentNumber }
 				}, {
 					persistDraft: true,
 					submitWhenPaid: true
-				}));
+				});
+				if (!isCurrentOrder()) return { kind: "uncertain" };
+				return inspectPaymentCompletion(baseSales, result);
 			} catch (error) {
 				return {
 					kind: "sync-failed",
@@ -152,7 +176,7 @@ function createFinalizer({ baseSales, method, confirmed, preparedPaymentNumber }
 			}
 		});
 		return function finalize() {
-			return _ref4.apply(this, arguments);
+			return _ref5.apply(this, arguments);
 		};
 	}();
 }
@@ -165,6 +189,7 @@ function _executeKioskPayment() {
 		const terminal = CHECKOUT_VISIBLE_PAYMENT_CODES.includes(code);
 		let prepared;
 		let dispatched = false;
+		const isCurrentOrder = capturePaymentOrder(baseSales);
 		try {
 			var _confirmed$metadata2;
 			assertCurrent();
@@ -176,6 +201,7 @@ function _executeKioskPayment() {
 				method,
 				amount
 			});
+			if (!isCurrentOrder()) return { kind: "uncertain" };
 			assertCurrent();
 			dispatched = terminal;
 			const confirmed = terminal ? yield runtime.execute({
@@ -195,6 +221,7 @@ function _executeKioskPayment() {
 					percentage: method.percentage
 				} : null
 			};
+			if (!isCurrentOrder()) return { kind: "uncertain" };
 			if (confirmed.status !== "success") {
 				if (confirmed.preservePendingPayment) return {
 					kind: "uncertain",
@@ -219,20 +246,24 @@ function _executeKioskPayment() {
 				baseSales,
 				method,
 				confirmed,
-				preparedPaymentNumber: prepared === null || prepared === void 0 ? void 0 : prepared.paymentNumber
+				preparedPaymentNumber: prepared === null || prepared === void 0 ? void 0 : prepared.paymentNumber,
+				isCurrentOrder
 			})();
 		} catch (error) {
 			if (dispatched) return {
 				kind: "uncertain",
 				message: messageOf(error)
 			};
-			if (prepared) try {
-				yield discardPendingEftposPayment(baseSales, prepared.paymentNumber);
-			} catch (rollbackError) {
-				return {
-					kind: "uncertain",
-					message: messageOf(rollbackError)
-				};
+			if (prepared) {
+				if (!isCurrentOrder()) return { kind: "uncertain" };
+				try {
+					yield discardPendingEftposPayment(baseSales, prepared.paymentNumber);
+				} catch (rollbackError) {
+					return {
+						kind: "uncertain",
+						message: messageOf(rollbackError)
+					};
+				}
 			}
 			return {
 				kind: "failed",

package/es/components/checkout/PaymentModal.js

@@ -13,7 +13,7 @@ import locales_default from "./locales.js";
 import { clearAllPaymentResultToastsV2, closePaymentResultToastV2, setTillButtonV2 } from "./components/PaymentResultToastV2/PaymentResultToastV2Provider.js";
 import { mapPaymentStatusToV2Status } from "./components/PaymentResultToastV2/resolve.js";
 import { createStartNewOrderPaymentModalEvent } from "./payment-modal-utils.js";
-import { CHECKOUT_VISIBLE_PAYMENT_CODES, SCI_PAYMENT_CODES, SPI_PAYMENT_CODES, WALLET_PASS_CODE_ARRAY, WALLET_PASS_CODE_MAP, resolvePiPaymentProvider } from "./constants.js";
+import { CHECKOUT_VISIBLE_PAYMENT_CODES, MERCHANT_CHANNELS, SCI_PAYMENT_CODES, SPI_PAYMENT_CODES, WALLET_PASS_CODE_ARRAY, WALLET_PASS_CODE_MAP, resolvePiPaymentProvider } from "./constants.js";
 import PaymentMethodRuntime_default from "./paymentRuntime/PaymentMethodRuntime.js";
 import { presentBaseSalesPaymentResult } from "./paymentRuntime/presentBaseSalesPaymentResult.js";
 import { buildSciEftposSurchargeDisplayMap, getCardReadersWithSurcharge, getCurrentDeviceNumber, getShopWalletPassId, isPaidPaymentItem, isPendingVoucherPaymentItem, reorderPaymentMethodList } from "./utils.js";
@@ -469,7 +469,7 @@ const PaymentContent = forwardRef(({ cartData, orderInfo, isModalOpen, onPayment
 	const [showCashPayment, setShowCashPayment] = useState(false);
 	const [paymentOptionsTitle, setPaymentOptionsTitle] = useState(locales.getText("cards.and.digitals") || "Cards & Digitals");
 	useOsKey();
-	const paymentChannel = useMemo(() => String((getData === null || getData === void 0 ? void 0 : getData("channel")) || "pos").trim().toLowerCase(), [getData]);
+	const paymentChannel = useMemo(() => String((getData === null || getData === void 0 ? void 0 : getData("channel")) || "").trim().toLowerCase(), [getData]);
 	const paymentScanActivity = useCheckoutPaymentScanActivity(paymentChannel === "kiosk");
 	const activeKioskPaymentActivityRef = useRef();
 	const paymentOptionList = useMemo(() => {
@@ -1736,7 +1736,7 @@ const PaymentContent = forwardRef(({ cartData, orderInfo, isModalOpen, onPayment
 						style: { marginTop: "10px" }
 					}, locales.getText("order.start-new-order")) } } : {}), {}, {
 						platform: paymentChannel || "pos",
-						usageScene: paymentChannel === "kiosk" ? "user" : "merchant",
+						usageScene: MERCHANT_CHANNELS.includes(paymentChannel) ? "merchant" : "user",
 						onChange: function() {
 							var _ref29 = _asyncToGenerator(function* (event) {
 								const isTerminalEvent = event.type === "success" || event.type === "closed" || event.type === "printOnTimeout";

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

@@ -105,13 +105,13 @@ const PaymentMethodItem = ({ appearance = "default", method, amountSymbol, custo
 					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: {
+						params: _objectSpread2({
 							action: "pay",
 							business_code: otherParams.businessCode || otherParams.business_code,
 							paymentMethodCode: method.code,
 							paymentMethodType: method.type,
 							amount: customAmount
-						}
+						}, (finishPaymentActivity === null || finishPaymentActivity === void 0 ? void 0 : finishPaymentActivity.paymentRequestId) ? { paymentRequestId: finishPaymentActivity.paymentRequestId } : {})
 					}));
 					if (String((authorizationResult === null || authorizationResult === void 0 ? void 0 : authorizationResult.status) || "").toLowerCase() !== "success") finishPaymentActivity === null || finishPaymentActivity === void 0 || finishPaymentActivity();
 				} catch (error) {

package/es/components/checkout/constants.js

@@ -9,6 +9,8 @@ const WALLET_PASS_CODE_MAP = {
 	"gift_card": "GIFTCARD",
 	"point_card": "POINTCARD"
 };
+/** 仅明确的商户渠道可使用人工确认等商户支付操作。 */
+const MERCHANT_CHANNELS = ["pos"];
 const SCI_PAYMENT_CODES = [
 	"EFTPOS_LINKLY",
 	"EFTPOS_TYRO",
@@ -47,4 +49,4 @@ const PI_PAYMENT_PROVIDER_MAP = {
 /** 灰度开关开启时才把 Checkout 支付方式路由到 PiPayment。 */
 const resolvePiPaymentProvider = (code, enabled) => enabled ? PI_PAYMENT_PROVIDER_MAP[code] : void 0;
 //#endregion
-export { CHECKOUT_VISIBLE_PAYMENT_CODES, SCI_PAYMENT_CODES, SCI_PAYMENT_CODE_TO_READER_TYPE, SPI_PAYMENT_CODES, WALLET_PASS_CODE_ARRAY, WALLET_PASS_CODE_MAP, resolvePiPaymentProvider };
+export { CHECKOUT_VISIBLE_PAYMENT_CODES, MERCHANT_CHANNELS, SCI_PAYMENT_CODES, SCI_PAYMENT_CODE_TO_READER_TYPE, SPI_PAYMENT_CODES, WALLET_PASS_CODE_ARRAY, WALLET_PASS_CODE_MAP, resolvePiPaymentProvider };

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

@@ -3,7 +3,7 @@ import { _asyncToGenerator } from "../../../_virtual/_@oxc-project_runtime@0.122
 import { PiPaymentType } from "../../../plus/piPaymentUI/contracts/index.js";
 import PiPayment from "../../../plus/piPaymentUI/PiPayment.js";
 import paymentMethods_default from "../../pay/toB/paymentMethods/index.js";
-import { SCI_PAYMENT_CODES, SPI_PAYMENT_CODES, resolvePiPaymentProvider } from "../constants.js";
+import { MERCHANT_CHANNELS, SCI_PAYMENT_CODES, SPI_PAYMENT_CODES, resolvePiPaymentProvider } from "../constants.js";
 import React, { forwardRef, memo, useImperativeHandle, useMemo, useRef } from "react";
 import { formatAmount } from "@pisell/utils";
 //#region src/components/checkout/paymentRuntime/PaymentMethodRuntime.tsx
@@ -60,7 +60,7 @@ var PaymentMethodRuntime_default = memo(forwardRef(function PaymentMethodRuntime
 	const paymentMethodsRef = useRef(null);
 	const piPaymentRef = useRef(null);
 	const { getData } = context.appHelper.utils || {};
-	const paymentChannel = useMemo(() => String((getData === null || getData === void 0 ? void 0 : getData("channel")) || "pos").trim().toLowerCase(), [getData]);
+	const paymentChannel = useMemo(() => String((getData === null || getData === void 0 ? void 0 : getData("channel")) || "").trim().toLowerCase(), [getData]);
 	const calculateSurcharge = (surchargeConfig, amount) => {
 		if (!(surchargeConfig === null || surchargeConfig === void 0 ? void 0 : surchargeConfig.is_surcharge)) return 0;
 		const baseAmount = Number(amount) || 0;
@@ -242,7 +242,7 @@ var PaymentMethodRuntime_default = memo(forwardRef(function PaymentMethodRuntime
 									type: "shop"
 								},
 								platform: paymentChannel || "pos",
-								usageScene: paymentChannel === "kiosk" ? "user" : "merchant",
+								usageScene: MERCHANT_CHANNELS.includes(paymentChannel) ? "merchant" : "user",
 								onChange: (event) => {
 									var _compatibleEvent$para, _compatibleEvent$para2;
 									if (settled) return;

package/lib/components/bigSale/templates/Kiosk/index.js

@@ -543,7 +543,8 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 		}
 	}, [isActive]);
 	const handleReturnToAdvertisement = (replace = true, reason) => {
-		if (replace && (paymentPageSessionRef.current || getHasScanRequest() || renderCatalog && (getIsProcessing() || getIsPaymentProcessing()))) return;
+		if (paymentPageSessionRef.current) return;
+		if (replace && (getHasScanRequest() || renderCatalog && (getIsProcessing() || getIsPaymentProcessing()))) return;
 		if (returningToAdvertisementRef.current) return;
 		returningToAdvertisementRef.current = true;
 		setIsReturningToAdvertisement(true);
@@ -671,6 +672,7 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 				businessCode,
 				checkoutSnapshot: preparation.runtimeSnapshot
 			}));
+			const paymentStatus = payload.orderSnapshot.payment_status === "partially_paid" ? "partially_paid" : "paid";
 			persistKioskSessionView(context.sales.bookingTicket, "catalog");
 			try {
 				yield context.sales.clearCartAndReset();
@@ -679,7 +681,7 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 			}
 			try {
 				if (!isActiveRef.current || paymentPageSessionRef.current !== session) return;
-				if (!(yield handOffPaidCheckout(payload))) {
+				if (!(paymentStatus === "paid" && (yield handOffPaidCheckout(payload)))) {
 					var _payload$paymentResul;
 					setPaymentResult((_payload$paymentResul = payload.paymentResult) !== null && _payload$paymentResul !== void 0 ? _payload$paymentResul : null);
 					setView("success");
@@ -687,7 +689,7 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 				onOrderComplete === null || onOrderComplete === void 0 || onOrderComplete({
 					type: "checkout",
 					data: require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, payload), {}, {
-						status: "paid",
+						status: paymentStatus,
 						reason: "paid"
 					}),
 					order_id: payload.orderId,

package/lib/components/bigSale/templates/Kiosk/payment/index.js

@@ -89,17 +89,17 @@ function KioskPaymentPage({ context, checkoutPreparation, channel, onBack, onPai
 	const acceptOutcome = (0, ahooks.useMemoizedFn)(function() {
 		var _ref = require_asyncToGenerator._asyncToGenerator(function* (outcome, external) {
 			if (!mountedRef.current || stateRef.current === "complete") return;
-			if (outcome.kind === "paid") {
+			if (outcome.kind === "paid" || outcome.kind === "partial" && external) {
 				var _external$orderSnapsh, _baseSales$getTempOrd2, _utils$getData;
 				transition("complete");
 				retryRef.current = void 0;
 				const orderSnapshot = (0, lodash.cloneDeep)((external === null || external === void 0 || (_external$orderSnapsh = external.orderSnapshot) === null || _external$orderSnapsh === void 0 ? void 0 : _external$orderSnapsh.tempOrder) || (external === null || external === void 0 ? void 0 : external.orderSnapshot) || ((_baseSales$getTempOrd2 = baseSales.getTempOrder) === null || _baseSales$getTempOrd2 === void 0 ? void 0 : _baseSales$getTempOrd2.call(baseSales)) || {});
 				if (external === null || external === void 0 ? void 0 : external.payments) orderSnapshot.payments = (0, lodash.cloneDeep)(external.payments);
 				orderSnapshot.order_id = outcome.orderId;
-				orderSnapshot.payment_status = "paid";
+				orderSnapshot.payment_status = outcome.kind === "partial" ? "partially_paid" : "paid";
 				const paymentResult = require_presentBaseSalesPaymentResult.presentBaseSalesPaymentResult({
 					baseSales,
-					status: "success",
+					status: outcome.kind === "partial" ? "partially-paid" : "success",
 					displayMode: "page",
 					currencySymbol,
 					payments: external === null || external === void 0 ? void 0 : external.payments,
@@ -198,7 +198,7 @@ function KioskPaymentPage({ context, checkoutPreparation, channel, onBack, onPai
 		}
 	}));
 	const beginAuthorization = (0, ahooks.useMemoizedFn)((_source) => {
-		var _readPaymentAmount;
+		var _globalThis$crypto, _globalThis$crypto$ra;
 		if (stateRef.current !== "idle") return null;
 		if (!authorizationAvailableRef.current) {
 			toast.fail(_pisell_utils.locales.getText("pisell2.checkout.self-service.empty"));
@@ -210,11 +210,10 @@ function KioskPaymentPage({ context, checkoutPreparation, channel, onBack, onPai
 			toast.fail(error instanceof Error ? error.message : String(error));
 			return null;
 		}
-		const token = Symbol("authorization");
+		const token = ((_globalThis$crypto = globalThis.crypto) === null || _globalThis$crypto === void 0 || (_globalThis$crypto$ra = _globalThis$crypto.randomUUID) === null || _globalThis$crypto$ra === void 0 ? void 0 : _globalThis$crypto$ra.call(_globalThis$crypto)) || `kiosk-payment-${Date.now()}-${Math.random().toString(36).slice(2)}`;
 		authorizationRef.current = {
 			token,
-			settling: false,
-			amount: (_readPaymentAmount = require_transaction.readPaymentAmount(baseSales)) !== null && _readPaymentAmount !== void 0 ? _readPaymentAmount : 0
+			settling: false
 		};
 		transition("authorizing");
 		const release = (() => {
@@ -223,6 +222,7 @@ function KioskPaymentPage({ context, checkoutPreparation, channel, onBack, onPai
 			authorizationRef.current = void 0;
 			transition("idle");
 		});
+		release.paymentRequestId = token;
 		release.isActive = () => {
 			var _authorizationRef$cur;
 			return mountedRef.current && ((_authorizationRef$cur = authorizationRef.current) === null || _authorizationRef$cur === void 0 ? void 0 : _authorizationRef$cur.token) === token;
@@ -244,30 +244,15 @@ function KioskPaymentPage({ context, checkoutPreparation, channel, onBack, onPai
 						const authorization = authorizationRef.current;
 						if (!authorization || authorization.settling) return;
 						if (command !== "payment_result") return;
+						if (params.requestId !== authorization.token) return;
 						authorization.settling = true;
 						try {
 							if (params.status === "cancelled") {
 								yield acceptOutcome({ kind: "cancelled" });
 								return;
 							}
-							if (params.ok === true) try {
-								const outcome = require_transaction.inspectPaymentCompletion(baseSales, params.syncResult);
-								if (outcome.kind === "partial") {
-									var _baseSales$getTempOrd3, _baseSales$getTempOrd4;
-									const currentOrderId = String((_baseSales$getTempOrd3 = (_baseSales$getTempOrd4 = baseSales.getTempOrder) === null || _baseSales$getTempOrd4 === void 0 || (_baseSales$getTempOrd4 = _baseSales$getTempOrd4.call(baseSales)) === null || _baseSales$getTempOrd4 === void 0 ? void 0 : _baseSales$getTempOrd4.order_id) !== null && _baseSales$getTempOrd3 !== void 0 ? _baseSales$getTempOrd3 : "").trim();
-									if (currentOrderId === String(outcome.orderId)) yield context.sales.refreshSalesDetail({ forceRemote: true });
-									else if (!currentOrderId || /^local[_-]/i.test(currentOrderId)) {
-										const remoteOrderId = Number(outcome.orderId);
-										if (!Number.isFinite(remoteOrderId) || remoteOrderId <= 0) throw new Error("The paid order cannot be refreshed.");
-										yield context.sales.loadDetailByRemote(remoteOrderId);
-									} else throw new Error("The current order changed before payment synchronization.");
-									const nextAmount = require_transaction.readPaymentAmount(baseSales);
-									if (nextAmount === void 0 || nextAmount >= authorization.amount) yield acceptOutcome({ kind: "uncertain" });
-									else {
-										preparationRef.current = yield context.sales.prepareCheckout();
-										yield acceptOutcome(outcome);
-									}
-								} else yield acceptOutcome(outcome, params);
+							if (params.ok === true && (params.status === void 0 || params.status === "success")) try {
+								yield acceptOutcome(require_transaction.inspectPaymentCompletion(baseSales, params.syncResult, "main-screen"), params);
 							} catch (error) {
 								yield acceptOutcome({
 									kind: "uncertain",