@pisell/private-materials 6.12.175 → 6.12.177

package/es/pro/Login2.0/shared/types.d.ts

@@ -226,4 +226,4 @@ interface RegisterFormData {
   verification_token?: string;
 }
 //#endregion
-export { AuthMethodType, EmailAuthConfig, EmailRegistrationVerification, LegalTermsConfig, LoginFormData, LoginMethodItem, OAuthConfig, PhoneAuthConfig, RegisterFormData, RegistrationMethodItem, UIConfig, VerificationMethod };
+export { AuthMethodType, EmailAuthConfig, LegalTermsConfig, LoginFormData, LoginMethodItem, OAuthConfig, PhoneAuthConfig, RegisterFormData, RegistrationMethodItem, UIConfig };

package/es/pro/Selector/Item.d.ts

@@ -17,6 +17,6 @@ interface IItemProps {
    */
   onClick?: React.MouseEventHandler<HTMLDivElement>;
 }
-declare const Item: (props: IItemProps) => JSX.Element;
+declare const Item: (props: IItemProps) => React.JSX.Element;
 //#endregion
 export { Item };

package/es/pro/numberKeyboard/index.d.ts

@@ -24,6 +24,6 @@ interface NumberKeyboardProps {
   /** 输入框的样式 */
   inputStyle?: React.CSSProperties;
 }
-declare const NumberKeyboard: (props: NumberKeyboardProps) => JSX.Element;
+declare const NumberKeyboard: (props: NumberKeyboardProps) => React.JSX.Element;
 //#endregion
 export { NumberKeyboard };

package/es/pro/pisellPhoneKeyboard/index.d.ts

@@ -1,3 +1,4 @@
+import React from "react";
 import { PopoverProps } from "antd";
 //#region src/pro/pisellPhoneKeyboard/index.d.ts
 interface PisellPhoneKeyboardProps {
@@ -8,6 +9,6 @@ interface PisellPhoneKeyboardProps {
   keyboardProps?: any;
   virtualKeyInputProps?: any;
 }
-declare const PisellPhoneKeyboard: (props: PisellPhoneKeyboardProps) => JSX.Element;
+declare const PisellPhoneKeyboard: (props: PisellPhoneKeyboardProps) => React.JSX.Element;
 //#endregion
 export { PisellPhoneKeyboard };

package/es/pro/skuDetailModal/components/weighing/index.d.ts

@@ -1 +1,2 @@
-import { ScaleConnectionState, WeighingMode, WeighingValue } from "./types.js";
+import { ScaleConnectionState, WeighingMode, WeighingValue } from "./types.js";
+import React from "react";

package/es/pro/skuDetailModal/flow/modules/holder/index.js

@@ -62,7 +62,8 @@ const HolderFlowModuleComponent = ({ context, module, registerHandle }) => {
 	const holderIds = context.draft.booking.holderIds;
 	const quantity = context.draft.quantity || 1;
 	const bookingState = context.hostContext;
-	const required = resolveFlowHolderConfig(productData, bookingState).required;
+	const deferHolderUntilSubmit = (bookingState === null || bookingState === void 0 ? void 0 : bookingState.deferHolderUntilSubmit) === true;
+	const required = resolveFlowHolderConfig(productData, bookingState).required && !deferHolderUntilSubmit;
 	const unsupportedReason = isMultiDayProduct(productData) ? void 0 : getUnsupportedBookingFlowReason(productData);
 	const customerId = getCustomerId(bookingState);
 	const [hostError, setHostError] = useState(null);
@@ -168,9 +169,11 @@ const holderFlowModule = {
 		"booking.customerId"
 	],
 	isApplicable: (context) => {
+		var _context$hostContext;
 		const productData = context.draft.productData;
 		if (isNormalProductByDurationSchedule(productData)) return false;
 		if (!resolveFlowHolderConfig(productData, context.hostContext).enabled) return false;
+		if (((_context$hostContext = context.hostContext) === null || _context$hostContext === void 0 ? void 0 : _context$hostContext.deferHolderUntilSubmit) === true) return false;
 		if (!context.hostContext) return true;
 		return !isWalkIn(getCustomerId(context.hostContext));
 	},

package/lib/components/appointmentBooking/deposit/index.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
+import React from "react";
 //#region src/components/appointmentBooking/deposit/index.d.ts
-declare const Deposit: (props: any) => JSX.Element;
+declare const Deposit: (props: any) => React.JSX.Element;
 //#endregion
 export { Deposit };

package/lib/components/appointmentBooking/index.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
+import React from "react";
 //#region src/components/appointmentBooking/index.d.ts
-declare const AppointmentBooking: () => JSX.Element;
+declare const AppointmentBooking: () => React.JSX.Element;
 //#endregion
 export { AppointmentBooking };

package/lib/components/bigSale/index.js

@@ -134,6 +134,7 @@ const BigSale = ({ osKey = DEFAULT_OS_KEY, osModuleName, selectionFlowScene, lif
 		bookingConfigParams,
 		autoInitBookingContext,
 		otherParams,
+		deferHolderAuthOnClose: resolvedTemplate === "kiosk",
 		shouldMergeProductLines,
 		rulesHooks,
 		legacyOpenProductDetail,

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

@@ -6,6 +6,7 @@ const require_SalesSdkHostBridgesContext = require("../../../../plus/salesSdk/co
 const require_useSalesUserLogin = require("../../../../hooks/useSalesUserLogin.js");
 const require_resolve = require("../../../checkout/components/PaymentResultToastV2/resolve.js");
 const require_index = require("../../../checkout/components/PaymentResultToastV2/index.js");
+const require_serve = require("../../../Sales/Checkout/serve.js");
 const require_useSalesSdk = require("../../../../plus/salesSdk/hooks/useSalesSdk.js");
 const require_usePickSaleDetailContext = require("../../hooks/usePickSaleDetailContext.js");
 const require_productListPreferences = require("../../utils/productListPreferences.js");
@@ -38,11 +39,52 @@ function publishKioskCollaborationPreviewStatus(app, status) {
 	}
 }
 const KIOSK_VIEW_SESSION_KEY = "bigSale.kiosk.view";
+function toFiniteAmount(value) {
+	if (value === void 0 || value === null || value === "") return null;
+	const amount = Number(value);
+	return Number.isFinite(amount) ? amount : null;
+}
+function resolveKioskAmountDue(summary) {
+	var _toFiniteAmount;
+	if (!summary) return null;
+	const orderPaidAmount = toFiniteAmount(summary.order_paid_amount);
+	if (orderPaidAmount !== null && orderPaidAmount > 0) return toFiniteAmount(summary.amount_gap);
+	return (_toFiniteAmount = toFiniteAmount(summary.expect_amount)) !== null && _toFiniteAmount !== void 0 ? _toFiniteAmount : toFiniteAmount(summary.total_amount);
+}
+function isH5ZeroAmountCheckout(platform, summary) {
+	return isH5ZeroAmountValue(platform, resolveKioskAmountDue(summary));
+}
+function isH5ZeroAmountValue(platform, amount) {
+	return String(platform || "").trim().toLowerCase() === "h5" && toFiniteAmount(amount) === 0;
+}
+function shouldSubmitKioskOrderBeforeCheckout(options) {
+	return options.shouldUseConsumerPayment || isH5ZeroAmountCheckout(options.platform, options.summary);
+}
+function resolveKioskSubmittedPayableAmount(result, tempOrderSummary, contextSummary) {
+	var _result$data, _result$data2, _result$data3;
+	return [
+		result === null || result === void 0 || (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.order_wait_pay_amount,
+		result === null || result === void 0 || (_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.expect_amount,
+		result === null || result === void 0 || (_result$data3 = result.data) === null || _result$data3 === void 0 ? void 0 : _result$data3.total_amount,
+		tempOrderSummary === null || tempOrderSummary === void 0 ? void 0 : tempOrderSummary.expect_amount,
+		tempOrderSummary === null || tempOrderSummary === void 0 ? void 0 : tempOrderSummary.total_amount,
+		contextSummary === null || contextSummary === void 0 ? void 0 : contextSummary.expect_amount,
+		contextSummary === null || contextSummary === void 0 ? void 0 : contextSummary.total_amount
+	].find((value) => toFiniteAmount(value) !== null);
+}
 function launchKioskConsumerPaymentAfterReset(_x) {
 	return _launchKioskConsumerPaymentAfterReset.apply(this, arguments);
 }
 function _launchKioskConsumerPaymentAfterReset() {
-	_launchKioskConsumerPaymentAfterReset = require_asyncToGenerator._asyncToGenerator(function* ({ action, clearCartAndReset, clearSessionStorageOrderSnapshot, onResetError, orderId, persistCatalogView, recalcSummary, replace, totalAmount }) {
+	_launchKioskConsumerPaymentAfterReset = require_asyncToGenerator._asyncToGenerator(function* ({ action, clearCartAndReset, clearSessionStorageOrderSnapshot, freePay, onFreePayFailure, onResetError, orderId, persistCatalogView, recalcSummary, redirectZeroAmount, replace, totalAmount }) {
+		const shouldRedirectZeroAmount = redirectZeroAmount && Number(totalAmount) === 0;
+		if (shouldRedirectZeroAmount) {
+			const freePayResult = yield freePay(String(orderId));
+			if (!(freePayResult === null || freePayResult === void 0 ? void 0 : freePayResult.status)) {
+				onFreePayFailure(freePayResult);
+				return;
+			}
+		}
 		try {
 			yield clearCartAndReset();
 			yield recalcSummary();
@@ -51,7 +93,7 @@ function _launchKioskConsumerPaymentAfterReset() {
 			onResetError(error);
 		}
 		persistCatalogView();
-		if (Number(totalAmount) === 0) {
+		if (shouldRedirectZeroAmount) {
 			replace(`/payment-finish/success?amount=${totalAmount}&order_id=${orderId}`);
 			return;
 		}
@@ -155,7 +197,8 @@ function KioskBigSaleTemplate({ isActive = true, osKey, context, mode, variant,
 	var _engineContext$appHel, _utils$getApp, _engineContext$appHel2;
 	_pisell_utils.locales.init(require_index$1.default, locale || "en");
 	const engineContext = require_useEngineContext.default();
-	const isH5Platform = String(require_useEngineContext.usePlatform() || "").trim().toLowerCase() === "h5";
+	const platform = String(require_useEngineContext.usePlatform() || "").trim().toLowerCase();
+	const isH5Platform = platform === "h5";
 	const utils = (engineContext === null || engineContext === void 0 || (_engineContext$appHel = engineContext.appHelper) === null || _engineContext$appHel === void 0 ? void 0 : _engineContext$appHel.utils) || {};
 	const app = (_utils$getApp = utils.getApp) === null || _utils$getApp === void 0 ? void 0 : _utils$getApp.call(utils);
 	const hostChannel = String((engineContext === null || engineContext === void 0 || (_engineContext$appHel2 = engineContext.appHelper) === null || _engineContext$appHel2 === void 0 || (_engineContext$appHel2 = _engineContext$appHel2.constants) === null || _engineContext$appHel2 === void 0 || (_engineContext$appHel2 = _engineContext$appHel2.config) === null || _engineContext$appHel2 === void 0 ? void 0 : _engineContext$appHel2.channel) || "").trim().toLowerCase();
@@ -462,14 +505,20 @@ function KioskBigSaleTemplate({ isActive = true, osKey, context, mode, variant,
 			checkoutOpeningRef.current = true;
 			setIsCheckoutLoading(true);
 			try {
-				var _result$payload$payme, _result$payload, _result$data5;
-				if (shouldUseConsumerPayment) {
-					var _ref9, _context$sales$bookin5, _context$sales$bookin6, _context$sales$bookin7, _ref10, _ref11, _ref12, _result$data$order_wa, _result$data2, _result$data3, _result$data4, _tempOrder$summary, _context$summary$summ;
-					if (typeof utils.action !== "function") throw new Error("[KioskBigSale] appHelper.utils.action is not available.");
+				var _ref7, _context$sales$bookin5, _context$sales$bookin6, _context$sales$bookin7, _ref8, _ref9, _result$payload$payme, _result$payload, _result$data5;
+				if (shouldUseConsumerPayment && typeof utils.action !== "function") throw new Error("[KioskBigSale] appHelper.utils.action is not available.");
+				yield context.cart.waitForCartConsistency();
+				const currentTempOrder = (_ref7 = (_context$sales$bookin5 = (_context$sales$bookin6 = context.sales.bookingTicket) === null || _context$sales$bookin6 === void 0 || (_context$sales$bookin7 = _context$sales$bookin6.getTempOrder) === null || _context$sales$bookin7 === void 0 ? void 0 : _context$sales$bookin7.call(_context$sales$bookin6)) !== null && _context$sales$bookin5 !== void 0 ? _context$sales$bookin5 : context.sales.tempOrder) !== null && _ref7 !== void 0 ? _ref7 : null;
+				if (shouldSubmitKioskOrderBeforeCheckout({
+					platform,
+					summary: (_ref8 = (_ref9 = context.summary.summary) !== null && _ref9 !== void 0 ? _ref9 : currentTempOrder === null || currentTempOrder === void 0 ? void 0 : currentTempOrder.summary) !== null && _ref8 !== void 0 ? _ref8 : null,
+					shouldUseConsumerPayment
+				})) {
+					var _ref12, _context$sales$bookin8, _context$sales$bookin9, _context$sales$bookin10;
 					const result = yield context.cart.submit();
 					if (!require_utils.isSalesOrderSubmitSuccess(result)) {
-						var _ref7, _ref8, _result$message, _result$data;
-						showCheckoutFailure(String((_ref7 = (_ref8 = (_result$message = result === null || result === void 0 ? void 0 : result.message) !== null && _result$message !== void 0 ? _result$message : result === null || result === void 0 ? void 0 : result.msg) !== null && _ref8 !== void 0 ? _ref8 : result === null || result === void 0 || (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.message) !== null && _ref7 !== void 0 ? _ref7 : _pisell_utils.locales.getText("pisell2.big-sale.kiosk.payment-failure-description")));
+						var _ref10, _ref11, _result$message, _result$data4;
+						showCheckoutFailure(String((_ref10 = (_ref11 = (_result$message = result === null || result === void 0 ? void 0 : result.message) !== null && _result$message !== void 0 ? _result$message : result === null || result === void 0 ? void 0 : result.msg) !== null && _ref11 !== void 0 ? _ref11 : result === null || result === void 0 || (_result$data4 = result.data) === null || _result$data4 === void 0 ? void 0 : _result$data4.message) !== null && _ref10 !== void 0 ? _ref10 : _pisell_utils.locales.getText("pisell2.big-sale.kiosk.payment-failure-description")));
 						return;
 					}
 					const orderId = require_utils.resolveSaleDetailOrderIdFromSalesResult(context.sales, result);
@@ -477,45 +526,53 @@ function KioskBigSaleTemplate({ isActive = true, osKey, context, mode, variant,
 						showCheckoutFailure(String(_pisell_utils.locales.getText("pisell2.big-sale.kiosk.payment-failure-description")));
 						return;
 					}
-					const tempOrder = (_ref9 = (_context$sales$bookin5 = (_context$sales$bookin6 = context.sales.bookingTicket) === null || _context$sales$bookin6 === void 0 || (_context$sales$bookin7 = _context$sales$bookin6.getTempOrder) === null || _context$sales$bookin7 === void 0 ? void 0 : _context$sales$bookin7.call(_context$sales$bookin6)) !== null && _context$sales$bookin5 !== void 0 ? _context$sales$bookin5 : context.sales.tempOrder) !== null && _ref9 !== void 0 ? _ref9 : null;
-					const totalAmount = (_ref10 = (_ref11 = (_ref12 = (_result$data$order_wa = result === null || result === void 0 || (_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.order_wait_pay_amount) !== null && _result$data$order_wa !== void 0 ? _result$data$order_wa : result === null || result === void 0 || (_result$data3 = result.data) === null || _result$data3 === void 0 ? void 0 : _result$data3.total_amount) !== null && _ref12 !== void 0 ? _ref12 : result === null || result === void 0 || (_result$data4 = result.data) === null || _result$data4 === void 0 ? void 0 : _result$data4.expect_amount) !== null && _ref11 !== void 0 ? _ref11 : tempOrder === null || tempOrder === void 0 || (_tempOrder$summary = tempOrder.summary) === null || _tempOrder$summary === void 0 ? void 0 : _tempOrder$summary.total_amount) !== null && _ref10 !== void 0 ? _ref10 : (_context$summary$summ = context.summary.summary) === null || _context$summary$summ === void 0 ? void 0 : _context$summary$summ.total_amount;
-					if (totalAmount === void 0 || totalAmount === null) {
+					const tempOrder = (_ref12 = (_context$sales$bookin8 = (_context$sales$bookin9 = context.sales.bookingTicket) === null || _context$sales$bookin9 === void 0 || (_context$sales$bookin10 = _context$sales$bookin9.getTempOrder) === null || _context$sales$bookin10 === void 0 ? void 0 : _context$sales$bookin10.call(_context$sales$bookin9)) !== null && _context$sales$bookin8 !== void 0 ? _context$sales$bookin8 : context.sales.tempOrder) !== null && _ref12 !== void 0 ? _ref12 : null;
+					const totalAmount = resolveKioskSubmittedPayableAmount(result, tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.summary, context.summary.summary);
+					if (toFiniteAmount(totalAmount) === null) {
 						showCheckoutFailure(String(_pisell_utils.locales.getText("pisell2.big-sale.kiosk.payment-failure-description")));
 						return;
 					}
-					publishKioskCollaborationPreviewStatus(app, "checkout");
-					yield launchKioskConsumerPaymentAfterReset({
-						action: utils.action,
-						clearCartAndReset: context.sales.clearCartAndReset,
-						clearSessionStorageOrderSnapshot: () => {
-							var _context$sales$bookin8, _context$sales$bookin9;
-							(_context$sales$bookin8 = context.sales.bookingTicket) === null || _context$sales$bookin8 === void 0 || (_context$sales$bookin9 = _context$sales$bookin8.clearSessionStorageOrderSnapshot) === null || _context$sales$bookin9 === void 0 || _context$sales$bookin9.call(_context$sales$bookin8);
-						},
-						onResetError: (error) => {
-							console.error("[KioskBigSale] 支付跳转前重置本地订单失败，继续拉起支付", error);
-						},
-						orderId,
-						persistCatalogView: () => {
-							persistKioskSessionView(context.sales.bookingTicket, "catalog");
-						},
-						recalcSummary: context.cart.recalcSummary,
-						replace: (path) => {
-							var _utils$history, _app$history2;
-							if (typeof (utils === null || utils === void 0 || (_utils$history = utils.history) === null || _utils$history === void 0 ? void 0 : _utils$history.replace) === "function") {
-								utils.history.replace(path);
-								return;
-							}
-							if (typeof (app === null || app === void 0 || (_app$history2 = app.history) === null || _app$history2 === void 0 ? void 0 : _app$history2.replace) === "function") {
-								app.history.replace(path);
-								return;
-							}
-							window.location.replace(path);
-						},
-						totalAmount
-					});
-					return;
+					const shouldRedirectH5ZeroAmount = isH5ZeroAmountValue(platform, totalAmount);
+					if (shouldUseConsumerPayment || shouldRedirectH5ZeroAmount) {
+						publishKioskCollaborationPreviewStatus(app, "checkout");
+						yield launchKioskConsumerPaymentAfterReset({
+							action: utils.action,
+							clearCartAndReset: context.sales.clearCartAndReset,
+							clearSessionStorageOrderSnapshot: () => {
+								var _context$sales$bookin11, _context$sales$bookin12;
+								(_context$sales$bookin11 = context.sales.bookingTicket) === null || _context$sales$bookin11 === void 0 || (_context$sales$bookin12 = _context$sales$bookin11.clearSessionStorageOrderSnapshot) === null || _context$sales$bookin12 === void 0 || _context$sales$bookin12.call(_context$sales$bookin11);
+							},
+							freePay: (freePayOrderId) => require_serve.freePayApi(freePayOrderId),
+							onFreePayFailure: (freePayResult) => {
+								var _freePayResult$messag;
+								showCheckoutFailure(String((_freePayResult$messag = freePayResult === null || freePayResult === void 0 ? void 0 : freePayResult.message) !== null && _freePayResult$messag !== void 0 ? _freePayResult$messag : _pisell_utils.locales.getText("pisell2.big-sale.kiosk.payment-failure-description")));
+							},
+							onResetError: (error) => {
+								console.error("[KioskBigSale] 结账跳转前重置本地订单失败，继续当前流程", error);
+							},
+							orderId,
+							persistCatalogView: () => {
+								persistKioskSessionView(context.sales.bookingTicket, "catalog");
+							},
+							recalcSummary: context.cart.recalcSummary,
+							redirectZeroAmount: shouldRedirectH5ZeroAmount,
+							replace: (path) => {
+								var _utils$history, _app$history2;
+								if (typeof (utils === null || utils === void 0 || (_utils$history = utils.history) === null || _utils$history === void 0 ? void 0 : _utils$history.replace) === "function") {
+									utils.history.replace(path);
+									return;
+								}
+								if (typeof (app === null || app === void 0 || (_app$history2 = app.history) === null || _app$history2 === void 0 ? void 0 : _app$history2.replace) === "function") {
+									app.history.replace(path);
+									return;
+								}
+								window.location.replace(path);
+							},
+							totalAmount
+						});
+						return;
+					}
 				}
-				yield context.cart.waitForCartConsistency();
 				publishKioskCollaborationPreviewStatus(app, "checkout");
 				const result = yield context.sales.openCheckout({
 					paymentResultDisplayMode: "page",
@@ -563,10 +620,10 @@ function KioskBigSaleTemplate({ isActive = true, osKey, context, mode, variant,
 		return (runtimeDiscountList.length > 0 ? runtimeDiscountList : context.cart.discountList || []).some((discount) => require_adapters.isCustomerVoucher(discount) && Boolean(discount === null || discount === void 0 ? void 0 : discount.isSelected));
 	};
 	const hasAppliedWalletAsset = () => {
-		var _context$sales$bookin10, _context$sales$bookin11, _walletAssetsState$se, _walletAssetsState$se2, _walletAssetsState$se3, _walletAssetsState$se4, _walletAssetsState$co, _walletAssetsState$co2, _ref15, _context$sales$bookin12, _context$sales$bookin13, _context$sales$bookin14;
-		const walletAssetsState = (_context$sales$bookin10 = context.sales.bookingTicket) === null || _context$sales$bookin10 === void 0 || (_context$sales$bookin11 = _context$sales$bookin10.getWalletAssetsState) === null || _context$sales$bookin11 === void 0 ? void 0 : _context$sales$bookin11.call(_context$sales$bookin10);
+		var _context$sales$bookin13, _context$sales$bookin14, _walletAssetsState$se, _walletAssetsState$se2, _walletAssetsState$se3, _walletAssetsState$se4, _walletAssetsState$co, _walletAssetsState$co2, _ref15, _context$sales$bookin15, _context$sales$bookin16, _context$sales$bookin17;
+		const walletAssetsState = (_context$sales$bookin13 = context.sales.bookingTicket) === null || _context$sales$bookin13 === void 0 || (_context$sales$bookin14 = _context$sales$bookin13.getWalletAssetsState) === null || _context$sales$bookin14 === void 0 ? void 0 : _context$sales$bookin14.call(_context$sales$bookin13);
 		if (((_walletAssetsState$se = walletAssetsState === null || walletAssetsState === void 0 || (_walletAssetsState$se2 = walletAssetsState.selectedIds) === null || _walletAssetsState$se2 === void 0 ? void 0 : _walletAssetsState$se2.length) !== null && _walletAssetsState$se !== void 0 ? _walletAssetsState$se : 0) > 0 || ((_walletAssetsState$se3 = walletAssetsState === null || walletAssetsState === void 0 || (_walletAssetsState$se4 = walletAssetsState.selectedItems) === null || _walletAssetsState$se4 === void 0 ? void 0 : _walletAssetsState$se4.length) !== null && _walletAssetsState$se3 !== void 0 ? _walletAssetsState$se3 : 0) > 0 || ((_walletAssetsState$co = walletAssetsState === null || walletAssetsState === void 0 || (_walletAssetsState$co2 = walletAssetsState.committedIds) === null || _walletAssetsState$co2 === void 0 ? void 0 : _walletAssetsState$co2.length) !== null && _walletAssetsState$co !== void 0 ? _walletAssetsState$co : 0) > 0) return true;
-		const tempOrder = (_ref15 = (_context$sales$bookin12 = (_context$sales$bookin13 = context.sales.bookingTicket) === null || _context$sales$bookin13 === void 0 || (_context$sales$bookin14 = _context$sales$bookin13.getTempOrder) === null || _context$sales$bookin14 === void 0 ? void 0 : _context$sales$bookin14.call(_context$sales$bookin13)) !== null && _context$sales$bookin12 !== void 0 ? _context$sales$bookin12 : context.sales.tempOrder) !== null && _ref15 !== void 0 ? _ref15 : null;
+		const tempOrder = (_ref15 = (_context$sales$bookin15 = (_context$sales$bookin16 = context.sales.bookingTicket) === null || _context$sales$bookin16 === void 0 || (_context$sales$bookin17 = _context$sales$bookin16.getTempOrder) === null || _context$sales$bookin17 === void 0 ? void 0 : _context$sales$bookin17.call(_context$sales$bookin16)) !== null && _context$sales$bookin15 !== void 0 ? _context$sales$bookin15 : context.sales.tempOrder) !== null && _ref15 !== void 0 ? _ref15 : null;
 		return ((tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.payments) || []).some((payment) => {
 			const voucherId = payment === null || payment === void 0 ? void 0 : payment.voucher_id;
 			return voucherId !== void 0 && voucherId !== null && String(voucherId).trim() !== "" && Number(voucherId) !== 0;

package/lib/components/booking/deposit/index.d.ts

@@ -1,5 +1,6 @@
-/// <reference types="react" />
+import React from "react";
+
 //#region src/components/booking/deposit/index.d.ts
-declare const Deposit: (props: any) => JSX.Element;
+declare const Deposit: (props: any) => React.JSX.Element;
 //#endregion
 export { Deposit };

package/lib/components/booking/info/addServiceVariant/index.d.ts

@@ -1,9 +1,10 @@
-/// <reference types="react" />
+import React from "react";
+
 //#region src/components/booking/info/addServiceVariant/index.d.ts
 interface AddServiceVariantProps {
   globalState: any;
   setGlobalState: any;
 }
-declare const AddServiceVariant: (props: AddServiceVariantProps) => JSX.Element;
+declare const AddServiceVariant: (props: AddServiceVariantProps) => React.JSX.Element;
 //#endregion
 export { AddServiceVariant };

package/lib/components/booking/info/index.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="react" />
 import { InfoProps } from "./main.js";
+import React from "react";
 
 //#region src/components/booking/info/index.d.ts
-declare const APP: (props: InfoProps) => JSX.Element;
+declare const APP: (props: InfoProps) => React.JSX.Element;
 //#endregion
 export { APP };

package/lib/components/booking/materiels/contacts/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from "react";
 //#region src/components/booking/materiels/contacts/index.d.ts
 type ContactType = {
   country_calling_code: string;
@@ -12,6 +12,6 @@ type ContactsPropsType = {
   value: ContactType[];
   onChange: (value: ContactType[]) => void;
 };
-declare const Contacts: (props: ContactsPropsType) => JSX.Element;
+declare const Contacts: (props: ContactsPropsType) => React.JSX.Element;
 //#endregion
 export { Contacts };

package/lib/components/booking/materiels/duration/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from "react";
 import { SelectProps } from "antd";
 
 //#region src/components/booking/materiels/duration/index.d.ts
@@ -12,6 +12,6 @@ interface DurationProps extends SelectProps {
   startDate?: any;
   timeObj?: any;
 }
-declare const Duration: (props: DurationProps) => JSX.Element;
+declare const Duration: (props: DurationProps) => React.JSX.Element;
 //#endregion
 export { Duration };

package/lib/components/booking/materiels/startTime/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from "react";
 import { SelectProps } from "antd";
 
 //#region src/components/booking/materiels/startTime/index.d.ts
@@ -8,6 +8,6 @@ interface StartTimeProps extends SelectProps {
   selectProps?: SelectProps;
   timeObjChange?: any;
 }
-declare const StartTime: (props: StartTimeProps) => JSX.Element;
+declare const StartTime: (props: StartTimeProps) => React.JSX.Element;
 //#endregion
 export { StartTime };

package/lib/components/ecocup/cupList/index.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="react" />
+import React from "react";
 //#region src/components/ecocup/cupList/index.d.ts
 interface CupListProps {
   data: any[];
 }
-declare const CupList: (props: CupListProps) => JSX.Element;
+declare const CupList: (props: CupListProps) => React.JSX.Element;
 //#endregion
 export { CupList };

package/lib/components/ecocup/customerList/index.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="react" />
+import React from "react";
 //#region src/components/ecocup/customerList/index.d.ts
 interface CustomerListProps {
   data: any[];
 }
-declare function CustomerList(props: CustomerListProps): JSX.Element;
+declare function CustomerList(props: CustomerListProps): React.JSX.Element;
 //#endregion
 export { CustomerList };

package/lib/components/eftpos/index.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
 import { DeviceStatus, Eftpos } from "./const.js";
+import React from "react";
 //#region src/components/eftpos/index.d.ts
 interface PosProps {
   /** 厂商类型 */
@@ -43,6 +43,6 @@ interface PosProps {
   getPosComm: (...agrn: unknown[]) => any;
   savePos: (...agrn: unknown[]) => any;
 }
-declare const _default: (props: PosProps) => JSX.Element;
+declare const _default: (props: PosProps) => React.JSX.Element;
 //#endregion
 export { _default };

package/lib/components/eftposPay/index.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
 import { PosProps } from "./const.js";
+import React from "react";
 //#region src/components/eftposPay/index.d.ts
-declare const _default: (props: PosProps) => JSX.Element | null;
+declare const _default: (props: PosProps) => React.JSX.Element | null;
 //#endregion
 export { _default };

package/lib/components/eventBooking/index.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
+import React from "react";
 //#region src/components/eventBooking/index.d.ts
-declare const EventBooking: () => JSX.Element;
+declare const EventBooking: () => React.JSX.Element;
 //#endregion
 export { EventBooking };

package/lib/components/kioskSale/index.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
 import { BigSaleProps } from "../bigSale/types.js";
+import React from "react";
 
 //#region src/components/kioskSale/index.d.ts
 type KioskSaleProps = Omit<BigSaleProps, 'enableGlobalScanListener' | 'osKey' | 'secondaryScreenDisplay' | 'saleDetailTemplate' | 'template' | 'tmpl'> & {
@@ -8,6 +8,6 @@ type KioskSaleProps = Omit<BigSaleProps, 'enableGlobalScanListener' | 'osKey' |
 /**
  * 面向顾客的竖屏自助点餐入口；业务数据继续复用 BigSale / SalesSdk。
  */
-declare function KioskSale(props: KioskSaleProps): JSX.Element;
+declare function KioskSale(props: KioskSaleProps): React.JSX.Element;
 //#endregion
 export { KioskSale, KioskSaleProps };

package/lib/components/kioskSale/index.js

@@ -108,7 +108,7 @@ function KioskSale(props) {
 		selectionFlowScene: "product-selection",
 		enableGlobalScanListener: true,
 		normalProductDetailConfig: resolvedNormalProductDetailConfig,
-		mergeBookingLinesForDisplay: false,
+		mergeBookingLinesForDisplay: isH5,
 		productLoadParams: resolvedProductLoadParams,
 		autoCreate: false,
 		bootstrapSlot,

package/lib/components/kioskSkuDetail/index.d.ts

@@ -7,7 +7,7 @@ import React from "react";
  * - 中间区域用 SKUOptionsSelection 做 SKU 选择
  * - 底部用 PisellNumberSelector 做数量编辑
  */
-declare function KioskSkuDetail(props: KioskSkuDetailProps): JSX.Element;
+declare function KioskSkuDetail(props: KioskSkuDetailProps): React.JSX.Element;
 /**
  * @description 从原生回调 payload 中提取 productId
  */

package/lib/components/login/index.d.ts

@@ -1,10 +1,10 @@
-/// <reference types="react" />
+import React from "react";
 //#region src/components/login/index.d.ts
 interface LoginProps {
   title: string;
   style: any;
   onLogin: (values: any, callback: (status: any) => void) => void;
 }
-declare const Login: (props: LoginProps) => JSX.Element;
+declare const Login: (props: LoginProps) => React.JSX.Element;
 //#endregion
 export { Login, LoginProps };

package/lib/components/pisellSelectCustomerModal/index.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
 import { CustomerCardProps } from "./CustomerCard/index.js";
+import React from "react";
 import { PopoverProps } from "antd";
 //#region src/components/pisellSelectCustomerModal/index.d.ts
 type CustomerDetail = any;
@@ -12,6 +12,6 @@ interface PisellSelectCustomerModalProps {
   keyboardProps?: any;
   virtualKeyInputProps?: any;
 }
-declare const PisellSelectCustomerModal: (props: PisellSelectCustomerModalProps) => JSX.Element;
+declare const PisellSelectCustomerModal: (props: PisellSelectCustomerModalProps) => React.JSX.Element;
 //#endregion
 export { PisellSelectCustomerModal };

package/lib/components/productExtension/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from "react";
 //#region src/components/productExtension/index.d.ts
 interface ProductExtensionProps {
   onDataChange: any;
@@ -7,6 +7,6 @@ interface ProductExtensionProps {
 declare const ProductExtension: ({
   onDataChange,
   type
-}: ProductExtensionProps) => JSX.Element;
+}: ProductExtensionProps) => React.JSX.Element;
 //#endregion
 export { ProductExtension };

package/lib/components/ruleSetting/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from "react";
 //#region src/components/ruleSetting/index.d.ts
 interface RuleSettingProps {
   value: any;
@@ -6,6 +6,6 @@ interface RuleSettingProps {
   className: string;
   style: any;
 }
-declare const RuleSetting: (props: RuleSettingProps) => JSX.Element;
+declare const RuleSetting: (props: RuleSettingProps) => React.JSX.Element;
 //#endregion
 export { RuleSetting };

package/lib/components/scanOrder/index.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
 import { ScanOrderProps } from "./types.js";
+import React from "react";
 //#region src/components/scanOrder/index.d.ts
-declare function ScanOrder(props: ScanOrderProps): JSX.Element;
+declare function ScanOrder(props: ScanOrderProps): React.JSX.Element;
 //#endregion
 export { ScanOrder };

package/lib/components/sharedSecondaryBigSale/index.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
 import { BigSaleProps } from "../bigSale/types.js";
+import React from "react";
 
 //#region src/components/sharedSecondaryBigSale/index.d.ts
 interface SharedSecondaryBigSaleProps extends Pick<BigSaleProps, 'className' | 'saleDetailModuleConfig' | 'secondaryScreenDisplay' | 'style'> {
@@ -15,6 +15,6 @@ declare function SharedSecondaryBigSale({
   secondaryScreenDisplay,
   className,
   style
-}: SharedSecondaryBigSaleProps): JSX.Element;
+}: SharedSecondaryBigSaleProps): React.JSX.Element;
 //#endregion
 export { SharedSecondaryBigSale, SharedSecondaryBigSaleProps };

package/lib/components/shoppingCart/index.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
 import { shoppingCartProps } from "./type.js";
+import React from "react";
 
 //#region src/components/shoppingCart/index.d.ts
 declare const shoppingCart: ({
@@ -9,6 +9,6 @@ declare const shoppingCart: ({
   onAddProduct,
   onActiveKey,
   ...props
-}: shoppingCartProps) => JSX.Element;
+}: shoppingCartProps) => React.JSX.Element;
 //#endregion
 export { shoppingCart };

package/lib/components/subTotal/index.d.ts

@@ -20,6 +20,6 @@ interface SubTotalProps extends React.HTMLAttributes<HTMLDivElement> {
   describe?: string;
   children?: React.ReactNode;
 }
-declare const SubTotal: (props: SubTotalProps) => JSX.Element;
+declare const SubTotal: (props: SubTotalProps) => React.JSX.Element;
 //#endregion
 export { SubTotal };

package/lib/components/taxSelect/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from "react";
 import { SelectProps } from "antd";
 //#region src/components/taxSelect/index.d.ts
 interface TaxSelectProps {
@@ -8,6 +8,6 @@ interface TaxSelectProps {
   tax_title?: string;
   onChange: (value: string) => void;
 }
-declare const TaxSelect: (props: TaxSelectProps) => JSX.Element;
+declare const TaxSelect: (props: TaxSelectProps) => React.JSX.Element;
 //#endregion
 export { TaxSelect };