@pisell/private-materials 6.11.803 → 6.11.804

package/lib/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 (!require_utils$1.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 = require_asyncToGenerator._asyncToGenerator(function* (baseSales) {
-		const retry = () => syncConfirmedPayments(baseSales);
+	_syncConfirmedPayments = require_asyncToGenerator._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 = require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, confirmed.metadata), {}, { unique_payment_number: transactionNumber || attemptId });
 	return function() {
-		var _ref4 = require_asyncToGenerator._asyncToGenerator(function* () {
+		var _ref5 = require_asyncToGenerator._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 require_pendingEftposLifecycle.completePendingEftposPayment({
+				if (payment.status === "paid") return syncConfirmedPayments(baseSales, isCurrentOrder);
+				const result = preparedPaymentNumber ? yield require_pendingEftposLifecycle.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 = require_constants.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 require_pendingEftposLifecycle.discardPendingEftposPayment(baseSales, prepared.paymentNumber);
-			} catch (rollbackError) {
-				return {
-					kind: "uncertain",
-					message: messageOf(rollbackError)
-				};
+			if (prepared) {
+				if (!isCurrentOrder()) return { kind: "uncertain" };
+				try {
+					yield require_pendingEftposLifecycle.discardPendingEftposPayment(baseSales, prepared.paymentNumber);
+				} catch (rollbackError) {
+					return {
+						kind: "uncertain",
+						message: messageOf(rollbackError)
+					};
+				}
 			}
 			return {
 				kind: "failed",

package/lib/components/checkout/PaymentModal.js

@@ -472,7 +472,7 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 	const [showCashPayment, setShowCashPayment] = (0, react.useState)(false);
 	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 paymentChannel = (0, react.useMemo)(() => String((getData === null || getData === void 0 ? void 0 : getData("channel")) || "").trim().toLowerCase(), [getData]);
 	const paymentScanActivity = require_useCheckoutPaymentScanActivity.default(paymentChannel === "kiosk");
 	const activeKioskPaymentActivityRef = (0, react.useRef)();
 	const paymentOptionList = (0, react.useMemo)(() => {
@@ -1739,7 +1739,7 @@ const PaymentContent = (0, react.forwardRef)(({ cartData, orderInfo, isModalOpen
 						style: { marginTop: "10px" }
 					}, _pisell_utils.locales.getText("order.start-new-order")) } } : {}), {}, {
 						platform: paymentChannel || "pos",
-						usageScene: paymentChannel === "kiosk" ? "user" : "merchant",
+						usageScene: require_constants.MERCHANT_CHANNELS.includes(paymentChannel) ? "merchant" : "user",
 						onChange: function() {
 							var _ref29 = require_asyncToGenerator._asyncToGenerator(function* (event) {
 								const isTerminalEvent = event.type === "success" || event.type === "closed" || event.type === "printOnTimeout";

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

@@ -108,13 +108,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: require_objectSpread2._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/lib/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",
@@ -48,6 +50,7 @@ const PI_PAYMENT_PROVIDER_MAP = {
 const resolvePiPaymentProvider = (code, enabled) => enabled ? PI_PAYMENT_PROVIDER_MAP[code] : void 0;
 //#endregion
 exports.CHECKOUT_VISIBLE_PAYMENT_CODES = CHECKOUT_VISIBLE_PAYMENT_CODES;
+exports.MERCHANT_CHANNELS = MERCHANT_CHANNELS;
 exports.SCI_PAYMENT_CODES = SCI_PAYMENT_CODES;
 exports.SCI_PAYMENT_CODE_TO_READER_TYPE = SCI_PAYMENT_CODE_TO_READER_TYPE;
 exports.SPI_PAYMENT_CODES = SPI_PAYMENT_CODES;

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

@@ -62,7 +62,7 @@ const PaymentMethodRuntime = (0, react.forwardRef)(function PaymentMethodRuntime
 	const paymentMethodsRef = (0, react.useRef)(null);
 	const piPaymentRef = (0, react.useRef)(null);
 	const { getData } = context.appHelper.utils || {};
-	const paymentChannel = (0, react.useMemo)(() => String((getData === null || getData === void 0 ? void 0 : getData("channel")) || "pos").trim().toLowerCase(), [getData]);
+	const paymentChannel = (0, react.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;
@@ -244,7 +244,7 @@ const PaymentMethodRuntime = (0, react.forwardRef)(function PaymentMethodRuntime
 									type: "shop"
 								},
 								platform: paymentChannel || "pos",
-								usageScene: paymentChannel === "kiosk" ? "user" : "merchant",
+								usageScene: require_constants.MERCHANT_CHANNELS.includes(paymentChannel) ? "merchant" : "user",
 								onChange: (event) => {
 									var _compatibleEvent$para, _compatibleEvent$para2;
 									if (settled) return;

package/package.json

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