@pisell/private-materials 6.12.221 → 6.12.222

package/es/components/bigSale/components/BookingFloatingPanel/useBookingPanelController.js

@@ -1,6 +1,5 @@
 import useEngineContext from "../../../../hooks/useEngineContext.js";
 import { subscribeBookingDateChange } from "../../../../plus/salesSdk/utils/bookingDate.js";
-import "../../../../plus/salesSdk/index.js";
 import dayjs from "dayjs";
 import { useCallback, useEffect, useState } from "react";
 //#region src/components/bigSale/components/BookingFloatingPanel/useBookingPanelController.ts

package/es/components/bigSale/components/TimeBar/index.js

@@ -4,7 +4,6 @@ import withResponsive from "../../../../responsive/withResponsive.js";
 import useInitLocalesOnce from "../../../../hooks/useInitLocalesOnce.js";
 import { subscribeBookingDateChange } from "../../../../plus/salesSdk/utils/bookingDate.js";
 import { useSalesSdkBookingContext } from "../../../../plus/salesSdk/context/SalesSdkBookingContext.js";
-import "../../../../plus/salesSdk/index.js";
 import locales_default from "../../locales/index.js";
 import dayjs from "dayjs";
 import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from "react";

package/es/components/bigSale/dialog.js

@@ -5,7 +5,6 @@ import { buildInitBookingContextParams, collectBookingIdsFromTempOrder } from ".
 import { useSalesSdk } from "../../plus/salesSdk/hooks/useSalesSdk.js";
 import { useSalesSdkCart } from "../../plus/salesSdk/hooks/useSalesSdkCart.js";
 import { SalesSdkPrepareOrderSwitchContext, SalesSdkRootRefreshContext } from "../../plus/salesSdk/context/SalesSdkProvider.js";
-import "../../plus/salesSdk/index.js";
 import { seedDineInReservationToCart } from "../../plus/pisellReservation/utils/seedDineInReservationToCart.js";
 import { isPersistedBigSaleOrderId } from "./utils/orderIdentity.js";
 import BigSale from "./index.js";

package/es/components/bigSale/hooks/useBigSaleContext.js

@@ -4,7 +4,6 @@ import { useSalesSdkCustomer } from "../../../plus/salesSdk/hooks/useSalesSdkCus
 import { useSalesSdkBookingContext } from "../../../plus/salesSdk/context/SalesSdkBookingContext.js";
 import { useSalesSdkSummary } from "../../../plus/salesSdk/hooks/useSalesSdkSummary.js";
 import { useSalesSdkProducts } from "../../../plus/salesSdk/hooks/useSalesSdkProducts.js";
-import "../../../plus/salesSdk/index.js";
 import { useMemo } from "react";
 //#region src/components/bigSale/hooks/useBigSaleContext.ts
 /**

package/es/components/bigSale/hooks/useSelectFloorMapResourceForBigSale.js

@@ -3,7 +3,6 @@ import useEngineContext from "../../../hooks/useEngineContext.js";
 import { buildInitBookingContextParams, collectBookingIdsFromTempOrder } from "../../../plus/salesSdk/utils/buildDefaultLoadProductsParams.js";
 import { useSalesSdkUIHosts } from "../../../plus/salesSdk/context/SalesSdkUIHostsContext.js";
 import { SalesSdkRootRefreshContext } from "../../../plus/salesSdk/context/SalesSdkProvider.js";
-import "../../../plus/salesSdk/index.js";
 import { resolveOrderIdForHostActions } from "../../../plus/pisellReservation/components/bookingDetailModal/bookingDetailHostActions.js";
 import { usePicoCodingOpenData } from "../../../plus/pisellReservation/hooks/usePicoCodingOpenData.js";
 import { buildReplacementBookingResourcesFromReservationRow } from "../../../plus/pisellReservation/utils/reservationTicketBookingHostParams.js";

package/es/components/bigSale/index.js

@@ -8,7 +8,6 @@ import { useSalesSdk } from "../../plus/salesSdk/hooks/useSalesSdk.js";
 import { useSalesSdkCustomer } from "../../plus/salesSdk/hooks/useSalesSdkCustomer.js";
 import { SalesSdkProvider } from "../../plus/salesSdk/context/SalesSdkProvider.js";
 import { SalesSdkBookingContextProvider } from "../../plus/salesSdk/context/SalesSdkBookingContext.js";
-import "../../plus/salesSdk/index.js";
 import { ResponsiveBigSaleBase } from "./Base.js";
 import { isBigSaleProductSelectionFlowScene, resolveBigSaleSelectionFlowConfig } from "./selectionFlowConfig.js";
 import { isKioskPresentation } from "./templateCapabilities.js";

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

@@ -10,7 +10,6 @@ import PaymentResultToastV2_default from "../../../checkout/components/PaymentRe
 import { freePayApi } from "../../../Sales/Checkout/serve.js";
 import { collectUnassignedHolderLines } from "../../../../plus/salesSdk/utils/holderSubmitValidation.js";
 import { useSalesSdk } from "../../../../plus/salesSdk/hooks/useSalesSdk.js";
-import "../../../../plus/salesSdk/index.js";
 import { usePickSaleDetailContext } from "../../hooks/usePickSaleDetailContext.js";
 import { resolveBigSaleAutoProductListPreferences } from "../../utils/productListPreferences.js";
 import { resolveBigSaleProductDisplayConfig } from "../../hooks/useBigSaleProductListConfig.js";

package/es/components/sharedSecondaryBigSale/SharedSecondaryBigSaleReceiver.js

@@ -2,7 +2,6 @@ import { _asyncToGenerator } from "../../_virtual/_@oxc-project_runtime@0.122.0/
 import useEngineContext from "../../hooks/useEngineContext.js";
 import { useSalesSdk } from "../../plus/salesSdk/hooks/useSalesSdk.js";
 import { getTempOrderSyncPayload, shouldApplySharedTempOrderPayload } from "../../plus/salesSdk/tempOrderSync.js";
-import "../../plus/salesSdk/index.js";
 import { useEffect, useRef } from "react";
 import { useMemoizedFn } from "ahooks";
 //#region src/components/sharedSecondaryBigSale/SharedSecondaryBigSaleReceiver.tsx

package/es/index.js

@@ -86,7 +86,6 @@ import { useSalesSdkProducts } from "./plus/salesSdk/hooks/useSalesSdkProducts.j
 import SalesSdkDemo from "./plus/salesSdk/demo/index.js";
 import { useSalesSdkDish } from "./plus/salesSdk/hooks/useSalesSdkDish.js";
 import { useSyncOsModule } from "./plus/salesSdk/hooks/useSyncOsModule.js";
-import "./plus/salesSdk/index.js";
 import BigSaleRightActionPanel from "./components/BigSaleRightActionPanel/index.js";
 import ResponsiveWrapper from "./components/list/ResponsiveWrapper.js";
 import { resolveBigSaleSelectionFlowConfig } from "./components/bigSale/selectionFlowConfig.js";
@@ -140,7 +139,6 @@ import PisellVenueControlPage from "./plus/pisellReservation/PisellVenueControlP
 import PisellVenueWallPage from "./plus/pisellReservation/PisellVenueWallPage.js";
 import PisellReservationTablePage from "./plus/pisellReservation/PisellReservationTablePage.js";
 import SelectFloorMapResourceDialog from "./plus/pisellReservation/components/SelectFloorMapResourceDialog.js";
-import "./plus/pisellReservation/index.js";
 import { PisellTopology, PisellTopologyCore } from "./plus/pisellTopology/PisellTopology.js";
 import cupProject_default from "./components/ecocup/cupProject/index.js";
 import CupList from "./components/ecocup/cupList/index.js";

package/es/plus/multiCurrencySettlement/index.js

@@ -280,4 +280,4 @@ function attachSelectedSettlement(item, selectedSettlement) {
 	});
 }
 //#endregion
-export { attachSelectedSettlement, buildSettlementPriceRows, createVirtualOnlySkuDisplayProduct, findFirstVirtualCurrencyAsset, formatSettlementAmount, formatSettlementSelectionTotal, formatTempOrderSettlementAmount, getReservedVirtualSettlementAmount, getSettlementKey, getSettlementOptions, hasSettlementOptions, hasSufficientVirtualCurrencyBalance, isVirtualOnlySettlementProduct, isVirtualSettlementTempOrder, resolveConfiguredUnavailableReason, resolveLegalSettlementAddOnUnitPrice, resolveSettlementOptionEntries, resolveVirtualSettlementErrorMessage, showVirtualSettlementErrorToast };
+export { attachSelectedSettlement, buildSettlementPriceRows, createVirtualOnlySkuDisplayProduct, formatSettlementAmount, formatSettlementSelectionTotal, formatTempOrderSettlementAmount, getSettlementKey, getSettlementOptions, hasSettlementOptions, hasSufficientVirtualCurrencyBalance, isVirtualOnlySettlementProduct, isVirtualSettlementTempOrder, resolveConfiguredUnavailableReason, resolveLegalSettlementAddOnUnitPrice, resolveSettlementOptionEntries, resolveVirtualSettlementErrorMessage, showVirtualSettlementErrorToast };

package/es/plus/piPaymentOld/ui/eftpos/amount.js

@@ -15,8 +15,11 @@ const decimal = (value) => {
 const readerSurcharge = (reader) => {
 	var _ref, _ref2, _ref3, _setting$surcharge_ra, _ref4, _ref5, _setting$surcharge_fi;
 	const setting = (reader === null || reader === void 0 ? void 0 : reader.setting) || {};
-	/** useOriginSurcharge 表示业务方自行计算，卡机默认费率不得叠加。 */
-	if (setting.useOriginSurcharge) return {
+	/**
+	* useOriginSurcharge 表示由卡机收取原始手续费；surcharge=false 表示商户已关闭
+	* Pisell 手续费。两种场景都不得继续使用 Reader 中可能残留的历史费率。
+	*/
+	if (setting.useOriginSurcharge || setting.surcharge === false) return {
 		rate: 0,
 		fixed: 0
 	};
@@ -61,4 +64,4 @@ const updateEftposDraftAmount = (draft, input) => {
 	});
 };
 //#endregion
-export { updateEftposDraftAmount };
+export { buildPaymentAmountQuote, updateEftposDraftAmount };

package/es/plus/piPaymentOld/ui/eftpos/pages/DevicePage.js

@@ -1,23 +1,15 @@
 import { EftposProvider, PaymentMode } from "../contracts/index.js";
+import { buildPaymentAmountQuote } from "../amount.js";
 import React from "react";
 import { locales } from "@pisell/utils";
-import Decimal from "decimal.js";
 import ChevronRight from "@pisell/icon/es/ChevronRight";
 //#region src/plus/piPaymentOld/ui/eftpos/pages/DevicePage.tsx
-/** 转成 Decimal。 */
-const toDecimal = (value) => {
-	try {
-		return new Decimal(value === void 0 || value === null || value === "" ? 0 : value);
-	} catch (_error) {
-		return new Decimal(0);
-	}
-};
 /** 从 reader setting 计算设备列表展示金额。 */
 const resolveReaderPay = (reader, options) => {
-	var _ref, _ref2, _ref3, _setting$surcharge_ra, _ref4, _ref5, _setting$surcharge_fi;
 	/** pay/setting 均来自不同版本后端，读取时需要保持兼容。 */
 	const pay = reader.pay;
-	if (pay) {
+	const setting = reader.setting || {};
+	if (pay && !setting.useOriginSurcharge && setting.surcharge !== false) {
 		var _pay$surRate, _pay$surMoney, _pay$surcharge;
 		return {
 			totalUnit: String(pay.totalUnit || pay.total || ""),
@@ -26,17 +18,13 @@ const resolveReaderPay = (reader, options) => {
 			surcharge: String((_pay$surcharge = pay.surcharge) !== null && _pay$surcharge !== void 0 ? _pay$surcharge : "")
 		};
 	}
-	const setting = reader.setting || {};
-	const amount = toDecimal(options === null || options === void 0 ? void 0 : options.amount);
-	const rate = setting.useOriginSurcharge ? new Decimal(0) : toDecimal((_ref = (_ref2 = (_ref3 = (_setting$surcharge_ra = setting.surcharge_rate) !== null && _setting$surcharge_ra !== void 0 ? _setting$surcharge_ra : setting.surRate) !== null && _ref3 !== void 0 ? _ref3 : setting.constant_rate) !== null && _ref2 !== void 0 ? _ref2 : setting.surcharge) !== null && _ref !== void 0 ? _ref : 0);
-	const fixed = setting.useOriginSurcharge ? new Decimal(0) : toDecimal((_ref4 = (_ref5 = (_setting$surcharge_fi = setting.surcharge_fixed) !== null && _setting$surcharge_fi !== void 0 ? _setting$surcharge_fi : setting.surMoney) !== null && _ref5 !== void 0 ? _ref5 : setting.constant_money) !== null && _ref4 !== void 0 ? _ref4 : 0);
-	/** 设备卡片展示的总手续费与最终扣款额，只用于选择前的预览。 */
-	const surcharge = amount.mul(rate.div(100)).add(fixed);
+	/** 设备预览与选择 Reader 后的实际支付报价必须使用同一套金额规则。 */
+	const quote = buildPaymentAmountQuote(options === null || options === void 0 ? void 0 : options.amount, options === null || options === void 0 ? void 0 : options.surcharge, reader);
 	return {
-		totalUnit: amount.add(surcharge).toFixed(2, Decimal.ROUND_HALF_UP),
-		surRate: rate.toString(),
-		surMoney: fixed.toFixed(2, Decimal.ROUND_HALF_UP),
-		surcharge: surcharge.toFixed(2, Decimal.ROUND_HALF_UP)
+		totalUnit: quote.total,
+		surRate: quote.surchargeRate,
+		surMoney: quote.surchargeFixed,
+		surcharge: quote.surchargeTotal
 	};
 };
 /** 获取 MX51 pairing id。 */

package/es/plus/piPaymentUI/eftpos/amount.js

@@ -15,8 +15,11 @@ const decimal = (value) => {
 const readerSurcharge = (reader) => {
 	var _ref, _ref2, _ref3, _setting$surcharge_ra, _ref4, _ref5, _setting$surcharge_fi;
 	const setting = (reader === null || reader === void 0 ? void 0 : reader.setting) || {};
-	/** useOriginSurcharge 表示业务方自行计算，卡机默认费率不得叠加。 */
-	if (setting.useOriginSurcharge) return {
+	/**
+	* useOriginSurcharge 表示由卡机收取原始手续费；surcharge=false 表示商户已关闭
+	* Pisell 手续费。两种场景都不得继续使用 Reader 中可能残留的历史费率。
+	*/
+	if (setting.useOriginSurcharge || setting.surcharge === false) return {
 		rate: 0,
 		fixed: 0
 	};
@@ -61,4 +64,4 @@ const updateEftposDraftAmount = (draft, input) => {
 	});
 };
 //#endregion
-export { updateEftposDraftAmount };
+export { buildPaymentAmountQuote, updateEftposDraftAmount };

package/es/plus/piPaymentUI/eftpos/pages/DevicePage.js

@@ -1,23 +1,15 @@
 import { EftposProvider, PaymentMode } from "../contracts/index.js";
+import { buildPaymentAmountQuote } from "../amount.js";
 import React from "react";
 import { locales } from "@pisell/utils";
-import Decimal from "decimal.js";
 import ChevronRight from "@pisell/icon/es/ChevronRight";
 //#region src/plus/piPaymentUI/eftpos/pages/DevicePage.tsx
-/** 转成 Decimal。 */
-const toDecimal = (value) => {
-	try {
-		return new Decimal(value === void 0 || value === null || value === "" ? 0 : value);
-	} catch (_error) {
-		return new Decimal(0);
-	}
-};
 /** 从 reader setting 计算设备列表展示金额。 */
 const resolveReaderPay = (reader, options) => {
-	var _ref, _ref2, _ref3, _setting$surcharge_ra, _ref4, _ref5, _setting$surcharge_fi;
 	/** pay/setting 均来自不同版本后端，读取时需要保持兼容。 */
 	const pay = reader.pay;
-	if (pay) {
+	const setting = reader.setting || {};
+	if (pay && !setting.useOriginSurcharge && setting.surcharge !== false) {
 		var _pay$surRate, _pay$surMoney, _pay$surcharge;
 		return {
 			totalUnit: String(pay.totalUnit || pay.total || ""),
@@ -26,17 +18,13 @@ const resolveReaderPay = (reader, options) => {
 			surcharge: String((_pay$surcharge = pay.surcharge) !== null && _pay$surcharge !== void 0 ? _pay$surcharge : "")
 		};
 	}
-	const setting = reader.setting || {};
-	const amount = toDecimal(options === null || options === void 0 ? void 0 : options.amount);
-	const rate = setting.useOriginSurcharge ? new Decimal(0) : toDecimal((_ref = (_ref2 = (_ref3 = (_setting$surcharge_ra = setting.surcharge_rate) !== null && _setting$surcharge_ra !== void 0 ? _setting$surcharge_ra : setting.surRate) !== null && _ref3 !== void 0 ? _ref3 : setting.constant_rate) !== null && _ref2 !== void 0 ? _ref2 : setting.surcharge) !== null && _ref !== void 0 ? _ref : 0);
-	const fixed = setting.useOriginSurcharge ? new Decimal(0) : toDecimal((_ref4 = (_ref5 = (_setting$surcharge_fi = setting.surcharge_fixed) !== null && _setting$surcharge_fi !== void 0 ? _setting$surcharge_fi : setting.surMoney) !== null && _ref5 !== void 0 ? _ref5 : setting.constant_money) !== null && _ref4 !== void 0 ? _ref4 : 0);
-	/** 设备卡片展示的总手续费与最终扣款额，只用于选择前的预览。 */
-	const surcharge = amount.mul(rate.div(100)).add(fixed);
+	/** 设备预览与选择 Reader 后的实际支付报价必须使用同一套金额规则。 */
+	const quote = buildPaymentAmountQuote(options === null || options === void 0 ? void 0 : options.amount, options === null || options === void 0 ? void 0 : options.surcharge, reader);
 	return {
-		totalUnit: amount.add(surcharge).toFixed(2, Decimal.ROUND_HALF_UP),
-		surRate: rate.toString(),
-		surMoney: fixed.toFixed(2, Decimal.ROUND_HALF_UP),
-		surcharge: surcharge.toFixed(2, Decimal.ROUND_HALF_UP)
+		totalUnit: quote.total,
+		surRate: quote.surchargeRate,
+		surMoney: quote.surchargeFixed,
+		surcharge: quote.surchargeTotal
 	};
 };
 /** 获取 MX51 pairing id。 */

package/es/plus/pisellReservation/data/bookingToReservationTables.js

@@ -259,4 +259,4 @@ function bookingListToReservationTableRows(bookings) {
 	return rows;
 }
 //#endregion
-export { applyHostResourceShellToBaseRow, bookingListToReservationTableRows, customerBrief, extractResourceRecordIds, filterBookingsByResourceIds, hostBookingStatusToCardStatus, hostBookingUiPatchFromRecord, mergeBookingsForResourceRecord };
+export { applyHostResourceShellToBaseRow, bookingListToReservationTableRows, customerBrief, extractResourceRecordIds, filterBookingsByResourceIds, hostBookingUiPatchFromRecord, mergeBookingsForResourceRecord };

package/es/plus/pisellReservation/floorMap/floorPlanApi.js

@@ -78,4 +78,4 @@ function toastFloorPlanLoadError(err) {
 	PisellToast({ content: err instanceof Error ? err.message : String(err) });
 }
 //#endregion
-export { PISELL_RESERVATION_FLOOR_PLAN_CODE, buildDefaultReservationFloorPlanPostBody, ensureShopFloorPlanByCode, putShopFloorPlan, saveViewConfigToShopFloorPlan, shopLayoutToSceneElements$1 as shopLayoutToSceneElements, toastFloorPlanLoadError, toastFloorPlanSaveError, unsubscribeShopFloorPlanCodeQuery };
+export { PISELL_RESERVATION_FLOOR_PLAN_CODE, ensureShopFloorPlanByCode, saveViewConfigToShopFloorPlan, shopLayoutToSceneElements$1 as shopLayoutToSceneElements, toastFloorPlanLoadError, toastFloorPlanSaveError, unsubscribeShopFloorPlanCodeQuery };

package/es/plus/pisellReservation/floorMap/reservationMock.js

@@ -927,4 +927,4 @@ function getReservationDataSourceFormColumns() {
 	];
 }
 //#endregion
-export { RESERVATION_BOUND_ROUND_TABLE_ELEMENT_KIND, RESERVATION_BOUND_TABLE_ELEMENT_KIND, applyReservationFloorMapLiveLabels, defaultReservationSceneElements, defaultReservationTableRows, getDefaultReservationFloorMapConfig, getReservationDataSourceFormColumns, getReservationFloorMapShellConfig, mergeFloorMapElementKindCategoriesWithDefaults, mergeFloorMapElementKindsWithDefaults };
+export { RESERVATION_BOUND_ROUND_TABLE_ELEMENT_KIND, RESERVATION_BOUND_TABLE_ELEMENT_KIND, applyReservationFloorMapLiveLabels, defaultReservationTableRows, getDefaultReservationFloorMapConfig, getReservationDataSourceFormColumns, getReservationFloorMapShellConfig, mergeFloorMapElementKindCategoriesWithDefaults, mergeFloorMapElementKindsWithDefaults };

package/es/plus/saleDetail/Base.js

@@ -11,7 +11,6 @@ import { useSalesSdkCart } from "../salesSdk/hooks/useSalesSdkCart.js";
 import { useSalesSdkCustomer } from "../salesSdk/hooks/useSalesSdkCustomer.js";
 import { useSalesSdkBookingContext } from "../salesSdk/context/SalesSdkBookingContext.js";
 import { useSalesSdkSummary } from "../salesSdk/hooks/useSalesSdkSummary.js";
-import "../salesSdk/index.js";
 import locales_default from "./locales.js";
 import locales_default$1 from "./components/LineItem/locales.js";
 import { SaleOrderActionBoundary } from "./actions/index.js";

package/es/plus/saleDetail/components/Client/hooks/useClientSelectorProps.js

@@ -1,7 +1,6 @@
 import { _objectSpread2 } from "../../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import useEngineContext from "../../../../../hooks/useEngineContext.js";
 import { useSalesSdkBookingContext } from "../../../../salesSdk/context/SalesSdkBookingContext.js";
-import "../../../../salesSdk/index.js";
 import { useMemo } from "react";
 import { useMemoizedFn } from "ahooks";
 //#region src/plus/saleDetail/components/Client/hooks/useClientSelectorProps.ts

package/es/plus/saleDetail/components/DetailActions/index.js

@@ -10,7 +10,6 @@ import { useSalesSdk } from "../../../salesSdk/hooks/useSalesSdk.js";
 import { useSalesSdkCart } from "../../../salesSdk/hooks/useSalesSdkCart.js";
 import { useSalesSdkGlobalScanActivity } from "../../../salesSdk/context/SalesSdkGlobalScanActivityContext.js";
 import { useSalesSdkSummary } from "../../../salesSdk/hooks/useSalesSdkSummary.js";
-import "../../../salesSdk/index.js";
 import { resolveSaleDetailTempOrder } from "../../utils.js";
 import { getNumericAmount, getSalesHostModule, invokeLocalReceiptPrint, resolveLocalReceiptPrintModule, resolveSaleDetailOrderIdFromSales, resolveSaleDetailOrderIdFromSalesResult, shouldCloseDialogAfterCheckout, updateLocalOrder } from "./utils.js";
 import { getRemotePrintActions, getWristbandList } from "../../serve.js";

package/es/plus/saleDetail/components/SummaryFinancialSections/index.js

@@ -5,7 +5,6 @@ import { isAppliedPaymentRecord } from "../../../salesSdk/utils/paymentStatus.js
 import { useSalesSdk } from "../../../salesSdk/hooks/useSalesSdk.js";
 import { useSalesSdkCart } from "../../../salesSdk/hooks/useSalesSdkCart.js";
 import { useSalesSdkSummary } from "../../../salesSdk/hooks/useSalesSdkSummary.js";
-import "../../../salesSdk/index.js";
 import { resolveSaleDetailTempOrder } from "../../utils.js";
 import React, { memo, useMemo } from "react";
 import { formatAmount, locales } from "@pisell/utils";

package/es/plus/saleDetail/index.js

@@ -4,7 +4,6 @@ import { useSalesSdk } from "../salesSdk/hooks/useSalesSdk.js";
 import { SalesSdkProvider } from "../salesSdk/context/SalesSdkProvider.js";
 import { SalesSdkDishProvider } from "../salesSdk/context/SalesSdkDishContext.js";
 import { SalesSdkBookingContextProvider } from "../salesSdk/context/SalesSdkBookingContext.js";
-import "../salesSdk/index.js";
 import Base_default from "./Base.js";
 import { resolveSaleDetailOsProps } from "./osProps.js";
 import React, { forwardRef, useImperativeHandle } from "react";

package/es/plus/saleDetail/tmpl/B/components/Dish/index.js

@@ -1,7 +1,6 @@
 import useStableInstanceId from "../../../../../../hooks/useStableInstanceId.js";
 import { useSalesSdkDish } from "../../../../../salesSdk/hooks/useSalesSdkDish.js";
 import { useCurrentSalesSdkDish } from "../../../../../salesSdk/hooks/useCurrentSalesSdkDish.js";
-import "../../../../../salesSdk/index.js";
 import { SaleDetailStatusOverview } from "../shared/StatusOverview.js";
 import { DishGroupView } from "./DishGroupView.js";
 import dayjs from "dayjs";

package/es/plus/saleDetail/tmpl/B/index.js

@@ -1,7 +1,6 @@
 import { _objectSpread2 } from "../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import useEngineContext from "../../../../hooks/useEngineContext.js";
 import { useCurrentSalesSdkDish } from "../../../salesSdk/hooks/useCurrentSalesSdkDish.js";
-import "../../../salesSdk/index.js";
 import { getInternalNotesByScheduleEvent } from "../../serve.js";
 import { TEMPLATE_B_PAY_ACTIONS, TEMPLATE_B_SUMMARY_ACTIONS } from "../../components/DetailActions/configs/index.js";
 import { DetailActions } from "../../components/DetailActions/index.js";

package/es/plus/salesSdk/utils/addProductWithFlowDebounced.js

@@ -360,4 +360,4 @@ function createAddProductWithFlowDebounced(deps) {
 	};
 }
 //#endregion
-export { createAddProductWithFlowDebounced, shouldBypassAddProductDebounce };
+export { createAddProductWithFlowDebounced };

package/es/plus/salesSdk/utils/bookingDate.js

@@ -31,4 +31,4 @@ function subscribeBookingDateChange(bookingTicket, callback) {
 	return typeof off === "function" ? off : () => {};
 }
 //#endregion
-export { BOOKING_CONTEXT_DATE_EVENT, formatBookingDateTime, subscribeBookingDateChange };
+export { formatBookingDateTime, subscribeBookingDateChange };

package/es/plus/salesSdk/utils/enrichCartLineHolderDisplay.js

@@ -71,4 +71,4 @@ function buildHolderListRequestKey(params) {
 	});
 }
 //#endregion
-export { buildHolderListRequestKey, buildHolderListRequestParams, enrichCartBookingHolderDisplay, pickHolderIdFromBooking, resolveHolderDisplayConfig };
+export { buildHolderListRequestKey, buildHolderListRequestParams, enrichCartBookingHolderDisplay, resolveHolderDisplayConfig };

package/es/private-materials/lowcode/authmodal/meta.d.ts

@@ -0,0 +1 @@
+export { };

package/es/pro/Login2.0/AuthModal.d.ts

@@ -14,4 +14,4 @@ interface AuthModalProps {
  */
 declare const AuthModal: React.FC<AuthModalProps>;
 //#endregion
-export { AuthModal };
+export { AuthModal, AuthModalProps };

package/es/pro/Login2.0/index.d.ts

@@ -1,4 +1,4 @@
-import { AuthMethodType, EmailAuthConfig, EmailRegistrationVerification, LoginFormData, OAuthConfig, PhoneAuthConfig, RegisterFormData, UIConfig, VerificationMethod } from "./shared/types.js";
+import { AuthMethodType, VerificationMethod } from "./shared/types.js";
 import { Login2, Login2Config, Login2Events, Login2Props } from "./Login2.js";
 import { Register2, Register2Config, Register2Events, Register2Props } from "./Register2.js";
-import { AuthModal } from "./AuthModal.js";
+import { AuthModal, AuthModalProps } from "./AuthModal.js";

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, VerificationMethod };

package/lib/plus/piPaymentOld/ui/eftpos/amount.js

@@ -17,8 +17,11 @@ const decimal = (value) => {
 const readerSurcharge = (reader) => {
 	var _ref, _ref2, _ref3, _setting$surcharge_ra, _ref4, _ref5, _setting$surcharge_fi;
 	const setting = (reader === null || reader === void 0 ? void 0 : reader.setting) || {};
-	/** useOriginSurcharge 表示业务方自行计算，卡机默认费率不得叠加。 */
-	if (setting.useOriginSurcharge) return {
+	/**
+	* useOriginSurcharge 表示由卡机收取原始手续费；surcharge=false 表示商户已关闭
+	* Pisell 手续费。两种场景都不得继续使用 Reader 中可能残留的历史费率。
+	*/
+	if (setting.useOriginSurcharge || setting.surcharge === false) return {
 		rate: 0,
 		fixed: 0
 	};
@@ -63,4 +66,5 @@ const updateEftposDraftAmount = (draft, input) => {
 	});
 };
 //#endregion
+exports.buildPaymentAmountQuote = buildPaymentAmountQuote;
 exports.updateEftposDraftAmount = updateEftposDraftAmount;

package/lib/plus/piPaymentOld/ui/eftpos/pages/DevicePage.js

@@ -1,27 +1,18 @@
 const require_runtime = require("../../../../../_virtual/_rolldown/runtime.js");
 const require_index = require("../contracts/index.js");
+const require_amount = require("../amount.js");
 let react = require("react");
 react = require_runtime.__toESM(react);
 let _pisell_utils = require("@pisell/utils");
-let decimal_js = require("decimal.js");
-decimal_js = require_runtime.__toESM(decimal_js);
 let _pisell_icon_es_ChevronRight = require("@pisell/icon/es/ChevronRight");
 _pisell_icon_es_ChevronRight = require_runtime.__toESM(_pisell_icon_es_ChevronRight);
 //#region src/plus/piPaymentOld/ui/eftpos/pages/DevicePage.tsx
-/** 转成 Decimal。 */
-const toDecimal = (value) => {
-	try {
-		return new decimal_js.default(value === void 0 || value === null || value === "" ? 0 : value);
-	} catch (_error) {
-		return new decimal_js.default(0);
-	}
-};
 /** 从 reader setting 计算设备列表展示金额。 */
 const resolveReaderPay = (reader, options) => {
-	var _ref, _ref2, _ref3, _setting$surcharge_ra, _ref4, _ref5, _setting$surcharge_fi;
 	/** pay/setting 均来自不同版本后端，读取时需要保持兼容。 */
 	const pay = reader.pay;
-	if (pay) {
+	const setting = reader.setting || {};
+	if (pay && !setting.useOriginSurcharge && setting.surcharge !== false) {
 		var _pay$surRate, _pay$surMoney, _pay$surcharge;
 		return {
 			totalUnit: String(pay.totalUnit || pay.total || ""),
@@ -30,17 +21,13 @@ const resolveReaderPay = (reader, options) => {
 			surcharge: String((_pay$surcharge = pay.surcharge) !== null && _pay$surcharge !== void 0 ? _pay$surcharge : "")
 		};
 	}
-	const setting = reader.setting || {};
-	const amount = toDecimal(options === null || options === void 0 ? void 0 : options.amount);
-	const rate = setting.useOriginSurcharge ? new decimal_js.default(0) : toDecimal((_ref = (_ref2 = (_ref3 = (_setting$surcharge_ra = setting.surcharge_rate) !== null && _setting$surcharge_ra !== void 0 ? _setting$surcharge_ra : setting.surRate) !== null && _ref3 !== void 0 ? _ref3 : setting.constant_rate) !== null && _ref2 !== void 0 ? _ref2 : setting.surcharge) !== null && _ref !== void 0 ? _ref : 0);
-	const fixed = setting.useOriginSurcharge ? new decimal_js.default(0) : toDecimal((_ref4 = (_ref5 = (_setting$surcharge_fi = setting.surcharge_fixed) !== null && _setting$surcharge_fi !== void 0 ? _setting$surcharge_fi : setting.surMoney) !== null && _ref5 !== void 0 ? _ref5 : setting.constant_money) !== null && _ref4 !== void 0 ? _ref4 : 0);
-	/** 设备卡片展示的总手续费与最终扣款额，只用于选择前的预览。 */
-	const surcharge = amount.mul(rate.div(100)).add(fixed);
+	/** 设备预览与选择 Reader 后的实际支付报价必须使用同一套金额规则。 */
+	const quote = require_amount.buildPaymentAmountQuote(options === null || options === void 0 ? void 0 : options.amount, options === null || options === void 0 ? void 0 : options.surcharge, reader);
 	return {
-		totalUnit: amount.add(surcharge).toFixed(2, decimal_js.default.ROUND_HALF_UP),
-		surRate: rate.toString(),
-		surMoney: fixed.toFixed(2, decimal_js.default.ROUND_HALF_UP),
-		surcharge: surcharge.toFixed(2, decimal_js.default.ROUND_HALF_UP)
+		totalUnit: quote.total,
+		surRate: quote.surchargeRate,
+		surMoney: quote.surchargeFixed,
+		surcharge: quote.surchargeTotal
 	};
 };
 /** 获取 MX51 pairing id。 */

package/lib/plus/piPaymentUI/eftpos/amount.js

@@ -17,8 +17,11 @@ const decimal = (value) => {
 const readerSurcharge = (reader) => {
 	var _ref, _ref2, _ref3, _setting$surcharge_ra, _ref4, _ref5, _setting$surcharge_fi;
 	const setting = (reader === null || reader === void 0 ? void 0 : reader.setting) || {};
-	/** useOriginSurcharge 表示业务方自行计算，卡机默认费率不得叠加。 */
-	if (setting.useOriginSurcharge) return {
+	/**
+	* useOriginSurcharge 表示由卡机收取原始手续费；surcharge=false 表示商户已关闭
+	* Pisell 手续费。两种场景都不得继续使用 Reader 中可能残留的历史费率。
+	*/
+	if (setting.useOriginSurcharge || setting.surcharge === false) return {
 		rate: 0,
 		fixed: 0
 	};
@@ -63,4 +66,5 @@ const updateEftposDraftAmount = (draft, input) => {
 	});
 };
 //#endregion
+exports.buildPaymentAmountQuote = buildPaymentAmountQuote;
 exports.updateEftposDraftAmount = updateEftposDraftAmount;

package/lib/plus/piPaymentUI/eftpos/pages/DevicePage.js

@@ -1,27 +1,18 @@
 const require_runtime = require("../../../../_virtual/_rolldown/runtime.js");
 const require_index = require("../contracts/index.js");
+const require_amount = require("../amount.js");
 let react = require("react");
 react = require_runtime.__toESM(react);
 let _pisell_utils = require("@pisell/utils");
-let decimal_js = require("decimal.js");
-decimal_js = require_runtime.__toESM(decimal_js);
 let _pisell_icon_es_ChevronRight = require("@pisell/icon/es/ChevronRight");
 _pisell_icon_es_ChevronRight = require_runtime.__toESM(_pisell_icon_es_ChevronRight);
 //#region src/plus/piPaymentUI/eftpos/pages/DevicePage.tsx
-/** 转成 Decimal。 */
-const toDecimal = (value) => {
-	try {
-		return new decimal_js.default(value === void 0 || value === null || value === "" ? 0 : value);
-	} catch (_error) {
-		return new decimal_js.default(0);
-	}
-};
 /** 从 reader setting 计算设备列表展示金额。 */
 const resolveReaderPay = (reader, options) => {
-	var _ref, _ref2, _ref3, _setting$surcharge_ra, _ref4, _ref5, _setting$surcharge_fi;
 	/** pay/setting 均来自不同版本后端，读取时需要保持兼容。 */
 	const pay = reader.pay;
-	if (pay) {
+	const setting = reader.setting || {};
+	if (pay && !setting.useOriginSurcharge && setting.surcharge !== false) {
 		var _pay$surRate, _pay$surMoney, _pay$surcharge;
 		return {
 			totalUnit: String(pay.totalUnit || pay.total || ""),
@@ -30,17 +21,13 @@ const resolveReaderPay = (reader, options) => {
 			surcharge: String((_pay$surcharge = pay.surcharge) !== null && _pay$surcharge !== void 0 ? _pay$surcharge : "")
 		};
 	}
-	const setting = reader.setting || {};
-	const amount = toDecimal(options === null || options === void 0 ? void 0 : options.amount);
-	const rate = setting.useOriginSurcharge ? new decimal_js.default(0) : toDecimal((_ref = (_ref2 = (_ref3 = (_setting$surcharge_ra = setting.surcharge_rate) !== null && _setting$surcharge_ra !== void 0 ? _setting$surcharge_ra : setting.surRate) !== null && _ref3 !== void 0 ? _ref3 : setting.constant_rate) !== null && _ref2 !== void 0 ? _ref2 : setting.surcharge) !== null && _ref !== void 0 ? _ref : 0);
-	const fixed = setting.useOriginSurcharge ? new decimal_js.default(0) : toDecimal((_ref4 = (_ref5 = (_setting$surcharge_fi = setting.surcharge_fixed) !== null && _setting$surcharge_fi !== void 0 ? _setting$surcharge_fi : setting.surMoney) !== null && _ref5 !== void 0 ? _ref5 : setting.constant_money) !== null && _ref4 !== void 0 ? _ref4 : 0);
-	/** 设备卡片展示的总手续费与最终扣款额，只用于选择前的预览。 */
-	const surcharge = amount.mul(rate.div(100)).add(fixed);
+	/** 设备预览与选择 Reader 后的实际支付报价必须使用同一套金额规则。 */
+	const quote = require_amount.buildPaymentAmountQuote(options === null || options === void 0 ? void 0 : options.amount, options === null || options === void 0 ? void 0 : options.surcharge, reader);
 	return {
-		totalUnit: amount.add(surcharge).toFixed(2, decimal_js.default.ROUND_HALF_UP),
-		surRate: rate.toString(),
-		surMoney: fixed.toFixed(2, decimal_js.default.ROUND_HALF_UP),
-		surcharge: surcharge.toFixed(2, decimal_js.default.ROUND_HALF_UP)
+		totalUnit: quote.total,
+		surRate: quote.surchargeRate,
+		surMoney: quote.surchargeFixed,
+		surcharge: quote.surchargeTotal
 	};
 };
 /** 获取 MX51 pairing id。 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.12.221",
+  "version": "6.12.222",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",

package/es/plus/pisellReservation/index.js

@@ -1,17 +0,0 @@
-import "./serve/formResourcePage.js";
-import "./floorRoomCard/mapRowToFloorRoomCardData.js";
-import "./floorRoomCard/ReservationFloorRoomCard.js";
-import "./floorMap/reservationMock.js";
-import "./floorMap/floorPlanApi.js";
-import "./reservationConstants.js";
-import "./data/bookingToReservationTables.js";
-import "./data/formResourceToReservationTables.js";
-import "./data/salesEmbeddedResourceToTableRows.js";
-import "./floorMap/reservationCards.js";
-import "./PisellReservation.js";
-import "./PisellReservationBookingPage.js";
-import "./PisellVenueControlPage.js";
-import "./PisellVenueWallPage.js";
-import "./PisellReservationTablePage.js";
-import "./components/SelectFloorMapResourceDialog.js";
-export {};