@pisell/private-materials 3.3.89 → 3.3.91

package/es/components/booking/info2/service/editService/Resources/index.js

@@ -22,22 +22,14 @@ import { getErrorList } from "../../../utilsByBooking";
 import { isArray } from 'lodash';
 import { getAutoAllocationStorage, setAutoAllocationStorage } from "../utils";
 import { useUpdate } from 'ahooks';
-import { QuestionCircleOutlined } from '@ant-design/icons';
+import { QuestionCircleOutlined } from "@ant-design/icons";
 var Resources = function Resources(_ref, ref) {
   var _cacheItem$_data2, _cacheItem$_data4;
   var state = _ref.state,
     cacheItem = _ref.cacheItem,
     getCurrentCacheItem = _ref.getCurrentCacheItem,
     onChange = _ref.onChange,
-    value = _ref.value,
-    _ref$config = _ref.config,
-    config = _ref$config === void 0 ? {
-      // 是否显示自动分配
-      autoAllocation: true,
-      // 是否显示资源错误图标
-      resourceErrorIcon: true,
-      disabled: false
-    } : _ref$config;
+    value = _ref.value;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     showError = _useState2[0],
@@ -152,7 +144,7 @@ var Resources = function Resources(_ref, ref) {
         relation_type: d.relation_type
       }), d[label]);
     });
-  }, [config === null || config === void 0 ? void 0 : config.resourceErrorIcon]);
+  }, []);
 
   /**
    * @title: 检查当前资源最小选择数量
@@ -201,7 +193,6 @@ var Resources = function Resources(_ref, ref) {
     }, /*#__PURE__*/React.createElement(Form.Item, {
       label: item.title,
       required: true,
-      labelCol: config === null || config === void 0 ? void 0 : config.labelCol,
       extra: showError && item.select_type.min > (cur === null || cur === void 0 ? void 0 : cur.length) ? /*#__PURE__*/React.createElement("span", {
         style: {
           color: '#ff4d4f'
@@ -210,17 +201,13 @@ var Resources = function Resources(_ref, ref) {
     }, /*#__PURE__*/React.createElement("div", {
       className: "resource-col"
     }, item.select_type.type === 'multiple' ? null : /*#__PURE__*/React.createElement(Button, {
-      className: "resource-col-like-wrap ".concat(config !== null && config !== void 0 && config.disabled ? 'resource-col-like-wrap-disabled' : ''),
+      className: "resource-col-like-wrap",
       onClick: function onClick() {
         var _cur$;
-        if (config !== null && config !== void 0 && config.disabled) {
-          return;
-        }
         setLikeStatus((cur === null || cur === void 0 || (_cur$ = cur[0]) === null || _cur$ === void 0 ? void 0 : _cur$.like_status) === 'like' ? 'common' : 'like', item.form_id, 'like_status');
       }
     }, /*#__PURE__*/React.createElement(Like, {
-      status: cur === null || cur === void 0 || (_cur$2 = cur[0]) === null || _cur$2 === void 0 ? void 0 : _cur$2.like_status,
-      className: "".concat(config !== null && config !== void 0 && config.disabled ? 'like-icon-disabled' : '')
+      status: cur === null || cur === void 0 || (_cur$2 = cur[0]) === null || _cur$2 === void 0 ? void 0 : _cur$2.like_status
     })), /*#__PURE__*/React.createElement(MaxLengthSelect, {
       className: "resource-col-select",
       size: "large",
@@ -241,16 +228,15 @@ var Resources = function Resources(_ref, ref) {
       showSearch: true,
       filterOption: function filterOption(str, option) {
         return ((option === null || option === void 0 ? void 0 : option.labelText) || '').toLowerCase().includes((str || '').toLowerCase());
-      },
-      disabled: config === null || config === void 0 ? void 0 : config.disabled
-    }, renderOptions(item.renderList, 'id', config !== null && config !== void 0 && config.resourceErrorIcon ? 'label' : 'labelText', 'resource')), config !== null && config !== void 0 && config.autoAllocation ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Checkbox, {
+      }
+    }, renderOptions(item.renderList, 'id', 'label', 'resource')), /*#__PURE__*/React.createElement(Checkbox, {
       checked: getIsAutoAllocation(item.form_id),
       onChange: function onChange(e) {
         handleCheckAutoAllocation(item.form_id, e.target.checked);
       }
     }), /*#__PURE__*/React.createElement(Tooltip, {
       title: locales.getText('page.booking.text.resource.check-auto-allocation-tip')
-    }, /*#__PURE__*/React.createElement(QuestionCircleOutlined, null))) : null)), state.renderType !== 'eventBooking' && (errors || []).map(function (d) {
+    }, /*#__PURE__*/React.createElement(QuestionCircleOutlined, null)))), state.renderType !== 'eventBooking' && (errors || []).map(function (d) {
       return /*#__PURE__*/React.createElement(Alert, {
         key: d.type,
         message: d.label,

package/es/components/booking/info2/service/editService/Resources/index.less

@@ -15,12 +15,6 @@
     .like-resource {}
   }
 
-  .resource-col-like-wrap-disabled,
-  .like-icon-disabled {
-    opacity: 0.5;
-    cursor: not-allowed;
-  }
-
   .resource-col-select {
     flex: 1;
   }

package/es/components/booking/info2/utilsByBooking.js

@@ -260,15 +260,6 @@ export var getErrorList = function getErrorList(resource, cacheItem) {
       }
     }
   }
-
-  // 平行资源日历拖动优化需求
-  // 拖入到未绑定的资源中
-  if (resource.unbound) {
-    list.push({
-      label: locales.getText('pisell1.text.resource-error-message-unbound'),
-      type: "time"
-    });
-  }
   return list;
 };
 

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

@@ -110,7 +110,6 @@ declare const _default: {
         'pisell1.text.resource-error-message-1': (x: string, y: string) => string;
         'pisell1.text.resource-error-message-2': (x: string, y: string, z: string) => string;
         'pisell1.text.resource-error-message-3': (x: string, y: string, z: string) => string;
-        'pisell1.text.resource-error-message-unbound': string;
         'pisell1.text.no-addons': string;
         'pisell1.text.no-resource': string;
         'pisell1.text.no-payments': string;
@@ -390,7 +389,6 @@ declare const _default: {
         'pisell1.text.resource-error-message-1': (x: string, y: string) => string;
         'pisell1.text.resource-error-message-2': (x: string, y: string, z: string) => string;
         'pisell1.text.resource-error-message-3': (x: string, y: string, z: string) => string;
-        'pisell1.text.resource-error-message-unbound': string;
         'pisell2.text.flexible': string;
         'pisell2.text.order-discount': string;
         'pisell2.text.no-product-added': string;
@@ -662,7 +660,6 @@ declare const _default: {
         'pisell1.text.resource-error-message-1': (x: string, y: string) => string;
         'pisell1.text.resource-error-message-2': (x: string, y: string, z: string) => string;
         'pisell1.text.resource-error-message-3': (x: string, y: string, z: string) => string;
-        'pisell1.text.resource-error-message-unbound': string;
         'pisell2.text.flexible': string;
         'pisell2.text.order-discount': string;
         'pisell2.text.no-product-added': string;

package/es/components/booking/locales.js

@@ -128,7 +128,6 @@ 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',
@@ -455,7 +454,6 @@ 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': '未添加商品',
@@ -774,7 +772,6 @@ 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/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: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -5,8 +5,7 @@ export declare enum EftposEnum {
     Tyro = "tyro",
     /** 后端支付 - 支付 + 退款  */
     Windcave = "windcave",
-    Stripe = "stripe",
-    Linkly = "linkly"
+    Stripe = "stripe"
 }
 export declare enum StatusEnum {
     Loading = "loading",
@@ -148,8 +147,6 @@ export declare enum PayStatus {
     'Success' = "200",
     /** 未生成交易记录 */
     'NoPay' = "4004",
-    /** 配对失效 */
-    'PairingFailure' = "606020",
     /** 支付失败 */
     'Unknown' = "701000",
     /** 交易请求超时 */

package/es/components/eftposPay/const.js

@@ -3,9 +3,8 @@ export var EftposEnum = /*#__PURE__*/function (EftposEnum) {
   EftposEnum["Tyro"] = "tyro";
   EftposEnum["Windcave"] = "windcave";
   EftposEnum["Stripe"] = "stripe";
-  EftposEnum["Linkly"] = "linkly";
   return EftposEnum;
-}({});
+}({}); // Eftpos = 'eftpos',
 export var StatusEnum = /*#__PURE__*/function (StatusEnum) {
   StatusEnum["Loading"] = "loading";
   StatusEnum["Warn"] = "warn";
@@ -65,7 +64,6 @@ export var PayRouteEnum = /*#__PURE__*/function (PayRouteEnum) {
 export var PayStatus = /*#__PURE__*/function (PayStatus) {
   PayStatus["Success"] = "200";
   PayStatus["NoPay"] = "4004";
-  PayStatus["PairingFailure"] = "606020";
   PayStatus["Unknown"] = "701000";
   PayStatus["Timeout"] = "701001";
   PayStatus["PayOtherEftposFailed"] = "701003";

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: "page" | "success" | "print" | "fail" | "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<"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>;
-    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "stripe" | "payo" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/hooks.js

@@ -139,7 +139,6 @@ export var useFail = function useFail(index) {
       return;
     }
     var code = "".concat(res.code);
-    console.log('code---->>>>>>>', code);
     if (code === PayStatus.Unknown) {
       // 前往报错页 不可标记
       steps[index].title = locales.getText('page.eftpos-pay.text.failed')(modeRef.current);
@@ -225,7 +224,6 @@ export var useFail = function useFail(index) {
         dispatch(updateComponent('Fail'));
         return;
       }
-
       // 重新支付 最多到重新发起2次
       ref.current += 1;
       dispatch(updateState({
@@ -302,7 +300,7 @@ export var useFail = function useFail(index) {
       }));
       return;
     }
-    if (code === PayStatus.UserConfigError || code === PayStatus.PairingFailure) {
+    if (code === PayStatus.UserConfigError) {
       // 前往错误页  不可标记状态
       steps[index].title = locales.getText('page.eftpos-pay.text.transaction.user.config.title');
       steps[index].fail = locales.getText('page.eftpos-pay.text.transaction.user.config.text');

package/es/components/eftposPay/index.js

@@ -163,7 +163,7 @@ export default (function (props) {
   }, [mode, state]);
   useEffect(function () {
     document.body.id = 'body';
-    console.log('初始化 ........112218017777');
+    console.log('初始化 ........11221801');
   }, []);
 
   // console.log('action = ', action);

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

@@ -3,5 +3,4 @@ export { getAmonunt } from './helper';
 export { default as Payo } from './payo';
 export { default as Windcave } from './windcave/windcave';
 export { default as Tyro } from './tyro';
-export { default as Linkly } from './linkly';
 export declare const getInitState: (type: string, params?: any) => State;

package/es/components/eftposPay/manufacturer.js

@@ -2,12 +2,10 @@ import { EftposEnum } from "./const";
 import getPayoInitState from "./payo/const";
 import getTyroInitState from "./tyro/const";
 import getWindcaveInitState from "./windcave/const";
-import getLinklyInitState from "./linkly/const";
 export { getAmonunt } from "./helper";
 export { default as Payo } from "./payo";
 export { default as Windcave } from "./windcave/windcave";
 export { default as Tyro } from "./tyro";
-export { default as Linkly } from "./linkly";
 export var getInitState = function getInitState(type, params) {
   switch (type) {
     case EftposEnum.Payo:
@@ -16,8 +14,6 @@ export var getInitState = function getInitState(type, params) {
       return getWindcaveInitState(params);
     case EftposEnum.Tyro:
       return getTyroInitState(params);
-    case EftposEnum.Linkly:
-      return getLinklyInitState(params);
     default:
       throw new Error('未知的厂商类型');
   }

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

@@ -6,7 +6,7 @@ import './index.less';
  * @Author: hongbing.wang
  * @Date: 2024-08-20 14:59
  */
-declare const Pay: ({ api, onChange: onChangeStatus, className, terminal, net, isMobile, tyroUrl, tyroVersion, formatAmount, client, }: PayProps & {
+declare const Pay: ({ api, onChange: onChangeStatus, className, terminal, net, isMobile, tyroUrl, tyroVersion, formatAmount, client }: PayProps & {
     terminal: {
         network: boolean;
     };

package/es/components/eftposPay/pay.js

@@ -10,7 +10,7 @@ import { getPayParams } from "./helper";
 import Manual from "./component/manual";
 import Signature from "./component/signature";
 import { StatusEnum, PayRouteEnum, ClientEnum } from "./const";
-import { Payo, Windcave, Tyro, Linkly } from "./manufacturer";
+import { Payo, Windcave, Tyro } from "./manufacturer";
 import { useContextData, useDispatch, updateStatus, backUpProduction, updateComponent, backUpFree, updateState } from "./store";
 import "./index.less";
 
@@ -150,7 +150,7 @@ var Pay = function Pay(_ref) {
       }
     };
   }, []);
-  console.log('data =>>>>>> ', data);
+  // console.log("pay2222 = ",'pay 222' , data.render,data.type)
   return /*#__PURE__*/React.createElement(React.Fragment, null, data.render ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-box ".concat(className),
     style: data.type === 'step' ? {} : {
@@ -178,10 +178,6 @@ var Pay = function Pay(_ref) {
     onChange: onChange,
     key: data.key,
     formatAmount: formatAmount
-  }) : null, data.eftpos === 'linkly' ? /*#__PURE__*/React.createElement(Linkly, {
-    key: data.key,
-    api: api,
-    onChange: onChange
   }) : null) : null, data.type === PayRouteEnum.Unset && Comm ? /*#__PURE__*/React.createElement(Comm, {
     onChange: onChange,
     api: api,

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: "loading" | "warn" | "success" | "fail" | "question";
     };
 };
 /**
@@ -297,18 +297,18 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "tyro" | "windcave" | "stripe" | "payo" | "linkly" | undefined;
+        eftpos?: "stripe" | "tyro" | "windcave" | "payo" | undefined;
         action?: "amount" | "pay" | "deviceList" | 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?: "loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/es/components/eventBooking/components/Provider/Cart/ContinueButton/index.js

@@ -16,7 +16,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useState } from 'react';
 import { locales } from '@pisell/utils';
 import { Button, PisellToast } from '@pisell/materials';
-import { useCart, useHolder, useStep, useCheckout, useSales, useCustomer, useSummary } from "../../../../../Sales";
+import { useCart, useHolder, useStep, useCheckout, useSales, useCustomer } from "../../../../../Sales";
 import { formatValues, getFormParams } from "../../../../../Sales/Checkout/utils";
 import OrderProductModal from "../../OrderProductModal/index";
 import EmptyHolderModal from "../../EmptyHolderModal";
@@ -24,7 +24,6 @@ import { getProductPrice } from "../../../../../Sales/Event/serve";
 import { useRequest } from 'ahooks';
 import useEngineContext from "../../../../../../hooks/useEngineContext";
 import "./index.less";
-import { Toast } from "../../../../../appointmentBooking/utils";
 var ContinueButton = function ContinueButton() {
   var _context$appHelper, _cartData$cartItems;
   var _useSales = useSales(),
@@ -44,14 +43,10 @@ var ContinueButton = function ContinueButton() {
     onCheckout = _useCheckout.onCheckout,
     createBooking = _useCheckout.createBooking,
     onCheckBeforeBooking = _useCheckout.onCheckBeforeBooking,
-    checkBeforeBooking = _useCheckout.checkBeforeBooking,
-    freePay = _useCheckout.freePay;
+    checkBeforeBooking = _useCheckout.checkBeforeBooking;
   var _useCustomer = useCustomer(),
     openLoginModal = _useCustomer.openLoginModal,
     isLogin = _useCustomer.isLogin;
-  var _useSummary = useSummary(),
-    deposit = _useSummary.deposit,
-    isAgreeDepositPolicy = _useSummary.isAgreeDepositPolicy;
 
   // 下单之前是否检测失败
   var _useState = useState(false),
@@ -389,48 +384,41 @@ var ContinueButton = function ContinueButton() {
    */
   var handleContinue = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-      var _deposit$protocols, value, checkRes, emptyHolders;
+      var value, checkRes, emptyHolders;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
             if (!isLastStep) {
-              _context6.next = 17;
-              break;
-            }
-            value = formatValues(data); // 如果未同意定金政策，则提示
-            if (!(deposit !== null && deposit !== void 0 && deposit.hasDeposit && (deposit === null || deposit === void 0 || (_deposit$protocols = deposit.protocols) === null || _deposit$protocols === void 0 ? void 0 : _deposit$protocols.length) > 0 && !isAgreeDepositPolicy)) {
-              _context6.next = 5;
+              _context6.next = 14;
               break;
             }
-            Toast(locales.getText('pisell2.appointment.deposit.agree.policy'));
-            return _context6.abrupt("return");
-          case 5:
-            _context6.next = 7;
+            value = formatValues(data); // 检测商品是否可以下单
+            _context6.next = 4;
             return onCheckBeforeBooking(value);
-          case 7:
+          case 4:
             checkRes = _context6.sent;
             if (!((checkRes === null || checkRes === void 0 ? void 0 : checkRes.result) === false)) {
-              _context6.next = 12;
+              _context6.next = 9;
               break;
             }
             setCheckedNumber(checkRes === null || checkRes === void 0 ? void 0 : checkRes.num);
             setOpenCheckout(true);
             return _context6.abrupt("return");
-          case 12:
+          case 9:
             // 验证holder是否为空
             emptyHolders = getWithoutCartItemsHolderNames();
             if (!((emptyHolders === null || emptyHolders === void 0 ? void 0 : emptyHolders.length) > 0)) {
-              _context6.next = 15;
+              _context6.next = 12;
               break;
             }
             return _context6.abrupt("return", setOpenEmptyHolder(true));
-          case 15:
+          case 12:
             // 关闭购物车弹窗
             onCloseCart();
             return _context6.abrupt("return", handleCheckout());
-          case 17:
+          case 14:
             if (isLogin()) {
-              _context6.next = 20;
+              _context6.next = 17;
               break;
             }
             onCloseCart();
@@ -460,9 +448,9 @@ var ContinueButton = function ContinueButton() {
                 return callback;
               }()
             }));
-          case 20:
+          case 17:
             handleHolder();
-          case 21:
+          case 18:
           case "end":
             return _context6.stop();
         }
@@ -499,8 +487,8 @@ var ContinueButton = function ContinueButton() {
    */
   var confirmLoading = useMemo(function () {
     if (!isLastStep) return false;
-    return (createBooking === null || createBooking === void 0 ? void 0 : createBooking.loading) || (checkBeforeBooking === null || checkBeforeBooking === void 0 ? void 0 : checkBeforeBooking.loading) || (freePay === null || freePay === void 0 ? void 0 : freePay.loading);
-  }, [isLastStep, createBooking === null || createBooking === void 0 ? void 0 : createBooking.loading, checkBeforeBooking === null || checkBeforeBooking === void 0 ? void 0 : checkBeforeBooking.loading, freePay === null || freePay === void 0 ? void 0 : freePay.loading]);
+    return (createBooking === null || createBooking === void 0 ? void 0 : createBooking.loading) || (checkBeforeBooking === null || checkBeforeBooking === void 0 ? void 0 : checkBeforeBooking.loading);
+  }, [isLastStep, createBooking === null || createBooking === void 0 ? void 0 : createBooking.loading, checkBeforeBooking === null || checkBeforeBooking === void 0 ? void 0 : checkBeforeBooking.loading]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
     disabled: !(cartData !== null && cartData !== void 0 && (_cartData$cartItems = cartData.cartItems) !== null && _cartData$cartItems !== void 0 && _cartData$cartItems.length),
     size: "large",

package/es/components/eventBooking/components/Provider/Cart/Item/Total.js

@@ -5,25 +5,21 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import React from 'react';
 import { locales } from '@pisell/utils';
 import { PisellText } from '@pisell/materials';
-import { useCart, useSummary } from "../../../../../Sales";
+import { useSummary } from "../../../../../Sales";
 import useEngineContext from "../../../../../../hooks/useEngineContext";
 import "./index.less";
 import classNames from 'classnames';
 var Total = function Total(_ref) {
-  var _context$appHelper, _context$appHelper$ge, _cartData$cartItems, _cartData$cartItems2, _context$appHelper2, _context$appHelper2$g;
+  var _context$appHelper, _context$appHelper$ge, _context$appHelper2, _context$appHelper2$g;
   var className = _ref.className,
     isFooter = _ref.isFooter;
-  var _useCart = useCart(),
-    cartData = _useCart.cartData;
   var _useSummary = useSummary(),
     taxTitle = _useSummary.taxTitle,
     totalTaxFee = _useSummary.totalTaxFee,
     isPriceIncludeTax = _useSummary.isPriceIncludeTax,
-    total = _useSummary.total,
-    deposit = _useSummary.deposit;
+    total = _useSummary.total;
   var context = useEngineContext();
-  console.log(taxTitle, isPriceIncludeTax, totalTaxFee, total, context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getSymbolic) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper), deposit, 'wh97978');
-  var showDeposit = (cartData === null || cartData === void 0 || (_cartData$cartItems = cartData.cartItems) === null || _cartData$cartItems === void 0 ? void 0 : _cartData$cartItems.length) > 0 && (deposit === null || deposit === void 0 ? void 0 : deposit.hasDeposit);
+  console.log(taxTitle, isPriceIncludeTax, totalTaxFee, total, context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getSymbolic) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper), 'wh97978');
   return /*#__PURE__*/React.createElement("div", {
     className: "event-total-wrap ".concat(className)
   }, !isPriceIncludeTax && Number(totalTaxFee) > 0 ? /*#__PURE__*/React.createElement("div", {
@@ -35,8 +31,8 @@ var Total = function Total(_ref) {
     className: classNames('event-total', _defineProperty({}, ['total-gst-wrap'], !isPriceIncludeTax && Number(totalTaxFee) > 0))
   }, /*#__PURE__*/React.createElement("div", {
     className: "left"
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, isFooter && showDeposit ? locales.getText('pisell2.appointment.deposit') : locales.getText('pisell2.event.total'), isFooter ? ': ' : ''), isFooter ? /*#__PURE__*/React.createElement(PisellText.Amount, {
-    value: (cartData === null || cartData === void 0 || (_cartData$cartItems2 = cartData.cartItems) === null || _cartData$cartItems2 === void 0 ? void 0 : _cartData$cartItems2.length) > 0 && deposit !== null && deposit !== void 0 && deposit.hasDeposit ? deposit === null || deposit === void 0 ? void 0 : deposit.total : total,
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.event.total'), isFooter ? ': ' : ''), isFooter ? /*#__PURE__*/React.createElement(PisellText.Amount, {
+    value: total,
     showCurrencySymbol: true,
     className: "event-amount"
   }) : null), isPriceIncludeTax && Number(totalTaxFee) > 0 ? /*#__PURE__*/React.createElement("span", {

package/es/components/eventBooking/components/Provider/Cart/Item/index.js

@@ -5,10 +5,8 @@ import { useCart, useHolder, useSummary, useStep } from "../../../../../Sales";
 import SelectHolderModal from "../../SelectHolderModal";
 import ContinueButton from "../ContinueButton";
 import Total from "./Total";
-import Deposit from "../Deposit";
 import "./index.less";
 var CartItem = function CartItem() {
-  var _cartData$cartItems;
   var _useHolder = useHolder(),
     open = _useHolder.open,
     holderData = _useHolder.holderData,
@@ -19,7 +17,7 @@ var CartItem = function CartItem() {
     cartData = _useCart.cartData,
     addNoteToCartItem = _useCart.addNoteToCartItem;
   var _useSummary = useSummary(),
-    deposit = _useSummary.deposit;
+    subtotal = _useSummary.subtotal;
   var _useStep = useStep(),
     isLastStep = _useStep.isLastStep;
   var handleClickCard = function handleClickCard(e, type, key) {
@@ -58,7 +56,7 @@ var CartItem = function CartItem() {
     }
   })), /*#__PURE__*/React.createElement("div", {
     className: "event-footer"
-  }, /*#__PURE__*/React.createElement(Total, null), (cartData === null || cartData === void 0 || (_cartData$cartItems = cartData.cartItems) === null || _cartData$cartItems === void 0 ? void 0 : _cartData$cartItems.length) > 0 && deposit !== null && deposit !== void 0 && deposit.hasDeposit ? /*#__PURE__*/React.createElement(Deposit, null) : null, /*#__PURE__*/React.createElement(ContinueButton, null))), /*#__PURE__*/React.createElement(SelectHolderModal, {
+  }, /*#__PURE__*/React.createElement(Total, null), /*#__PURE__*/React.createElement(ContinueButton, null))), /*#__PURE__*/React.createElement(SelectHolderModal, {
     open: open
   }));
 };

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, useCustomer } from "../../../../Sales";
+import { useEvent, useSales, useEventDetail, useStep } from "../../../../Sales";
 import BookingServiceList from "../../bookingServiceList";
 import BookingDetailModal from "../../bookingDetailModal";
 import "./index.less";
@@ -31,8 +31,6 @@ 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) || [];
@@ -47,23 +45,16 @@ var Event = function Event() {
     }
   }, [eventData === null || eventData === void 0 ? void 0 : eventData.eventList]);
   useEffect(function () {
-    var _data$resourceData, _appUtils$getHistory, _history$location;
+    var _data$resourceData;
     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;
-    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 = {
+    getEventList.run({
       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]);
 
   /**