@pisell/private-materials 6.1.1 → 6.1.2

package/es/components/booking/locales.js

@@ -128,6 +128,7 @@ export default {
     'pisell1.text.resource-error-message-3': function pisell1TextResourceErrorMessage3(x, y, z) {
       return "".concat(x, " is fully booked between ").concat(y, " and ").concat(z, ", but your team member can still book appointments.");
     },
+    'pisell1.text.resource-error-message-unbound': 'This booking product is not associated with the target resource.',
     'pisell1.text.no-addons': 'No addons',
     'pisell1.text.no-resource': 'No resource',
     'pisell1.text.no-payments': 'No payments',
@@ -454,6 +455,7 @@ export default {
     'pisell1.text.resource-error-message-3': function pisell1TextResourceErrorMessage3(x, y, z) {
       return "".concat(x, "\u5728").concat(y, "\u5230").concat(z, "\u4E4B\u95F4\u5DF2\u7EA6\u6EE1\uFF0C\u4F46\u60A8\u7684\u56E2\u961F\u6210\u5458\u4ECD\u7136\u53EF\u4EE5\u9884\u7EA6\u3002");
     },
+    'pisell1.text.resource-error-message-unbound': '该预约商品未关联目标资源。',
     'pisell2.text.flexible': "灵活",
     'pisell2.text.order-discount': "折扣",
     'pisell2.text.no-product-added': '未添加商品',
@@ -772,6 +774,7 @@ export default {
     'pisell1.text.resource-error-message-3': function pisell1TextResourceErrorMessage3(x, y, z) {
       return "".concat(x, "\u5728").concat(y, "\u5230").concat(z, "\u4E4B\u9593\u5DF2\u7D04\u6EFF\uFF0C\u4F46\u60A8\u7684\u5718\u968A\u6210\u54E1\u4ECD\u7136\u53EF\u4EE5\u9810\u7D04\u3002");
     },
+    'pisell1.text.resource-error-message-unbound': '該預約商品未關聯目標資源。',
     'pisell2.text.flexible': "靈活",
     'pisell2.text.order-discount': "折扣",
     'pisell2.text.no-product-added': '未添加商品',

package/es/components/booking/materiels/duration/index.js

@@ -20,6 +20,9 @@ var Duration = function Duration(props) {
     startDate = props.startDate,
     timeObj = props.timeObj,
     resetProps = _objectWithoutProperties(props, _excluded);
+  var startDateStr = useMemo(function () {
+    return dayjs(startDate).format('YYYY-MM-DD HH:mm:ss');
+  }, [startDate]);
 
   /**
    * @title: 时间切片
@@ -57,7 +60,7 @@ var Duration = function Duration(props) {
       });
     }
     return durationSlicesBasedOnTime;
-  }, [timeObj, slice, locale, duration, startDate, usableTime]);
+  }, [timeObj.durationSlicesBasedOnTime, slice, locale, duration, startDateStr, usableTime === null || usableTime === void 0 ? void 0 : usableTime.end_at]);
   useEffect(function () {
     timeObjChange === null || timeObjChange === void 0 || timeObjChange(times);
   }, [times]);
@@ -72,6 +75,10 @@ var Duration = function Duration(props) {
       }, d[label]);
     });
   }, []);
-  return /*#__PURE__*/React.createElement(Select, _extends({}, selectProps, resetProps), renderOptions(times));
+  var options = useMemo(function () {
+    console.log('render form options');
+    return renderOptions(times);
+  }, [times]);
+  return /*#__PURE__*/React.createElement(Select, _extends({}, selectProps, resetProps), options);
 };
 export default Duration;

package/es/components/booking/materiels/holder/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from "antd";
 interface StartTimeProps extends SelectProps {
     locale?: string;

package/es/components/booking/utils.d.ts

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | "flexible" | {
+}) => number | {
     type: string;
     value: number;
-};
+} | "flexible";
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.css';
 /**
  * @title: 自定义组件设置

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

@@ -8,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

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

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

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

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

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

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

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

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

@@ -10,7 +10,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -15,11 +15,11 @@ 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<"success" | "loading" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "stripe" | "payo">;
+    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/payo/config.js

@@ -20,7 +20,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 /* eslint-disable @typescript-eslint/naming-convention */
 import { locales } from '@pisell/utils';
 import { Button } from 'antd';
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import Step from "../component/step";
 import { PayStatus, StatusEnum, ModeEnum, ClientEnum } from "../const";
 import { getUuid, getPayParams } from "../helper";
@@ -224,7 +224,22 @@ export var Action = function Action(_ref2) {
   var dispatch = useDispatch();
   var _useContextData2 = useContextData(),
     mode = _useContextData2.mode,
-    client = _useContextData2.client;
+    client = _useContextData2.client,
+    order_id = _useContextData2.order_id,
+    number = _useContextData2.number,
+    device = _useContextData2.device;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isShowCancel = _useState2[0],
+    setIsShowCancel = _useState2[1];
+  useEffect(function () {
+    var timer = setTimeout(function () {
+      setIsShowCancel(true);
+    }, 30 * 1000);
+    return function () {
+      clearTimeout(timer);
+    };
+  }, []);
 
   /**
    * @title: 前往手动标记页
@@ -240,9 +255,21 @@ export var Action = function Action(_ref2) {
     }));
     dispatch(updateComponent('Manual', true));
   };
+  var onCancel = function onCancel() {
+    onChange('fail', {
+      number: number,
+      uniquePaymentNumber: number,
+      device: device,
+      order_id: order_id
+    });
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-step-item-btns"
-  }, client === ClientEnum.Merchant ? /*#__PURE__*/React.createElement(Button, {
+  }, client !== ClientEnum.Merchant && isShowCancel && /*#__PURE__*/React.createElement(Button, {
+    block: true,
+    className: "pisell-lowcode__eft-pay-step-item-btn",
+    onClick: onCancel
+  }, locales.getText('page.eftpos-pay.text.cancel')), client === ClientEnum.Merchant ? /*#__PURE__*/React.createElement(Button, {
     block: true,
     className: "pisell-lowcode__eft-pay-step-item-btn",
     onClick: onManually

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: "success" | "loading" | "warn" | "fail" | "question";
+        status: "success" | "warn" | "loading" | "fail" | "question";
     };
 };
 /**
@@ -295,20 +295,20 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "refund" | "fullPay" | "pay" | "query" | undefined;
+        mode?: "pay" | "fullPay" | "refund" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "tyro" | "windcave" | "stripe" | "payo" | undefined;
-        action?: "amount" | "pay" | "deviceList" | undefined;
+        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | undefined;
+        action?: "amount" | "deviceList" | "pay" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
         subTitle?: string | undefined;
-        type?: "unset" | "step" | undefined;
+        type?: "step" | "unset" | undefined;
         render?: boolean | undefined;
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "success" | "loading" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

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

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

package/es/components/eventBooking/components/Provider/Event/index.js

@@ -7,7 +7,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState } from 'react';
 import { isMobile, locales } from '@pisell/utils';
 import { Skeleton } from 'antd';
-import { useEvent, useSales, useEventDetail, useStep } from "../../../../Sales";
+import { useEvent, useSales, useEventDetail, useStep, useCustomer } from "../../../../Sales";
 import BookingServiceList from "../../bookingServiceList";
 import BookingDetailModal from "../../bookingDetailModal";
 import "./index.less";
@@ -31,6 +31,8 @@ var Event = function Event() {
     lists = _useState2[0],
     setLists = _useState2[1];
   var customer = useLoginUser();
+  var _useCustomer = useCustomer(),
+    appUtils = _useCustomer.appUtils;
   useEffect(function () {
     var _data$stepData;
     var eventList = (eventData === null || eventData === void 0 ? void 0 : eventData.eventList) || [];
@@ -45,16 +47,23 @@ var Event = function Event() {
     }
   }, [eventData === null || eventData === void 0 ? void 0 : eventData.eventList]);
   useEffect(function () {
-    var _data$resourceData;
+    var _data$resourceData, _appUtils$getHistory, _history$location;
     var id = data === null || data === void 0 || (_data$resourceData = data.resourceData) === null || _data$resourceData === void 0 || (_data$resourceData = _data$resourceData.currentResourceItem) === null || _data$resourceData === void 0 ? void 0 : _data$resourceData.id;
     if (!id) return;
-    getEventList.run({
+    var history = (appUtils === null || appUtils === void 0 || (_appUtils$getHistory = appUtils.getHistory) === null || _appUtils$getHistory === void 0 ? void 0 : _appUtils$getHistory.call(appUtils)) || {};
+    var query = history === null || history === void 0 || (_history$location = history.location) === null || _history$location === void 0 ? void 0 : _history$location.query;
+    var params = {
       event_item_resource_id: id,
       skip: 1,
       num: 100,
       customer_id: customer === null || customer === void 0 ? void 0 : customer.id,
       open_quotation: 1
-    });
+    };
+    if (query !== null && query !== void 0 && query.ids) {
+      var _query$ids;
+      params.ids = query === null || query === void 0 || (_query$ids = query.ids) === null || _query$ids === void 0 ? void 0 : _query$ids.split(',');
+    }
+    getEventList.run(params);
   }, [data === null || data === void 0 || (_data$resourceData2 = data.resourceData) === null || _data$resourceData2 === void 0 || (_data$resourceData2 = _data$resourceData2.currentResourceItem) === null || _data$resourceData2 === void 0 ? void 0 : _data$resourceData2.id, customer === null || customer === void 0 ? void 0 : customer.id]);
 
   /**

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

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

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

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

package/es/components/eventBooking/components/bookingDetailModal/index.js

@@ -16,7 +16,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useRef, useState, useEffect } from 'react';
 import { PisellModal, PisellAnchor, PisellImageCarousels } from '@pisell/materials';
 import EventCard from "../eventCard";
-import { useCart, useEventDetail } from "../../../Sales";
+import { useCart, useEventDetail, useInit } from "../../../Sales";
 import { isMobile, locales } from '@pisell/utils';
 import Schedule from "./components/Schedule";
 import Resource from "./components/Resource";
@@ -25,7 +25,7 @@ import OrderProductModal from "../Provider/OrderProductModal/index";
 import "./index.less";
 import useEngineContext from "../../../../hooks/useEngineContext";
 var BookingDetailModal = function BookingDetailModal(props) {
-  var _detail$introduction2;
+  var _initData$boardSettin2, _detail$introduction2;
   var modalContentRef = useRef(null);
   var context = useEngineContext();
   var _ref = context.appHelper || {},
@@ -43,6 +43,8 @@ var BookingDetailModal = function BookingDetailModal(props) {
     addToCart = _useCart.addToCart,
     checkBeforeAddToCart = _useCart.checkBeforeAddToCart,
     checkBeforeAddToCartResquest = _useCart.checkBeforeAddToCartResquest;
+  var _useInit = useInit(),
+    initData = _useInit.initData;
   var _useState = useState('introduction'),
     _useState2 = _slicedToArray(_useState, 2),
     activeTab = _useState2[0],
@@ -59,6 +61,20 @@ var BookingDetailModal = function BookingDetailModal(props) {
   var isUserClickRef = useRef(false); // 添加用户点击标记
   var scrollTimeoutRef = useRef(null);
 
+  /**
+   * @title: 按钮确认文案
+   * @description:
+   * @param {*} useMemo
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-06-26 15:34
+   */
+  var buttonText = useMemo(function () {
+    var _initData$boardSettin, _utils$translation;
+    var config = (initData === null || initData === void 0 || (_initData$boardSettin = initData.boardSetting) === null || _initData$boardSettin === void 0 || (_initData$boardSettin = _initData$boardSettin.config) === null || _initData$boardSettin === void 0 ? void 0 : _initData$boardSettin.product_display_setting) || {};
+    return (utils === null || utils === void 0 || (_utils$translation = utils.translation) === null || _utils$translation === void 0 ? void 0 : _utils$translation.call(utils, config === null || config === void 0 ? void 0 : config.booking_event_v2_product_detail_button)) || locales.getText('pisell2.event.add.to.cart');
+  }, [initData === null || initData === void 0 || (_initData$boardSettin2 = initData.boardSetting) === null || _initData$boardSettin2 === void 0 || (_initData$boardSettin2 = _initData$boardSettin2.config) === null || _initData$boardSettin2 === void 0 ? void 0 : _initData$boardSettin2.product_display_setting]);
+
   /**
    * @title: 详情锚点
    * @description:
@@ -377,7 +393,7 @@ var BookingDetailModal = function BookingDetailModal(props) {
     destroyOnClose: true,
     className: "booking-detail-modal",
     onCancel: onCloseEventDetail,
-    okText: locales.getText('pisell2.event.add.to.cart'),
+    okText: buttonText,
     cancelVisible: false,
     onOk: handleOk,
     width: isMobile() ? '100%' : 600,

package/es/components/eventBooking/index.js

@@ -36,14 +36,28 @@ var Content = function Content() {
    * @Author: WangHan
    * @Date: 2025-01-17 14:25
    */
+  // useEffect(() => {
+  //   if (!form_id) return;
+
+  //   getResourceList.run({
+  //     form_id: form_id,
+  //     shop_id: shop_id,
+  //     form_data_status: 'active',
+  //   });
+  // }, [form_id]);
   useEffect(function () {
-    if (!form_id) return;
-    getResourceList.run({
-      form_id: form_id,
-      shop_id: shop_id,
-      form_data_status: 'active'
-    });
-  }, [form_id]);
+    var _utils$getHistory, _history$location;
+    var history = (utils === null || utils === void 0 || (_utils$getHistory = utils.getHistory) === null || _utils$getHistory === void 0 ? void 0 : _utils$getHistory.call(utils)) || {};
+    var query = history === null || history === void 0 || (_history$location = history.location) === null || _history$location === void 0 ? void 0 : _history$location.query;
+    var params = {
+      front_end_cache_id: (query === null || query === void 0 ? void 0 : query.cacheId) || ''
+    };
+    if (query !== null && query !== void 0 && query.ids) {
+      var _query$ids;
+      params.event_item_ids = query === null || query === void 0 || (_query$ids = query.ids) === null || _query$ids === void 0 ? void 0 : _query$ids.split(',');
+    }
+    getResourceList.run(params);
+  }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: "event-booking-wrap ".concat(isMobile() ? 'event-booking-mobile-wrap' : '')
   }, /*#__PURE__*/React.createElement(Header, null), /*#__PURE__*/React.createElement(EventContent, null), isMobile() && (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.key) !== 'select-category' ? /*#__PURE__*/React.createElement(Footer, null) : null);

package/es/components/eventBooking/locales.js

@@ -35,7 +35,7 @@ export default {
     'pisell2.event.campus': 'Campus',
     'pisell2.event.resource': 'Location',
     'pisell2.event.booking.options': 'Booking options',
-    'pisell2.event.add.to.cart': 'Add to cart',
+    'pisell2.event.add.to.cart': 'Add to Cart',
     'pisell2.event.description': 'Description',
     'pisell2.event.view.more': 'View more',
     'pisell2.event.view.less': 'View less',
@@ -120,7 +120,7 @@ export default {
     'pisell2.event.campus': '校区',
     'pisell2.event.resource': '资源',
     'pisell2.event.booking.options': '预约选项',
-    'pisell2.event.add.to.cart': '添加到购物车',
+    'pisell2.event.add.to.cart': '加入购物车',
     'pisell2.event.description': '描述',
     'pisell2.event.view.more': '查看更多',
     'pisell2.event.view.less': '收起',
@@ -205,7 +205,7 @@ export default {
     'pisell2.event.campus': '校區',
     'pisell2.event.resource': '資源',
     'pisell2.event.booking.options': '預約選項',
-    'pisell2.event.add.to.cart': '添加到購物車',
+    'pisell2.event.add.to.cart': '加入購物車',
     'pisell2.event.description': '描述',
     'pisell2.event.view.more': '查看更多',
     'pisell2.event.view.less': '收起',

package/es/components/index.d.ts

@@ -15,4 +15,6 @@ import WorkspaceListDetail from './workSpaceListDetail/';
 import WorkspaceList from './workSpaceList';
 import PisellSelectCustomerModal from './pisellSelectCustomerModal';
 import SubTotal from './subTotal';
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, };
+import EditBookingModal from './booking/editBookingModal';
+import StepController from './stepController';
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController };

package/es/components/index.js

@@ -15,4 +15,6 @@ import WorkspaceListDetail from "./workSpaceListDetail/";
 import WorkspaceList from "./workSpaceList";
 import PisellSelectCustomerModal from "./pisellSelectCustomerModal";
 import SubTotal from "./subTotal";
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal };
+import EditBookingModal from "./booking/editBookingModal";
+import StepController from "./stepController";
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController };

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

@@ -70,34 +70,19 @@ var ToBPayContent = /*#__PURE__*/forwardRef(function (props, ref) {
       });
     }
   }, [network.online]);
-  var openModal = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderInfo) {
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            console.log('tob_pay_open', orderInfo);
-            // 打开支付弹窗
-            setOpen(true);
-            // 开启OS的支付方式列表和订单信息变化监听
-            osPaymentEffectOn();
-            // 推送订单信息到OS
-            _context.next = 5;
-            return osPayment === null || osPayment === void 0 ? void 0 : osPayment.pushOrderAsync({
-              order_info: orderInfo || {}
-            });
-          case 5:
-            // 获取支付方式列表
-            getPayMethodList();
-          case 6:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function openModal(_x) {
-      return _ref.apply(this, arguments);
-    };
-  }();
+  var openModal = function openModal(orderInfo) {
+    console.log('tob_pay_open', orderInfo);
+    // 打开支付弹窗
+    setOpen(true);
+    // 开启OS的支付方式列表和订单信息变化监听
+    osPaymentEffectOn();
+    // 推送订单信息到OS
+    osPayment === null || osPayment === void 0 || osPayment.pushOrderAsync({
+      order_info: orderInfo || {}
+    });
+    // 获取支付方式列表
+    getPayMethodList();
+  };
   var onCloseModal = function onCloseModal() {
     var _osPayment$submitPayA, _props$callback;
     // 如果正在提交，则不可以关闭弹窗
@@ -111,50 +96,48 @@ var ToBPayContent = /*#__PURE__*/forwardRef(function (props, ref) {
     });
   };
   var onSubmit = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var _osPayment$submitPayA2, _props$callback2, res, _props$callback3;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _osPayment$submitPayA2, _props$callback2, _props$callback3;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!submitLoading) {
-              _context2.next = 2;
+              _context.next = 2;
               break;
             }
-            return _context2.abrupt("return");
+            return _context.abrupt("return");
           case 2:
             setSubmitLoading(true);
-            _context2.prev = 3;
-            _context2.next = 6;
+            _context.prev = 3;
+            _context.next = 6;
             return osPayment === null || osPayment === void 0 || (_osPayment$submitPayA2 = osPayment.submitPayAsync) === null || _osPayment$submitPayA2 === void 0 ? void 0 : _osPayment$submitPayA2.call(osPayment, order === null || order === void 0 ? void 0 : order.uuid);
           case 6:
-            res = _context2.sent;
-            console.log('tob_pay_onSubmit_res', res);
+            console.log('tob_pay_onSubmit_res');
             (_props$callback2 = props.callback) === null || _props$callback2 === void 0 || _props$callback2.call(props, {
-              status: 'success',
-              data: res === null || res === void 0 ? void 0 : res.data
+              status: 'success'
             });
             closeModalAction();
-            _context2.next = 16;
+            _context.next = 15;
             break;
-          case 12:
-            _context2.prev = 12;
-            _context2.t0 = _context2["catch"](3);
-            console.log('tob_pay_onSubmit_error', _context2.t0);
+          case 11:
+            _context.prev = 11;
+            _context.t0 = _context["catch"](3);
+            console.log('tob_pay_onSubmit_error', _context.t0);
             (_props$callback3 = props.callback) === null || _props$callback3 === void 0 || _props$callback3.call(props, {
               status: 'error'
             });
-          case 16:
-            _context2.prev = 16;
+          case 15:
+            _context.prev = 15;
             setSubmitLoading(false);
-            return _context2.finish(16);
-          case 19:
+            return _context.finish(15);
+          case 18:
           case "end":
-            return _context2.stop();
+            return _context.stop();
         }
-      }, _callee2, null, [[3, 12, 16, 19]]);
+      }, _callee, null, [[3, 11, 15, 18]]);
     }));
     return function onSubmit() {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }();
   var closeModalAction = function closeModalAction() {