@pisell/private-materials 6.6.2 → 6.7.2

package/es/components/checkout/PaymentModal.js

@@ -17,7 +17,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useRef, useState, useEffect, useCallback, useMemo, useImperativeHandle, forwardRef } from 'react';
 import Decimal from 'decimal.js';
-import { locales, webPrint } from '@pisell/utils';
+import { locales } from '@pisell/utils';
 import { getLocale } from "../../utils/locales";
 import { useMemoizedFn } from 'ahooks';
 import { createPortal } from 'react-dom';
@@ -46,6 +46,7 @@ import { cloneDeep } from 'lodash';
 import { getShopWalletPassId, reorderPaymentMethodList } from "./utils";
 import usePaymentLogger from "./hooks/usePaymentLogger";
 import { Button } from 'antd';
+import usePrinter from "../../hooks/printer";
 import { DiscountKeyboard } from "../../pro/priceKeyboard";
 import { useActiveExecute } from "../ticketBooking/hooks/pisellos";
 
@@ -149,6 +150,8 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     _useState18 = _slicedToArray(_useState17, 2),
     walletPassData = _useState18[0],
     setWalletPassData = _useState18[1];
+  var _usePrinter = usePrinter(),
+    nativePrint = _usePrinter.nativePrint;
   var _useState19 = useState(false),
     _useState20 = _slicedToArray(_useState19, 2),
     syncingLock = _useState20[0],
@@ -803,11 +806,12 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 data: {
                   order_id: responseData.order_id,
                   machine_code_print_info: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info,
-                  small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment = responseData.payment_info) === null || _responseData$payment === void 0 ? void 0 : _responseData$payment.small_ticket_data
+                  small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment = responseData.payment_info) === null || _responseData$payment === void 0 ? void 0 : _responseData$payment.small_ticket_data,
+                  machine_code_print_info_v2: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info_v2
                 }
               };
               console.log('print_order_onOrderSynced_params>>>>', params);
-              webPrint(params, function (res) {
+              nativePrint(params, function (res) {
                 console.log('print_order_onOrderSynced_res>>>>', res);
               });
             } catch (error) {
@@ -1089,7 +1093,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 }
               };
               try {
-                webPrint(params, function (res) {
+                nativePrint(params, function (res) {
                   console.log('handleButtonClick_print-receipt_res>>>>', res);
                   if (!(res !== null && res !== void 0 && res.result)) {
                     Toast === null || Toast === void 0 || Toast.error((res === null || res === void 0 ? void 0 : res.msg) || '');
@@ -1410,17 +1414,15 @@ var PaymentModal = function PaymentModal(_ref18) {
     _useState34 = _slicedToArray(_useState33, 2),
     showRetryModal = _useState34[0],
     setShowRetryModal = _useState34[1];
-  var _useState35 = useState(false),
+  var _useState35 = useState(editOrderId || 0),
     _useState36 = _slicedToArray(_useState35, 2),
-    showCreateErrorModal = _useState36[0],
-    setShowCreateErrorModal = _useState36[1];
-  var _useState37 = useState(editOrderId || 0),
-    _useState38 = _slicedToArray(_useState37, 2),
-    currentEditOrderId = _useState38[0],
-    _setCurrentEditOrderId = _useState38[1];
+    currentEditOrderId = _useState36[0],
+    _setCurrentEditOrderId = _useState36[1];
   var _useActiveExecute2 = useActiveExecute(),
     executeIfActive = _useActiveExecute2.executeIfActive;
   var Toast = useToast();
+  var _usePrinter2 = usePrinter(),
+    nativePrint = _usePrinter2.nativePrint;
 
   // 重试处理函数（逻辑由用户自己实现）
   var handleRetry = /*#__PURE__*/function () {
@@ -1552,18 +1554,18 @@ var PaymentModal = function PaymentModal(_ref18) {
   }, []);
 
   // 订单备注相关状态
-  var _useState39 = useState(false),
+  var _useState37 = useState(false),
+    _useState38 = _slicedToArray(_useState37, 2),
+    noteModalOpen = _useState38[0],
+    setNoteModalOpen = _useState38[1];
+  var _useState39 = useState(''),
     _useState40 = _slicedToArray(_useState39, 2),
-    noteModalOpen = _useState40[0],
-    setNoteModalOpen = _useState40[1];
-  var _useState41 = useState(''),
+    orderNote = _useState40[0],
+    setOrderNote = _useState40[1];
+  var _useState41 = useState('payment-content'),
     _useState42 = _slicedToArray(_useState41, 2),
-    orderNote = _useState42[0],
-    setOrderNote = _useState42[1];
-  var _useState43 = useState('payment-content'),
-    _useState44 = _slicedToArray(_useState43, 2),
-    noteModalSource = _useState44[0],
-    setNoteModalSource = _useState44[1];
+    noteModalSource = _useState42[0],
+    setNoteModalSource = _useState42[1];
 
   // 订单备注相关处理函数
   var handleNoteConfirm = /*#__PURE__*/function () {
@@ -2147,7 +2149,8 @@ var PaymentModal = function PaymentModal(_ref18) {
                             data: {
                               order_id: responseData.order_id,
                               machine_code_print_info: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info,
-                              small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment3 = responseData.payment_info) === null || _responseData$payment3 === void 0 ? void 0 : _responseData$payment3.small_ticket_data
+                              small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment3 = responseData.payment_info) === null || _responseData$payment3 === void 0 ? void 0 : _responseData$payment3.small_ticket_data,
+                              machine_code_print_info_v2: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info_v2
                             }
                           };
                           console.log('print_order_onOrderSynced_params>>>>', params);
@@ -2158,7 +2161,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                               params: params
                             }
                           });
-                          webPrint(params, function (res) {
+                          nativePrint(params, function (res) {
                             console.log('print_order_onOrderSynced_res>>>>', res);
                             logger === null || logger === void 0 || logger.addLog({
                               type: 'info',
@@ -2292,7 +2295,7 @@ var PaymentModal = function PaymentModal(_ref18) {
               setOrderInfo(_orderInfo4);
               isLocalOrderCreated.current = true;
             case 42:
-              _context23.next = 49;
+              _context23.next = 48;
               break;
             case 44:
               _context23.prev = 44;
@@ -2305,9 +2308,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                   error: _context23.t0
                 }
               });
-              // 如果订单创建失败，弹出提示让重新加载 app
-              setShowCreateErrorModal(true);
-            case 49:
+            case 48:
             case "end":
               return _context23.stop();
           }
@@ -2439,7 +2440,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                   }
                 };
                 try {
-                  webPrint(params, function (res) {
+                  nativePrint(params, function (res) {
                     console.log('handleButtonClick_print-receipt_res>>>>', res);
                     if (!(res !== null && res !== void 0 && res.result)) {
                       Toast === null || Toast === void 0 || Toast.error((res === null || res === void 0 ? void 0 : res.msg) || '');
@@ -2813,39 +2814,7 @@ var PaymentModal = function PaymentModal(_ref18) {
       width: '100%',
       marginTop: '80px'
     }
-  }, locales.getText('retry') || '重试'))), /*#__PURE__*/React.createElement(PisellContainer, {
-    renderType: "modal",
-    props: {
-      open: showCreateErrorModal,
-      title: locales.getText('pisell2.checkout.tips'),
-      footer: null,
-      keyboard: false,
-      onCancel: function onCancel() {
-        setShowCreateErrorModal(false);
-      } // 禁用关闭
-    }
-  }, /*#__PURE__*/React.createElement("div", {
-    style: {
-      textAlign: 'center',
-      padding: '20px'
-    }
-  }, /*#__PURE__*/React.createElement("div", {
-    style: {
-      marginBottom: '16px',
-      fontSize: '16px'
-    }
-  }, locales.getText('pisell2.checkout.order-create-failed')), /*#__PURE__*/React.createElement(Button, {
-    type: "primary",
-    size: "large",
-    onClick: function onClick() {
-      setShowCreateErrorModal(false);
-      window.location.reload();
-    },
-    style: {
-      width: '100%',
-      marginTop: '80px'
-    }
-  }, locales.getText('confirm') || '确认'))));
+  }, locales.getText('retry') || '重试'))));
 };
 
 // 导出类型供外部使用

package/es/components/checkout/components/CashPaymentModule/index.js

@@ -14,8 +14,8 @@ import useEngineContext from "../../../../hooks/useEngineContext";
 import { locales, formatAmount } from '@pisell/utils';
 import checkoutLocales from "../../locales";
 import useToast from "../../../../hooks/useToast";
-import { CashKeyboard } from "../../../../pro/priceKeyboard";
 import { useDebounceFn } from 'ahooks';
+import { CashKeyboard } from "../../../../pro/priceKeyboard";
 import "./index.less";
 export function CashPaymentModule(_ref) {
   var amountSymbol = _ref.amountSymbol,
@@ -65,6 +65,12 @@ export function CashPaymentModule(_ref) {
 
   // 检查是否应该禁用输入框：原本disabled为true 或者 订单金额为0
   var isInputDisabled = disabled || Number(customAmount || 0) === 0;
+  var handleAmountClick = function handleAmountClick(clickedAmount) {
+    if (isAmountButtonsDisabled) return;
+    var amountStr = clickedAmount.toString();
+    setAmount(amountStr);
+    setRoundingAmount(0);
+  };
   var handleCashPayInternal = function handleCashPayInternal() {
     if (isAmountButtonsDisabled) return;
     if (onPaymentComplete) {

package/es/components/checkout/components/ScrollableList/index.js

@@ -241,6 +241,7 @@ var ScrollableList = function ScrollableList(_ref) {
     style: getGridStyle()
   }, children)), isScrollable && /*#__PURE__*/React.createElement("button", {
     style: _objectSpread(_objectSpread({}, bottomGradientStyle), {}, {
+      width: '100%',
       border: 'none',
       background: 'linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #A78BE1 100%)'
     }, gradientStyle),

package/es/components/checkout/components/SearchAndClientModule/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 export interface IScanResult {
     status: 'success' | 'failed';

package/es/components/checkout/components/WalletPassModule/components/ConflictModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellWalletPassCardProps } from '../../types';
 export declare const TestModule: () => JSX.Element;
 declare const ConflictModal: (props: {

package/es/components/checkout/components/WalletPassModule/components/DiscountWallet/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface DiscountWalletProps {
     isCardMode: boolean;

package/es/components/checkout/locales.d.ts

@@ -154,7 +154,6 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
-        'pisell2.checkout.order-create-failed': string;
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;
@@ -323,7 +322,6 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
-        'pisell2.checkout.order-create-failed': string;
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;
@@ -492,7 +490,6 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
-        'pisell2.checkout.order-create-failed': string;
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;

package/es/components/checkout/locales.js

@@ -200,7 +200,6 @@ export default {
     'pisell2.amount-summary.amount-cannot-be-zero': 'The amount cannot be 0',
     // Order sync errors
     'pisell2.checkout.order-sync-failed': 'Order sync failed, please check your network',
-    'pisell2.checkout.order-create-failed': 'Order create failed, please refresh app',
     'pisell2.checkout.sync-retry-hint': 'Network error, please click the retry button to resync the order',
     'pisell2.checkout.tips': 'Tips',
     'retry': 'Retry',
@@ -419,7 +418,6 @@ export default {
     'pisell2.amount-summary.amount-cannot-be-zero': '金额不能为0',
     // Order sync errors
     'pisell2.checkout.order-sync-failed': '订单同步失败，请检查网络',
-    'pisell2.checkout.order-create-failed': '订单创建失败，请重启APP',
     'pisell2.checkout.sync-retry-hint': '网络异常，请点击重试按钮重新同步订单',
     'pisell2.checkout.tips': '提示',
     'retry': '重试',
@@ -638,7 +636,6 @@ export default {
     'pisell2.amount-summary.amount-cannot-be-zero': '金額不能為0',
     // Order sync errors
     'pisell2.checkout.order-sync-failed': '訂單同步失敗，請檢查網絡',
-    'pisell2.checkout.order-create-failed': '订单创建失败，请重启APP',
     'pisell2.checkout.sync-retry-hint': '網絡異常，請點擊重試按鈕重新同步訂單',
     'pisell2.checkout.tips': '提示',
     'retry': '重試',

package/es/components/eftpos/deviceList/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const _default: ({ input, ...formItemProps }: any) => JSX.Element;
 export default _default;

package/es/components/eftpos/form/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 递归循环表单数据
  * @Author: hongbing.wang

package/es/components/eftpos/group/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { RadioGroupProps } from 'antd';
 export declare const CheckboxGroup: ({ direction, options, ...props }: any) => JSX.Element;
 export declare const RadioGroup: ({ direction, options, ...props }: RadioGroupProps & {

package/es/components/eftpos/hooks.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Eftpos } from './const';
 /**
  * @title: tyro 设备连接

package/es/components/eftpos/icon/apiKey.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/es/components/eftpos/icon/device.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/es/components/eftpos/receipt/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 自定义组件设置
  * @description: 自定义组件设置

package/es/components/eftposPay/component/alert/warn.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const _default: () => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/header/titlebar.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './titlebar.less';
 declare enum EPopupTitleBarVariantType {
     BackTitleClose = "back-title-cancel",

package/es/components/eftposPay/component/step/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;

package/es/components/eftposPay/component/step/step.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: (props: {
     status: string;
     pedding?: string;

package/es/components/eftposPay/hooks.d.ts

@@ -15,7 +15,7 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;

package/es/components/eftposPay/store/index.d.ts

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "loading" | "success" | "warn" | "fail" | "question";
+        status: "loading" | "warn" | "success" | "fail" | "question";
     };
 };
 /**
@@ -298,7 +298,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
         eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
-        action?: "pay" | "amount" | "deviceList" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/es/components/eftposPay/tyro/hooks.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 获取 Tyro 资源
  * @description:

package/es/components/eftposPay/tyro/index.js

@@ -180,12 +180,6 @@ export default (function (_ref) {
       response: {},
       metadata: {
         receipt: []
-      },
-      _config: {
-        retry: {
-          count: 10,
-          delay: 500
-        }
       }
     }).then(function (res) {
       requestIdRef.current = res.data.id;
@@ -260,12 +254,6 @@ export default (function (_ref) {
       response: {},
       metadata: {
         receipt: []
-      },
-      _config: {
-        retry: {
-          count: 10,
-          delay: 500
-        }
       }
     }).then(function (res) {
       requestIdRef.current = res.data.id;

package/es/components/eventBooking/components/ErrorTip/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ErrorTip: ({ text }: any) => JSX.Element;
 export default ErrorTip;

package/es/components/eventBooking/components/Provider/Cart/Deposit/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Deposit: () => JSX.Element;
 export default Deposit;

package/es/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const InformationOptionsModal: (props: any) => JSX.Element;
 export default InformationOptionsModal;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateStatus/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Status: (props: any) => JSX.Element;
 export default Status;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare type CallToBookProps = {
     show: boolean;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const WeekItem: (props: any) => JSX.Element;
 export default WeekItem;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare type CalenDateWeekProps = {
     currentDate: string;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const DayItem: (props: any) => JSX.Element;
 export default DayItem;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 import { CalendarItemProps } from '../../../../../type';
 declare const Item: (props: CalendarItemProps) => JSX.Element;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Status/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Status: (props: any) => JSX.Element;
 export default Status;

package/es/components/index.d.ts

@@ -9,8 +9,8 @@ import ProductExtension from './productExtension';
 import RuleSetting from './ruleSetting';
 import TaxSelect from './taxSelect';
 import ToCPay from './pay/toC';
-import Wallet from './wallet';
 import WalletList from './walletList';
+import Wallet from './wallet';
 import WorkspaceListDetail from './workSpaceListDetail/';
 import WorkspaceList from './workSpaceList';
 import PisellSelectCustomerModal from './pisellSelectCustomerModal';
@@ -19,4 +19,5 @@ import EditBookingModal from './booking/editBookingModal';
 import StepController from './stepController';
 import PinModal from './pinModal';
 import PinVerifyModal from './pinVerifyModal';
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, };
+import { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from './authentication/admin';
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, };

package/es/components/index.js

@@ -9,8 +9,8 @@ import ProductExtension from "./productExtension";
 import RuleSetting from "./ruleSetting";
 import TaxSelect from "./taxSelect";
 import ToCPay from "./pay/toC";
-import Wallet from "./wallet";
 import WalletList from "./walletList";
+import Wallet from "./wallet";
 import WorkspaceListDetail from "./workSpaceListDetail/";
 import WorkspaceList from "./workSpaceList";
 import PisellSelectCustomerModal from "./pisellSelectCustomerModal";
@@ -19,4 +19,5 @@ import EditBookingModal from "./booking/editBookingModal";
 import StepController from "./stepController";
 import PinModal from "./pinModal";
 import PinVerifyModal from "./pinVerifyModal";
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal };
+import { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from "./authentication/admin";
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth };

package/es/components/list/List.js

@@ -179,9 +179,6 @@ var List = function List(props) {
   var processedData = useMemo(function () {
     // 如果正在加载且没有数据，使用模拟数据
     var sourceData = loading ? MOCK_LIST_DATA : data || [];
-    console.log("processedData recalculating: tabStyle=".concat(tabStyle, ", activeTab=").concat(activeTab, ", tabItems=").concat(tabItems.length, ", dataLength=").concat(sourceData.length));
-    console.log("sourceData sample: ".concat(JSON.stringify(sourceData.slice(0, 2), null, 2)));
-    console.log("tabGroup: ".concat(tabGroup));
 
     // 如果tab样式是anchor，需要按分组显示数据
     if (tabStyle === 'anchor' && tabItems.length > 0) {

package/es/components/pay/toB/components/Cache/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ToBPayCache: (props: {
     open: boolean;

package/es/components/pay/toB/components/CardGroup/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PayMethod, PayMethodGroup } from '../../types';
 import './index.less';
 declare const ToBPayCardGroup: (props: {

package/es/components/pay/toB/components/MX51/index.js

@@ -1,6 +1,6 @@
 import { forwardRef, useImperativeHandle } from 'react';
-import { webPayment } from '@pisell/utils';
 import useLogger from "../../../../../hooks/useLogger";
+import useEngineContext from "../../../../../hooks/useEngineContext";
 var getUuid = function getUuid() {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxx'.replace(/[xy]/g, function (c) {
     var r = Math.random() * 16 | 0;
@@ -9,7 +9,10 @@ var getUuid = function getUuid() {
   });
 };
 var MX51 = function MX51(props, ref) {
+  var _context$appHelper;
   var logger = useLogger();
+  var context = useEngineContext();
+  var action = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.action;
   var onOpen = function onOpen(_ref) {
     var data = _ref.data,
       payCallback = _ref.payCallback;
@@ -33,20 +36,47 @@ var MX51 = function MX51(props, ref) {
         params: newData
       }
     });
-    // 通过jsbridge调用mx51支付
-    webPayment(newData, function (res) {
-      // 判断是否是同一个支付
-      var isSame = (res === null || res === void 0 ? void 0 : res.uniquePaymentNumber) === uniquePaymentNumber;
-      logger === null || logger === void 0 || logger.addLog({
-        type: 'info',
-        title: 'ToB_MX51_onOpen_callback',
-        metadata: {
-          msg: isSame ? 'uniquePaymentNumber一致' : 'uniquePaymentNumber不一致',
-          res: res
+
+    // 通过action调用mx51支付
+    action({
+      type: 'webpos.handleMX51Pay',
+      data: newData,
+      callback: function callback(res) {
+        var isSame = false;
+        if (res !== null && res !== void 0 && res.uniquePaymentNumber) {
+          // jsbridge调用场景结果
+          var _res = res;
+          // 判断是否是同一个支付
+          isSame = (_res === null || _res === void 0 ? void 0 : _res.uniquePaymentNumber) === uniquePaymentNumber;
+          if (isSame) {
+            payCallback === null || payCallback === void 0 || payCallback(_res);
+          }
+        } else {
+          var _res2$data, _res2$data2;
+          // 原生调用场景结果
+          var _res2 = res;
+          // 转换为MX51PayResult类型，上层调用需要
+          var newRes = {
+            result: (_res2 === null || _res2 === void 0 ? void 0 : _res2.code) == '200' ? true : false,
+            msg: _res2 === null || _res2 === void 0 ? void 0 : _res2.msg,
+            amount: _res2 === null || _res2 === void 0 || (_res2$data = _res2.data) === null || _res2$data === void 0 ? void 0 : _res2$data.amount,
+            surcharge: _res2 === null || _res2 === void 0 || (_res2$data2 = _res2.data) === null || _res2$data2 === void 0 ? void 0 : _res2$data2.surcharge,
+            uniquePaymentNumber: _res2 === null || _res2 === void 0 ? void 0 : _res2.uuid
+          };
+          // 判断是否是同一个支付
+          isSame = (_res2 === null || _res2 === void 0 ? void 0 : _res2.uuid) === uniquePaymentNumber;
+          if (isSame) {
+            payCallback === null || payCallback === void 0 || payCallback(newRes);
+          }
         }
-      });
-      if (isSame) {
-        payCallback === null || payCallback === void 0 || payCallback(res);
+        logger === null || logger === void 0 || logger.addLog({
+          type: 'info',
+          title: 'ToB_MX51_onOpen_callback',
+          metadata: {
+            msg: isSame ? '交易流水号一致' : '交易流水号不一致',
+            res: res
+          }
+        });
       }
     });
   };