@pisell/private-materials 3.0.154 → 3.0.156

package/es/components/booking/info/service/addService/index.js

@@ -34,7 +34,7 @@ import { locales, getUniqueId } from '@pisell/utils';
 import { useMemoizedFn, useUpdateEffect } from 'ahooks';
 var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303, 6080, 6978, 7386, 6848, 6305];
 var Info = function Info(_ref) {
-  var _state$service3, _state$service5, _state$service7, _state$service7$cache;
+  var _state$service3, _state$service6, _state$service8, _state$service8$cache;
   var onEdit = _ref.onEdit;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
@@ -292,22 +292,23 @@ var Info = function Info(_ref) {
   }, [search, (_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : _state$service3.services]);
   console.log('state.service.renderList', renderList);
   var isService = useMemo(function () {
-    return state.service.value.length > 0;
+    var _state$service4, _state$service4$value;
+    return ((_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : (_state$service4$value = _state$service4.value) === null || _state$service4$value === void 0 ? void 0 : _state$service4$value.length) > 0;
   }, [state.service.value]);
   useEffect(function () {
-    var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper$ut5, _state$service4, _state$service4$value;
+    var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper$ut5, _state$service5, _state$service5$value;
     // Salonip 不要这个
     if (shopList.includes((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 ? void 0 : (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 ? void 0 : (_context$appHelper$ut3 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut3 === void 0 ? void 0 : (_context$appHelper$ut4 = _context$appHelper$ut3.global) === null || _context$appHelper$ut4 === void 0 ? void 0 : (_context$appHelper$ut5 = _context$appHelper$ut4.globalConfig) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.id) || state.closeAutoOpenService) {
       return;
     }
 
     // 如果弹窗打开,并且是创建, 则自动打开选择服务的弹窗
-    if (state.modalOpen && !state.bookingId && state.renderType !== 'eventBooking' && ((_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : (_state$service4$value = _state$service4.value) === null || _state$service4$value === void 0 ? void 0 : _state$service4$value.length) === 0) {
+    if (state.modalOpen && !state.bookingId && state.renderType !== 'eventBooking' && ((_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : (_state$service5$value = _state$service5.value) === null || _state$service5$value === void 0 ? void 0 : _state$service5$value.length) === 0) {
       setTimeout(function () {
         handleSelectService();
       }, 10);
     }
-  }, [state.modalOpen, state.bookingId, (_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : _state$service5.value]);
+  }, [state.modalOpen, state.bookingId, (_state$service6 = state.service) === null || _state$service6 === void 0 ? void 0 : _state$service6.value]);
   var showAddButton = useMemo(function () {
     return !state.disabledEdit && !state.channelDisabledEdit;
   }, [state.disabledEdit, state.channelDisabledEdit]);
@@ -348,12 +349,13 @@ var Info = function Info(_ref) {
     });
   }, [state.renderType, showAddButton, isService, state.service.value, loading]);
   return useMemo(function () {
-    var _state$service6, _state$service6$cache;
-    return /*#__PURE__*/React.createElement(React.Fragment, null, ((_state$service6 = state.service) === null || _state$service6 === void 0 ? void 0 : (_state$service6$cache = _state$service6.cacheItem) === null || _state$service6$cache === void 0 ? void 0 : _state$service6$cache.autoClose) && /*#__PURE__*/React.createElement(Skeleton, {
+    var _state$service7, _state$service7$cache;
+    return /*#__PURE__*/React.createElement(React.Fragment, null, ((_state$service7 = state.service) === null || _state$service7 === void 0 ? void 0 : (_state$service7$cache = _state$service7.cacheItem) === null || _state$service7$cache === void 0 ? void 0 : _state$service7$cache.autoClose) && /*#__PURE__*/React.createElement(Skeleton, {
       loading: true,
       active: true,
       round: true
     }), addButton, /*#__PURE__*/React.createElement(Drawer, {
+      titleNoWrap: true,
       open: state.service.addModal,
       title: locales.getText('pisell2.text.select-service'),
       rootClassName: "booking-server-wrap",
@@ -390,6 +392,6 @@ var Info = function Info(_ref) {
       onChange: handleSelectProduct,
       scrollDom: ".booking-server-wrap .pisell-lowcode-drawer-body"
     }))));
-  }, [(_state$service7 = state.service) === null || _state$service7 === void 0 ? void 0 : (_state$service7$cache = _state$service7.cacheItem) === null || _state$service7$cache === void 0 ? void 0 : _state$service7$cache.autoClose, addButton, state.service.addModal, locales, search, renderList, state.amountSymbol]);
+  }, [(_state$service8 = state.service) === null || _state$service8 === void 0 ? void 0 : (_state$service8$cache = _state$service8.cacheItem) === null || _state$service8$cache === void 0 ? void 0 : _state$service8$cache.autoClose, addButton, state.service.addModal, locales, search, renderList, state.amountSymbol]);
 };
 export default Info;

package/es/components/booking/info/service/addTimeModal/index.js

@@ -584,6 +584,7 @@ var AddTimeModal = function AddTimeModal() {
   return useMemo(function () {
     var _currentTimeItem$stat, _currentProduct$add_t;
     return /*#__PURE__*/React.createElement(Drawer, {
+      titleNoWrap: true,
       open: state.service.addTimeModal,
       title: locales.getText('page.booking.text.add-time'),
       rootClassName: "booking-server-wrap",

package/es/components/booking/info/service/addTimeModal/index.less

@@ -20,7 +20,7 @@
     margin: 10px 0;
     flex: 0 0 100%;
     position: sticky;
-    top: 95px;
+    top: 58px !important;
     z-index: 1;
   }
 

package/es/components/booking/info/service/editService/index.js

@@ -36,7 +36,7 @@ import { getNoResource } from "../../../mock";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj } from "../addService/utils";
 var submitLock = false;
 var Info = function Info(_, ref) {
-  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service$cacheI4, _state$service$cacheI5, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9, _state$service3, _state$service3$cache, _state$service5, _state$service5$cache, _state$service5$cache2, _state$service5$cache3, _window$BaseMaterials, _state$service$cacheI15, _state$service7, _state$service7$cache, _state$service7$cache2, _state$service$cacheI16, _state$service$cacheI17, _state$bookingConfig9, _state$bookingConfig10, _state$bookingConfig11, _state$bookingConfig12;
+  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service$cacheI4, _state$service$cacheI5, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9, _state$service3, _state$service3$cache, _state$service5, _state$service5$cache, _state$service5$cache2, _state$service5$cache3, _state$date, _state$date$value, _state$date$value$for, _window$BaseMaterials, _state$service$cacheI15, _state$service7, _state$service7$cache, _state$service7$cache2, _state$service$cacheI16, _state$service$cacheI17, _state$bookingConfig9, _state$bookingConfig10, _state$bookingConfig11, _state$bookingConfig12;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -563,7 +563,7 @@ var Info = function Info(_, ref) {
     setTimeout(function () {
       getResourcesData();
     }, 20);
-  }, [state.date.value]);
+  }, [(_state$date = state.date) === null || _state$date === void 0 ? void 0 : (_state$date$value = _state$date.value) === null || _state$date$value === void 0 ? void 0 : (_state$date$value$for = _state$date$value.format) === null || _state$date$value$for === void 0 ? void 0 : _state$date$value$for.call(_state$date$value, 'YYYY-MM-DD')]);
 
   /**
    * @title: 编辑商品
@@ -665,6 +665,7 @@ var Info = function Info(_, ref) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Drawer
     //通过zIndex的方式控制  添加商品 和 编辑服务弹窗的上下层级
     , {
+      titleNoWrap: true,
       zIndex: state.service.changeService ? 999 : 1000,
       forceRender: true,
       open: state.service.editModal && !((_state$service$cacheI10 = state.service.cacheItem) !== null && _state$service$cacheI10 !== void 0 && _state$service$cacheI10.autoClose),

package/es/components/booking/info/service/serviceList/index.js

@@ -18,6 +18,7 @@ import { getNoResource } from "../../../mock";
 import { getErrorList } from "../../../utils";
 import ServiceItem from "../serviceItem";
 var ServiceList = function ServiceList(_ref) {
+  var _state$service, _state$service$value;
   var onEdit = _ref.onEdit;
   var _useContext = useContext(Context),
     state = _useContext.state,
@@ -90,7 +91,7 @@ var ServiceList = function ServiceList(_ref) {
   };
   return /*#__PURE__*/React.createElement("div", {
     className: ""
-  }, state.service.value.map(function (d) {
+  }, (_state$service = state.service) === null || _state$service === void 0 ? void 0 : (_state$service$value = _state$service.value) === null || _state$service$value === void 0 ? void 0 : _state$service$value.map(function (d) {
     var _d$_extend;
     var resourceItem = getResourceItem((_d$_extend = d._extend) === null || _d$_extend === void 0 ? void 0 : _d$_extend.resource);
     var errorMessage = getErrorMessage(d, resourceItem);

package/es/components/booking/info/utils.js

@@ -88,6 +88,6 @@ export var isBooking4Shop = function isBooking4Shop(shopId, renderType) {
   if (renderType === 'eventBooking') {
     return false;
   }
-  var booking4Shops = [1350, 1401, 3013, 7154, 7572];
+  var booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007];
   return booking4Shops.includes(shopId);
 };

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

@@ -27,6 +27,7 @@ import { updateServiceDate } from "../info/date";
 import useEngineContext from "../../../hooks/useEngineContext";
 import Notes from "../info/notes";
 import "../info/index.less";
+import { Skeleton } from "antd";
 var defaultModules = {
   client: 1,
   date: 1,
@@ -211,6 +212,14 @@ var Info = Provider(function (props) {
     height: context !== null && context !== void 0 && (_context$appHelper4 = context.appHelper) !== null && _context$appHelper4 !== void 0 && (_context$appHelper4$u = _context$appHelper4.utils) !== null && _context$appHelper4$u !== void 0 && _context$appHelper4$u.isMobile ? '100%' : '100vh'
   }), _defineProperty(_React$createElement, "bodyClassName", "booking-info-warp"), _React$createElement), /*#__PURE__*/React.createElement("div", {
     className: "booking-info"
-  }, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, modules.holder && !((_modal$state7 = modal.state) !== null && _modal$state7 !== void 0 && _modal$state7.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, modules.service ? /*#__PURE__*/React.createElement(React.Fragment, null, modal.state.date.value ? /*#__PURE__*/React.createElement(Service, null) : null) : null, notes, slot ? slot : null)) : null);
+  }, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, modules.holder && !((_modal$state7 = modal.state) !== null && _modal$state7 !== void 0 && _modal$state7.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
+    loading: globalState.loading,
+    round: true,
+    active: true,
+    avatar: false,
+    style: {
+      paddingTop: 20
+    }
+  }, modules.service ? /*#__PURE__*/React.createElement(React.Fragment, null, modal.state.date.value ? /*#__PURE__*/React.createElement(Service, null) : null) : null, notes, slot ? slot : null))) : null);
 });
 export default Info;

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

@@ -135,7 +135,7 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
     }
   }
 
-  // 是否可用
+  // 是否可用  只判断是否在日期范围内, 
   var isUsable = isDateRange && isCountRange;
 
   // 储存到拓展数据内
@@ -187,7 +187,7 @@ export var formatTimes = function formatTimes(resourceItem, cacheItem) {
     _resourceItem.times = _resourceItem.times.map(function (time) {
       var _time = getResourceTimeIsUsable(time, cacheItem, _resourceItem);
       // 取出可用的列表
-      if (_time !== null && _time !== void 0 && _time._extend.isUsable) {
+      if (_time !== null && _time !== void 0 && _time._extend.isDateRange) {
         usableTimes.push(_time);
       }
       return _time;
@@ -229,7 +229,6 @@ export var getErrorList = function getErrorList(resource, cacheItem) {
       endText = locales.getText('pisell1.text.tomorrow') + endText;
     }
     var isSingle = (cacheItem === null || cacheItem === void 0 ? void 0 : (_cacheItem$_data = cacheItem._data) === null || _cacheItem$_data === void 0 ? void 0 : (_cacheItem$_data$reso = _cacheItem$_data.resourceMaps) === null || _cacheItem$_data$reso === void 0 ? void 0 : (_cacheItem$_data$reso2 = _cacheItem$_data$reso[resource === null || resource === void 0 ? void 0 : resource.form_id]) === null || _cacheItem$_data$reso2 === void 0 ? void 0 : _cacheItem$_data$reso2.type) === "single";
-    console.log('resourceresource', resource, cacheItem);
     if (!((_resource$_extend = resource._extend) !== null && _resource$_extend !== void 0 && _resource$_extend.usableTime)) {
       if (isSingle) {
         list.push({

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

@@ -3,6 +3,7 @@ export interface FormState {
     amountSymbol: string;
     apis: {
         getClients: (par?: any) => any;
+        getClientsEs: (par?: any) => any;
         getServices: (par?: any) => any;
         getResources: (par?: any) => any;
         getProducts: (par?: any) => any;
@@ -92,6 +93,7 @@ export interface FormState {
     disableEventBookingEdit?: boolean;
     /** 关闭自动打开选择服务弹窗 */
     closeAutoOpenService?: boolean;
+    loading: boolean;
 }
 export declare const walkInData: {
     id: number;

package/es/components/booking/notes/index.d.ts

@@ -4,5 +4,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Notes: any;
+declare const Notes: (props: any) => any;
 export default Notes;

package/es/components/booking/notes/model.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/es/components/booking/payments/model.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/es/components/schedules/index.d.ts

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: (props: any) => JSX.Element;
+declare const Schedules: (props: any) => any;
 export default Schedules;

package/es/components/schedules/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -68,7 +69,7 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/booking/addons/index.js

@@ -129,6 +129,7 @@ var Addons = (0, import_model.Provider)((props) => {
   const context = (0, import_useEngineContext.default)();
   const [modal, contextHolder] = import_antd.Modal.useModal();
   const { isTerminal, interaction } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
+  import_utils2.request.setRequest(context.appHelper.utils.request);
   (0, import_react.useEffect)(() => {
     dispatch({
       type: "setState",
@@ -148,11 +149,6 @@ var Addons = (0, import_model.Provider)((props) => {
   const init = () => {
     getAddonsByOrderId();
   };
-  (0, import_react.useEffect)(() => {
-    if (state.bookingDetail) {
-      init();
-    }
-  }, [state.bookingDetail]);
   (0, import_react.useEffect)(() => {
     var _a2;
     if (isTerminal == null ? void 0 : isTerminal()) {
@@ -439,6 +435,7 @@ var Addons = (0, import_model.Provider)((props) => {
     ), /* @__PURE__ */ import_react.default.createElement(
       import_drawer.default,
       {
+        titleNoWrap: true,
         open: state.addons.showModal,
         title: import_utils3.locales.getText("pisell2.text.addons"),
         onClose: () => {

package/lib/components/booking/addons/model.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/booking/components/TabProduct/index.js

@@ -95,7 +95,7 @@ var TabProduct = (props) => {
       {
         className: "booking-tabs-wrap",
         style: {
-          top: "100px"
+          top: "67px"
         }
       },
       /* @__PURE__ */ import_react.default.createElement(import_card.default, { className: "booking-tabs", id: "product-category" }, /* @__PURE__ */ import_react.default.createElement(

package/lib/components/booking/components/customSelect/index.js

@@ -262,6 +262,7 @@ var CustomSelect = (props, ref) => {
       onClose: () => {
         closeDrawer(true);
       },
+      titleNoWrap: true,
       header: /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(
         import_antd.Input,
         {
@@ -308,7 +309,7 @@ var CustomSelect = (props, ref) => {
       {
         itemLayout: "horizontal",
         dataSource: renderList,
-        loading,
+        loading: { spinning: !!loading, delay: 500 },
         loadMore,
         renderItem: (item) => /* @__PURE__ */ import_react.default.createElement(
           import_antd.List.Item,

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

@@ -1,6 +1,6 @@
-import React from "react";
-import { DrawerProps } from "antd";
-import "./index.less";
+import React from 'react';
+import { DrawerProps } from 'antd';
+import './index.less';
 export interface PisellDrawerProps extends DrawerProps {
     header?: React.ReactNode;
     titleNoWrap?: boolean;

package/lib/components/booking/components/drawer/index.js

@@ -54,23 +54,25 @@ var Drawer = (props) => {
       push: false,
       mask: false
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("pisell-lowcode__booking-drawer-title-wrap") }, showGoBack && /* @__PURE__ */ import_react.default.createElement(
-      import_ArrowLeft.default,
+    /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("pisell-lowcode__booking-drawer-title-wrap") }, /* @__PURE__ */ import_react.default.createElement(
+      "div",
       {
-        className: "pisell-lowcode__booking-drawer-back",
+        className: "pisell-lowcode__booking-drawer-title-line",
         onClick: (e) => {
           var _a;
           (_a = props.onClose) == null ? void 0 : _a.call(props, e);
         }
-      }
-    ), /* @__PURE__ */ import_react.default.createElement(
-      "div",
-      {
-        className: (0, import_classnames.default)("pisell-lowcode__booking-drawer-title", {
-          "pisell-lowcode__booking-drawer-title-no-wrap": props.titleNoWrap
-        })
       },
-      props.title
+      showGoBack && /* @__PURE__ */ import_react.default.createElement(import_ArrowLeft.default, { className: "pisell-lowcode__booking-drawer-back" }),
+      /* @__PURE__ */ import_react.default.createElement(
+        "div",
+        {
+          className: (0, import_classnames.default)("pisell-lowcode__booking-drawer-title", {
+            "pisell-lowcode__booking-drawer-title-no-wrap": props.titleNoWrap
+          })
+        },
+        props.title
+      )
     ), props.header),
     /* @__PURE__ */ import_react.default.createElement("div", null, props.children)
   );

package/lib/components/booking/components/drawer/index.less

@@ -1,5 +1,4 @@
 .pisell-lowcode__booking-drawer-title-wrap {
-  cursor: pointer;
   position: sticky;
   top: 0;
   left: 0;
@@ -9,18 +8,21 @@
   padding: 24px 32px 0 32px;
 
 
+  .pisell-lowcode__booking-drawer-title-line {
+    cursor: pointer;
+  }
 
   .pisell-lowcode__booking-drawer-back {
-    font-size: 32px;
+    font-size: 18px !important;
     color: #000000;
+    margin-right: 6px;
+    cursor: pointer;
   }
 
   .pisell-lowcode__booking-drawer-title {
     color: var(--base-black, #000);
-
-    /* Display sm/Medium */
-
-    font-size: 30px;
+    cursor: pointer;
+    font-size: 18px !important;
     font-style: normal;
     font-weight: 500;
     line-height: 38px;

package/lib/components/booking/components/footer/index.js

@@ -49,14 +49,23 @@ var import_serve = require("./serve");
 var import_serve2 = require("../../info2/serve");
 var import_utils3 = require("../../info/utils");
 var Footer = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const { state, buttons, dispatch, source } = props;
   const [showDetail, setShowDetail] = (0, import_react.useState)(false);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [checkoutLoading, setCheckoutLoading] = (0, import_react.useState)(false);
+  const [isShowPaymentLink, setIsShowPaymentLink] = (0, import_react.useState)(false);
   const context = (0, import_useEngineContext.default)();
   const { isTerminal, interaction, store, storage } = (_a = context.appHelper) == null ? void 0 : _a.utils;
-  const isShowPaymentLink = (_d = (_c = (_b = store == null ? void 0 : store.getState) == null ? void 0 : _b.call(store)) == null ? void 0 : _c.global) == null ? void 0 : _d.paymentLinkBtnShow;
+  (0, import_react.useEffect)(() => {
+    store == null ? void 0 : store.dispatch({
+      type: "global/_getMetadataMap",
+      callback: (data) => {
+        console.log(data, "data");
+        setIsShowPaymentLink(!!data["payment_collection_link_config_switch"]);
+      }
+    });
+  }, []);
   const [modal, contextHolder] = import_antd.Modal.useModal();
   const { setActiveTab } = state;
   const isTeam = (0, import_react.useMemo)(() => {
@@ -112,29 +121,24 @@ var Footer = (props) => {
       });
     }
   }, [state.bookingDetail]);
-  (0, import_react.useEffect)(() => {
-    store == null ? void 0 : store.dispatch({
-      type: "global/_getPaymentLinkBtnShow"
-    });
-  }, []);
   const params = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.appointment_subject) || {};
-  }, [(_g = (_f = (_e = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _e.config) == null ? void 0 : _f.basic) == null ? void 0 : _g.appointment_subject]);
+  }, [(_d = (_c = (_b = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _b.config) == null ? void 0 : _c.basic) == null ? void 0 : _d.appointment_subject]);
   const transaction_habit_selection = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.information_tab) == null ? void 0 : _c2.transaction_habit_selection) || {
       type: "service_now_pay_later",
       button_rows: 1
     };
-  }, [(_i = (_h = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _h.config) == null ? void 0 : _i.information_tab]);
+  }, [(_f = (_e = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _e.config) == null ? void 0 : _f.information_tab]);
   const addonsEdit = (0, import_react.useMemo)(() => {
     var _a2;
     if ((_a2 = state.addons) == null ? void 0 : _a2.edit) {
       return true;
     }
     return false;
-  }, [(_j = state.addons) == null ? void 0 : _j.edit]);
+  }, [(_g = state.addons) == null ? void 0 : _g.edit]);
   const infoEdit = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2, _e2, _f2;
     if (!state.bookingId) {
@@ -726,7 +730,7 @@ var Footer = (props) => {
   }, [
     state.bookingId,
     state.bookingDetail,
-    (_k = state.addons) == null ? void 0 : _k.load,
+    (_h = state.addons) == null ? void 0 : _h.load,
     state.renderType
   ]);
   const menuChange = (e) => {
@@ -787,7 +791,7 @@ var Footer = (props) => {
     },
     /* @__PURE__ */ import_react.default.createElement("div", { className: "order-total-item-border" }),
     /* @__PURE__ */ import_react.default.createElement("div", { className: "order-total-item" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "order-total-item-label" }, import_utils.locales.getText("pisell1.text.subtotal")), /* @__PURE__ */ import_react.default.createElement("span", { className: "order-total-item-value" }, (0, import_utils.formatAmount)(total.productAmount, 2, (state == null ? void 0 : state.amountSymbol) || "$"))),
-    (((_l = state.bookingDetail) == null ? void 0 : _l.surcharge) || []).map((d) => {
+    (((_i = state.bookingDetail) == null ? void 0 : _i.surcharge) || []).map((d) => {
       return /* @__PURE__ */ import_react.default.createElement("div", { className: "order-total-item", key: d.id }, /* @__PURE__ */ import_react.default.createElement("span", { className: "order-total-item-label" }, d.name[state.locale]), /* @__PURE__ */ import_react.default.createElement("span", { className: "order-total-item-value" }, (0, import_utils.formatAmount)(d.amount, 2, (state == null ? void 0 : state.amountSymbol) || "$")));
     }),
     state.bookingId ? /* @__PURE__ */ import_react.default.createElement("div", { className: "order-total-item" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "order-total-item-label" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, import_utils.locales.getText("pisell1.text.tax")), /* @__PURE__ */ import_react.default.createElement("div", { className: "", style: { fontSize: 14 } }, taxText)), /* @__PURE__ */ import_react.default.createElement("span", { className: "order-total-item-value" }, (0, import_utils.formatAmount)(total.tax, 2, (state == null ? void 0 : state.amountSymbol) || "$"))) : null,

package/lib/components/booking/deposit/EditDepositModal/index.less

@@ -3,6 +3,9 @@
     display: flex;
     gap: 12px;
   }
+  .pisell-lowcode-modal-header {
+    padding: 0 0 10px;
+  }
   .pisell-lowcode__edit-deposit-modal-field-list {
     display: flex;
     flex-direction: column;

package/lib/components/booking/forms/model.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/booking/info/client/index.js

@@ -44,6 +44,7 @@ var import_utils = require("@pisell/utils");
 var import_utils2 = require("../../utils");
 var import_serve = require("./serve");
 var import_ahooks = require("ahooks");
+var isLoadClient = false;
 var Client = () => {
   var _a, _b, _c, _d, _e, _f;
   const modalRef = (0, import_react.useRef)();
@@ -53,9 +54,10 @@ var Client = () => {
   const [franchiseeLoading, setFranchiseeLoading] = (0, import_react.useState)(0);
   const [params, setParams] = (0, import_react.useState)({
     skip: 1,
-    num: 50,
+    num: 10,
     total: 0,
-    search: ""
+    search: "",
+    sort_by: "id"
   });
   const menus = (0, import_react.useMemo)(() => {
     let list = [
@@ -72,9 +74,20 @@ var Client = () => {
     customer_id,
     ...resetParams
   }) => {
-    let _setLoading = resetParams.skip === 1 ? setLoading : setLoadLoading;
+    var _a2, _b2;
+    let _setLoading;
+    if (resetParams.skip === 1) {
+      if (resetParams.search) {
+        _setLoading = setLoading;
+      } else {
+        _setLoading = isLoadClient || ((_b2 = (_a2 = state == null ? void 0 : state.client) == null ? void 0 : _a2.clients) == null ? void 0 : _b2.length) ? () => {
+        } : setLoading;
+      }
+    } else {
+      _setLoading = setLoadLoading;
+    }
     _setLoading(true);
-    const api = state.isFranchisee ? import_serve.getFranchiseeCustomerList : state.apis.getClients;
+    const api = state.isFranchisee ? import_serve.getFranchiseeCustomerList : state.apis.getClientsEs;
     const data = await api({
       ...resetParams,
       ...!state.isFranchisee ? { _config: { abort: true } } : {}
@@ -111,7 +124,9 @@ var Client = () => {
       type: "setClient",
       payload: _payload
     });
-    _setLoading(false);
+    setLoading(false);
+    setLoadLoading(false);
+    isLoadClient = true;
     return {};
   };
   const handleOpenClientModal = () => {
@@ -127,7 +142,8 @@ var Client = () => {
       if ((0, import_utils2.isWalkIn)(item == null ? void 0 : item.id)) {
         return import_utils.locales.getText("pisell2.text.select-a-customer");
       }
-      return item.name || (item.display_name || "").trim() || (item.nickname || "").trim() || "";
+      const firstLastName = item.first_name || item.last_name ? `${item.first_name} ${item.last_name}` : "";
+      return item.name || (item.display_name || "").trim() || (item.nickname || "").trim() || firstLastName.trim() || "";
     },
     [import_utils.locales.localeMap]
   );
@@ -201,12 +217,16 @@ var Client = () => {
         showReceiveAddress: false,
         showAcceptsMarketing: false
       },
-      callback: (customer_id) => {
-        getClients({
-          ...state.client.clientsParams,
-          search: "",
-          customer_id,
-          skip: 1
+      callback: (customer_id, params2) => {
+        var _a2, _b2, _c2;
+        dispatch({
+          type: "setClient",
+          payload: {
+            clients: [
+              ...((_a2 = params2 == null ? void 0 : params2[0]) == null ? void 0 : _a2.customer) ? [{ ...(_b2 = params2 == null ? void 0 : params2[0]) == null ? void 0 : _b2.customer, id: customer_id }] : [],
+              ...((_c2 = state.client) == null ? void 0 : _c2.clients) || []
+            ]
+          }
         });
       }
     });
@@ -289,7 +309,6 @@ var Client = () => {
         mode: "single",
         createItemText: import_utils.locales.getText("pisell2.text.create-new-customer"),
         closeCallback: () => {
-          searchChange("");
         },
         optionRender: (item) => {
           return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
@@ -309,14 +328,7 @@ var Client = () => {
         }
       }
     );
-  }, [
-    state,
-    renderList,
-    loading,
-    franchiseeLoading,
-    params.search,
-    loadMore
-  ]);
+  }, [state, renderList, loading, franchiseeLoading, params.search, loadMore]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {

package/lib/components/booking/info/clientVariant/hooks/useClientFn.d.ts

@@ -1,5 +1,5 @@
-import React from "react";
-import { FormState } from "../../../model";
+import React from 'react';
+import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;
     setGlobalState: (val: any) => void;
@@ -7,7 +7,7 @@ interface useClientFnParams {
     onRemoveClient?: () => void;
 }
 declare const useClientFn: (_params: useClientFnParams) => {
-    setClient: (client: Partial<FormState["client"]>) => void;
+    setClient: (client: Partial<FormState['client']>) => void;
     isWalkIn: boolean;
     handleSelectClient: (value: any) => Promise<unknown>;
     menuChange: (e: any) => void;
@@ -16,7 +16,7 @@ declare const useClientFn: (_params: useClientFnParams) => {
         key: string;
         label: any;
     }[];
-    handleCreateItem: () => void;
+    handleCreateItem: (cb?: () => void) => void;
     getClients: ({ customer_id, customer_ids, ...resetParams }: {
         customer_id?: number | undefined;
         skip?: number | undefined;