@pisell/private-materials 3.0.87 → 3.0.88

package/es/components/booking/info/clientVariant/vertical/index.js

@@ -21,7 +21,7 @@ import Pet from "../../pet";
 import "./index.less";
 import useEngineContext from "../../../../../hooks/useEngineContext";
 var VerticalClient = function VerticalClient(props) {
-  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig8, _state$bookingConfig9, _state$bookingConfig10, _state$bookingConfig11, _state$pet3, _state$pet4, _state$client$value, _state$client$value2, _state$client$value3, _state$client$value4, _state$client$value5, _state$pet5, _state$pet5$value, _context$appHelper, _context$appHelper$ut, _context$appHelper$ut2, _state$bookingConfig12, _state$client;
+  var _context$appHelper, _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig8, _state$bookingConfig9, _state$bookingConfig10, _state$bookingConfig11, _state$pet3, _state$pet4, _state$client$value, _state$client$value2, _state$client$value3, _state$client$value4, _state$client$value5, _state$pet5, _state$pet5$value, _context$appHelper2, _context$appHelper2$u, _context$appHelper2$u2, _state$bookingConfig12, _state$client;
   var globalState = props.globalState,
     setGlobalState = props.setGlobalState;
   var modalRef = useRef();
@@ -29,6 +29,8 @@ var VerticalClient = function VerticalClient(props) {
   var stateRef = useRef(state);
   var prevCustomerId = useRef(null);
   var context = useEngineContext();
+  var isFranchisee = context === null || context === void 0 ? void 0 : (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : (_context$appHelper$ut = _context$appHelper.utils) === null || _context$appHelper$ut === void 0 ? void 0 : (_context$appHelper$ut2 = _context$appHelper$ut.businessUtils) === null || _context$appHelper$ut2 === void 0 ? void 0 : (_context$appHelper$ut3 = _context$appHelper$ut2.getAppByModal) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.call(_context$appHelper$ut2, "franchisee");
+  state.isFranchisee = isFranchisee;
   stateRef.current = state;
   var _useClientFn = useClientFn({
       state: state,
@@ -48,7 +50,8 @@ var VerticalClient = function VerticalClient(props) {
     loading = _useClientFn.loading,
     loadMore = _useClientFn.loadMore,
     handleOpenClientModal = _useClientFn.handleOpenClientModal,
-    getNickname = _useClientFn.getNickname;
+    getNickname = _useClientFn.getNickname,
+    franchiseeLoading = _useClientFn.franchiseeLoading;
   var renderList = useMemo(function () {
     var _list = _toConsumableArray(state.client.clients);
     return _list;
@@ -227,7 +230,7 @@ var VerticalClient = function VerticalClient(props) {
   }, locales.getText('pisell2.text.add'))), /*#__PURE__*/React.createElement(SelectDrawer, {
     modalOpen: state.modalOpen,
     loading: loading,
-    autoFocus: !(context !== null && context !== void 0 && (_context$appHelper = context.appHelper) !== null && _context$appHelper !== void 0 && (_context$appHelper$ut = _context$appHelper.utils) !== null && _context$appHelper$ut !== void 0 && (_context$appHelper$ut2 = _context$appHelper$ut.isTerminal) !== null && _context$appHelper$ut2 !== void 0 && _context$appHelper$ut2.call(_context$appHelper$ut)),
+    autoFocus: !(context !== null && context !== void 0 && (_context$appHelper2 = context.appHelper) !== null && _context$appHelper2 !== void 0 && (_context$appHelper2$u = _context$appHelper2.utils) !== null && _context$appHelper2$u !== void 0 && (_context$appHelper2$u2 = _context$appHelper2$u.isTerminal) !== null && _context$appHelper2$u2 !== void 0 && _context$appHelper2$u2.call(_context$appHelper2$u)),
     ref: modalRef,
     onClose: handleClose,
     handleSelectClient: handleSelectClient,
@@ -241,7 +244,8 @@ var VerticalClient = function VerticalClient(props) {
     client: state === null || state === void 0 ? void 0 : (_state$client = state.client) === null || _state$client === void 0 ? void 0 : _state$client.value,
     loadMore: loadMore,
     showPet: (boardConfig === null || boardConfig === void 0 ? void 0 : boardConfig.type) === 'form',
-    handleAddPet: handleAddPet
+    handleAddPet: handleAddPet,
+    franchiseeLoading: franchiseeLoading
   }));
 };
 export default VerticalClient;

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

@@ -264,7 +264,6 @@ var Info = function Info() {
       }
     });
   };
-  console.log('state.service.cacheItem', state.service.cacheItem);
   var renderList = useMemo(function () {
     var _state$service2;
     var _list = ((_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.services) || [];
@@ -275,6 +274,7 @@ var Info = function Info() {
       return isIncludes(item.title);
     } : undefined);
   }, [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;
   }, [state.service.value]);

package/es/components/booking/utils.js

@@ -217,7 +217,9 @@ export var formatProductListByCategory = function formatProductListByCategory(li
       });
     }
   }
-  return Object.values(categoryObject);
+  return Object.values(categoryObject).sort(function (a, b) {
+    return b.sort - a.sort;
+  });
 };
 export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cacheItem) {
   var startDate = dayjs(cacheItem._extend.start_date.format("YYYY-MM-DD") + ' ' + getServeStartTime(cacheItem._extend.start_time));

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

@@ -1,5 +1,5 @@
-import React from "react";
-import "./index.less";
+import React from 'react';
+import './index.less';
 /**
  * @title: 底部
  * @description:

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

@@ -52,10 +52,13 @@ var Footer = (props) => {
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [checkoutLoading, setCheckoutLoading] = (0, import_react.useState)(false);
   const context = (0, import_useEngineContext.default)();
-  const { isTerminal, interaction, store } = (_a = context.appHelper) == null ? void 0 : _a.utils;
+  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;
   const [modal, contextHolder] = import_antd.Modal.useModal();
   const { setActiveTab } = state;
+  const isTeam = (0, import_react.useMemo)(() => {
+    return storage.get("channel") === "android_team_portal" || storage.get("channel") === "ios_team_portal";
+  }, []);
   const actionMap = {
     sale: {
       label: import_utils.locales.getText("pisell2.text.addons"),
@@ -509,11 +512,15 @@ var Footer = (props) => {
         }
       }
     }
-    if (transaction_habit_selection.button_rows == 1) {
-      arr.push(actionMap.orderDetail);
+    if (!isTeam) {
+      if (transaction_habit_selection.button_rows == 1) {
+        arr.push(actionMap.orderDetail);
+      }
     }
-    if (total.paidAmount > 0) {
-      arr.push(actionMap.refund);
+    if (!isTeam) {
+      if (total.paidAmount > 0) {
+        arr.push(actionMap.refund);
+      }
     }
     if (state.appointment_status !== "cancelled") {
       arr.push(actionMap.rebook);
@@ -537,18 +544,22 @@ var Footer = (props) => {
       if (state.bookingId && isShowPaymentLink) {
         arr.push(buttonMap.paymentLink);
       }
-      if (total.paidAmount > 0) {
-        arr.push(buttonMap.refund);
-      }
-      if (isCheckout) {
-        arr.push(buttonMap.checkout);
+      if (!isTeam) {
+        if (total.paidAmount > 0) {
+          arr.push(buttonMap.refund);
+        }
+        if (isCheckout) {
+          arr.push(buttonMap.checkout);
+        }
       }
       return arr;
     }
     if (source === "info") {
       let arr = [];
       if (isCheckout) {
-        arr.push(buttonMap.checkout);
+        if (!isTeam) {
+          arr.push(buttonMap.checkout);
+        }
       } else {
         if (!isEdit) {
           arr.push(buttonMap.complete);
@@ -557,6 +568,9 @@ var Footer = (props) => {
       if (isEdit) {
         arr.push(buttonMap.save);
       }
+      if (arr.length === 0) {
+        return [buttonMap.rebook];
+      }
       return arr;
     }
     if (source === "addTime") {
@@ -575,7 +589,8 @@ var Footer = (props) => {
     buttonMap,
     loading,
     isCheckout,
-    state
+    state,
+    isTeam
   ]);
   const isOnlyDeposit = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2;

package/lib/components/booking/deposit/DepositItem/index.d.ts

@@ -1,7 +1,7 @@
-import React from "react";
-import "./index.less";
+import React from 'react';
+import './index.less';
 declare type DepositItemProps = {
-    status: "paid" | "unpaid";
+    status: 'paid' | 'unpaid';
     onEdit: React.MouseEventHandler<HTMLSpanElement>;
     customer: any;
     totalAmountStr: string;
@@ -16,6 +16,7 @@ declare type DepositItemProps = {
     createdTime: string;
     isPaid: boolean;
     isBookingCancelled: boolean;
+    hideOrderDetail?: boolean;
 };
 declare const DepositItem: (props: DepositItemProps) => React.JSX.Element;
 export default DepositItem;

package/lib/components/booking/deposit/DepositItem/index.js

@@ -62,7 +62,8 @@ var DepositItem = (props) => {
     createdTime,
     isPaid,
     isBookingCancelled,
-    sendEmail
+    sendEmail,
+    hideOrderDetail
   } = props;
   const statusText = {
     unpaid: import_utils.locales.getText("pisell2.text.deposit-item-status-unpaid"),
@@ -110,6 +111,6 @@ var DepositItem = (props) => {
         onClick: onEdit
       }
     ))
-  ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__deposit-item-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__deposit-item-content-line1" }, import_utils.locales.getText("pisell2.text.deposit-order-no"), " ", orderNumber), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__deposit-item-content-line2" }, createdTime), /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(import_ClientItem.default, { data: customer, coverSize: 40, walkInName: "Walk-In" }))), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__deposit-item-footer" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__deposit-item-footer-total" }, /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("pisell2.text.deposit-order-total")), /* @__PURE__ */ import_react.default.createElement("div", null, totalAmountStr)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__deposit-item-footer-action" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { block: true, size: "large", onClick: handleGoOrderDetail }, import_utils.locales.getText("pisell2.text.deposit-order-detail")), /* @__PURE__ */ import_react.default.createElement(import_antd.Dropdown, { menu: { items, onClick }, placement: "bottom" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { block: true, type: "primary", size: "large" }, import_utils.locales.getText("pisell2.text.deposit-collect-deposit"), " ", /* @__PURE__ */ import_react.default.createElement(import_icons.DownOutlined, null))))));
+  ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__deposit-item-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__deposit-item-content-line1" }, import_utils.locales.getText("pisell2.text.deposit-order-no"), " ", orderNumber), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__deposit-item-content-line2" }, createdTime), /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(import_ClientItem.default, { data: customer, coverSize: 40, walkInName: "Walk-In" }))), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__deposit-item-footer" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__deposit-item-footer-total" }, /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("pisell2.text.deposit-order-total")), /* @__PURE__ */ import_react.default.createElement("div", null, totalAmountStr)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__deposit-item-footer-action" }, !hideOrderDetail && /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { block: true, size: "large", onClick: handleGoOrderDetail }, import_utils.locales.getText("pisell2.text.deposit-order-detail")), /* @__PURE__ */ import_react.default.createElement(import_antd.Dropdown, { menu: { items, onClick }, placement: "bottom" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { block: true, type: "primary", size: "large" }, import_utils.locales.getText("pisell2.text.deposit-collect-deposit"), " ", /* @__PURE__ */ import_react.default.createElement(import_icons.DownOutlined, null))))));
 };
 var DepositItem_default = DepositItem;

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

@@ -1,3 +1,3 @@
-import React from "react";
+import React from 'react';
 declare const Deposit: (props: any) => React.JSX.Element;
 export default Deposit;

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

@@ -51,9 +51,19 @@ var Deposit = (props) => {
   const [modal, contextHolder] = import_antd.Modal.useModal();
   const editDepositModalRef = (0, import_react.useRef)();
   const context = (0, import_useEngineContext.default)();
-  const { isTerminal, interaction, action } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
+  const { isTerminal, interaction, action, storage } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
+  const isTeam = (0, import_react.useMemo)(() => {
+    return storage.get("channel") === "android_team_portal" || storage.get("channel") === "ios_team_portal";
+  }, []);
   import_utils2.request.setRequest(context.appHelper.utils.request);
-  const { bookingDetail, bookingId, amountSymbol, generatePaymentLink, locale, callback } = globalState;
+  const {
+    bookingDetail,
+    bookingId,
+    amountSymbol,
+    generatePaymentLink,
+    locale,
+    callback
+  } = globalState;
   const sendEmail = (id) => {
     action({
       type: "pisell1.sendPayLinkEmail",
@@ -105,7 +115,9 @@ var Deposit = (props) => {
         status: (bookingDetail == null ? void 0 : bookingDetail.deposit_payment_time) ? "paid" : "unpaid",
         totalAmount: total.expectAmount,
         depositAmount: bookingDetail == null ? void 0 : bookingDetail.deposit_amount,
-        createdTime: (0, import_dayjs.default)(bookingDetail == null ? void 0 : bookingDetail.created_at).format(locale === "en" ? "dddd, D MMMM YYYY HH:mm" : "YYYY-MM-DD HH:mm"),
+        createdTime: (0, import_dayjs.default)(bookingDetail == null ? void 0 : bookingDetail.created_at).format(
+          locale === "en" ? "dddd, D MMMM YYYY HH:mm" : "YYYY-MM-DD HH:mm"
+        ),
         orderId: bookingDetail == null ? void 0 : bookingDetail.id,
         orderNumber: bookingDetail == null ? void 0 : bookingDetail.shop_full_order_number,
         amountSymbol: (globalState == null ? void 0 : globalState.amountSymbol) || "$",
@@ -116,7 +128,12 @@ var Deposit = (props) => {
         )
       }
     ];
-  }, [bookingDetail, total == null ? void 0 : total.expectAmount, globalState == null ? void 0 : globalState.amountSymbol, bookingDetail == null ? void 0 : bookingDetail.deposit_amount]);
+  }, [
+    bookingDetail,
+    total == null ? void 0 : total.expectAmount,
+    globalState == null ? void 0 : globalState.amountSymbol,
+    bookingDetail == null ? void 0 : bookingDetail.deposit_amount
+  ]);
   const isBookingCancelled = ((_b = bookingDetail == null ? void 0 : bookingDetail.bookings) == null ? void 0 : _b.appointment_status) === "cancelled";
   const isPaid = (bookingDetail == null ? void 0 : bookingDetail.payment_time) !== null;
   const footer = (0, import_react.useMemo)(() => {
@@ -126,7 +143,15 @@ var Deposit = (props) => {
       return null;
     if (isPaid)
       return null;
-    return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-deposit-footer" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { size: "large", block: true, onClick: depositList.length > 0 ? deleteDeposit : create }, depositList.length > 0 ? import_utils.locales.getText("pisell2.text.deposit-delete") : import_utils.locales.getText("pisell2.text.add")));
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-deposit-footer" }, /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Button,
+      {
+        size: "large",
+        block: true,
+        onClick: depositList.length > 0 ? deleteDeposit : create
+      },
+      depositList.length > 0 ? import_utils.locales.getText("pisell2.text.deposit-delete") : import_utils.locales.getText("pisell2.text.add")
+    ));
   }, [depositList, isBookingCancelled, isPaid]);
   const handleEdit = (e, item) => {
     var _a2, _b2;
@@ -185,7 +210,8 @@ var Deposit = (props) => {
         handleGoOrderDetail,
         onEdit: (e) => handleEdit(e, item),
         isPaid,
-        isBookingCancelled
+        isBookingCancelled,
+        hideOrderDetail: isTeam
       }
     )),
     /* @__PURE__ */ import_react.default.createElement(

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

@@ -36,5 +36,6 @@ declare const useClientFn: (_params: useClientFnParams) => {
     loadMore: React.JSX.Element | null;
     handleOpenClientModal: () => void;
     getNickname: (item: any) => any;
+    franchiseeLoading: number;
 };
 export default useClientFn;

package/lib/components/booking/info/clientVariant/hooks/useClientFn.js

@@ -81,15 +81,16 @@ var useClientFn = (_params) => {
       ...!state.isFranchisee ? { _config: { abort: true } } : {}
     });
     const list = ((data == null ? void 0 : data.list) || []).map((d) => {
+      var _a2;
       return {
         ...d,
         name: getNickname(d),
         id: d.franchisee_customer_id || d.id,
-        form_record: d.form_record.map((item) => ({
+        form_record: ((_a2 = d.form_record) == null ? void 0 : _a2.map((item) => ({
           ...item,
           ...item.data,
           form_record_id: item.id
-        }))
+        }))) || []
       };
     });
     let _payload = {
@@ -303,7 +304,8 @@ var useClientFn = (_params) => {
     loading,
     loadMore,
     handleOpenClientModal,
-    getNickname
+    getNickname,
+    franchiseeLoading
   };
 };
 var useClientFn_default = useClientFn;

package/lib/components/booking/info/clientVariant/vertical/SelectDrawer.d.ts

@@ -17,6 +17,7 @@ interface SelectDrawerProps {
     holder: any;
     handleAddPet: any;
     modalOpen: boolean;
+    franchiseeLoading?: number;
 }
 declare const _default: React.ForwardRefExoticComponent<SelectDrawerProps & React.RefAttributes<unknown>>;
 export default _default;

package/lib/components/booking/info/clientVariant/vertical/SelectDrawer.js

@@ -63,7 +63,8 @@ var Item = ({
   desc,
   coverSize,
   checked,
-  style
+  style,
+  loading
 }) => {
   return /* @__PURE__ */ import_react.default.createElement(
     "div",
@@ -83,7 +84,8 @@ var Item = ({
         icon: /* @__PURE__ */ import_react.default.createElement(import_User01.default, { className: "pisell-lowcode__booking-client-list-item-avatar-icon" })
       }
     ),
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-name" }, title), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-desc" }, (desc || []).map((d) => /* @__PURE__ */ import_react.default.createElement("div", { className: "", title: d }, d))))
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-name" }, title), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-desc" }, (desc || []).map((d) => /* @__PURE__ */ import_react.default.createElement("div", { className: "", title: d }, d)))),
+    /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, { spinning: !!loading })
   );
 };
 var defaultArr = [];
@@ -104,7 +106,8 @@ var SelectDrawer = (props, ref) => {
     loadMore,
     showPet,
     handleAddPet,
-    modalOpen
+    modalOpen,
+    franchiseeLoading
   } = props;
   const form = (formData == null ? void 0 : formData[0]) || {};
   const valList = (childrenValue == null ? void 0 : childrenValue[form.id]) || defaultArr;
@@ -161,7 +164,7 @@ var SelectDrawer = (props, ref) => {
   const handleAddClient = () => {
     handleCreateItem();
   };
-  const handleChildrenValueChange = (value, item) => {
+  const handleChildrenValueChange = async (value, item) => {
     var _a;
     let clientId = client.id;
     if (!(client == null ? void 0 : client.id) || client.id === 1) {
@@ -169,7 +172,7 @@ var SelectDrawer = (props, ref) => {
     }
     if (mode === "single") {
       if (!(client == null ? void 0 : client.id) || client.id === 1) {
-        handleSelectClient([item]);
+        await handleSelectClient([item]);
       }
       handleSelectPet({
         [form.id]: (0, import_format.formatAddFormValues)({
@@ -218,19 +221,19 @@ var SelectDrawer = (props, ref) => {
     }
     return holder == null ? void 0 : holder.type;
   }, [holder == null ? void 0 : holder.type]);
-  const handleOk = () => {
+  const handleOk = async () => {
     var _a;
     if (!(client == null ? void 0 : client.id) || (client == null ? void 0 : client.id) === 1) {
-      handleSelectClient([clientRef.current]);
+      await handleSelectClient([clientRef.current]);
     }
     handleSelectPet({
       [(_a = holder == null ? void 0 : holder.form) == null ? void 0 : _a.id]: _value
     });
     closeDrawer();
   };
-  const handleClientClick = (item) => {
+  const handleClientClick = async (item) => {
     var _a;
-    handleSelectClient([item]);
+    await handleSelectClient([item]);
     if (mode === "multiple") {
       const isHasChildren = _value.some(
         (val) => item.form_record.some(
@@ -280,7 +283,7 @@ var SelectDrawer = (props, ref) => {
       getContainer: false,
       destroyOnClose: true,
       push: { distance: 180 },
-      footer: mode === "multiple" && /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { block: true, type: "primary", onClick: handleOk }, import_utils.locales.getText("pisell2.text.apply")))
+      footer: mode === "multiple" && /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { block: true, type: "primary", onClick: handleOk, loading: !!franchiseeLoading }, import_utils.locales.getText("pisell2.text.apply")))
     },
     /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, { spinning: loading }, /* @__PURE__ */ import_react.default.createElement("div", { className: "vertical-client-select-drawer-content-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "vertical-client-select-drawer-top" }, /* @__PURE__ */ import_react.default.createElement(
       ActionItem,
@@ -313,7 +316,8 @@ var SelectDrawer = (props, ref) => {
             title: getNickname(item),
             desc: [item.email, item.phone],
             checked: item.id === client.id,
-            style: showPet ? { marginBottom: 6 } : {}
+            style: showPet ? { marginBottom: 6 } : {},
+            loading: franchiseeLoading === item.id
           }
         ),
         showPet && /* @__PURE__ */ import_react.default.createElement("div", { className: "vertical-client-select-drawer-content-item-children" }, ((item == null ? void 0 : item.form_record) || []).map((f) => {
@@ -336,7 +340,7 @@ var SelectDrawer = (props, ref) => {
               )
             },
             mode === "multiple" && /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox, { checked }),
-            /* @__PURE__ */ import_react.default.createElement(Item, { coverSize: 48, title: f.main_field })
+            /* @__PURE__ */ import_react.default.createElement(Item, { coverSize: 48, title: f.main_field, loading: false })
           );
         }), /* @__PURE__ */ import_react.default.createElement(
           "div",

package/lib/components/booking/info/clientVariant/vertical/index.js

@@ -43,13 +43,15 @@ var import_pet = __toESM(require("../../pet"));
 var import_index = require("./index.less");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var VerticalClient = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
   const { globalState, setGlobalState } = props;
   const modalRef = (0, import_react.useRef)();
   const state = globalState;
   const stateRef = (0, import_react.useRef)(state);
   const prevCustomerId = (0, import_react.useRef)(null);
   const context = (0, import_useEngineContext.default)();
+  const isFranchisee = (_d = (_c = (_b = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.businessUtils) == null ? void 0 : _c.getAppByModal) == null ? void 0 : _d.call(_c, "franchisee");
+  state.isFranchisee = isFranchisee;
   stateRef.current = state;
   const {
     isWalkIn,
@@ -65,7 +67,8 @@ var VerticalClient = (props) => {
     loading,
     loadMore,
     handleOpenClientModal,
-    getNickname
+    getNickname,
+    franchiseeLoading
   } = (0, import_useClientFn.default)({
     state,
     setGlobalState,
@@ -95,7 +98,7 @@ var VerticalClient = (props) => {
   const boardConfig = (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) || {};
-  }, [(_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic]);
+  }, [(_f = (_e = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _e.config) == null ? void 0 : _f.basic]);
   (0, import_react.useEffect)(() => {
     var _a2, _b2, _c2, _d2;
     if (((_d2 = (_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.appointment_customer) == null ? void 0 : _d2.type) === "customer" && (state == null ? void 0 : state.modalOpen) && !(state == null ? void 0 : state.bookingId)) {
@@ -107,7 +110,7 @@ var VerticalClient = (props) => {
       });
     }
   }, [
-    (_f = (_e = (_d = (_c = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _c.config) == null ? void 0 : _d.basic) == null ? void 0 : _e.appointment_customer) == null ? void 0 : _f.type,
+    (_j = (_i = (_h = (_g = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _g.config) == null ? void 0 : _h.basic) == null ? void 0 : _i.appointment_customer) == null ? void 0 : _j.type,
     state == null ? void 0 : state.modalOpen
   ]);
   const handleSelectPet = (val) => {
@@ -185,8 +188,8 @@ var VerticalClient = (props) => {
   }, [
     isWalkIn,
     state == null ? void 0 : state.disabledEdit,
-    (_g = state.pet) == null ? void 0 : _g.value,
-    (_h = state.pet) == null ? void 0 : _h.formData,
+    (_k = state.pet) == null ? void 0 : _k.value,
+    (_l = state.pet) == null ? void 0 : _l.formData,
     boardConfig.type
   ]);
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-vertical-client-wrap" }, /* @__PURE__ */ import_react.default.createElement(
@@ -204,11 +207,11 @@ var VerticalClient = (props) => {
       import_antd.Avatar,
       {
         className: "pisell-lowcode__booking-client-avatar",
-        src: import_utils.image.ali((_i = state.client.value) == null ? void 0 : _i.cover, 100),
+        src: import_utils.image.ali((_m = state.client.value) == null ? void 0 : _m.cover, 100),
         size: 64,
         icon: /* @__PURE__ */ import_react.default.createElement(import_User01.default, { className: "pisell-lowcode__booking-client-list-item-avatar-icon" })
       }
-    ), isWalkIn ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-desc" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-title" }, import_utils.locales.getText("pisell2.text.add-client")), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, import_utils.locales.getText("pisell2.text.leave-empty-for-walk-in"))) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-title" }, getNickname(state.client.value)), ((_j = state.client.value) == null ? void 0 : _j.email) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, (_k = state.client.value) == null ? void 0 : _k.email) : null, ((_l = state.client.value) == null ? void 0 : _l.phone) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, (_m = state.client.value) == null ? void 0 : _m.phone) : null), !isWalkIn && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-action-wrap" }, !state.disabledEdit && /* @__PURE__ */ import_react.default.createElement(
+    ), isWalkIn ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-desc" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-title" }, import_utils.locales.getText("pisell2.text.add-client")), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, import_utils.locales.getText("pisell2.text.leave-empty-for-walk-in"))) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-title" }, getNickname(state.client.value)), ((_n = state.client.value) == null ? void 0 : _n.email) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, (_o = state.client.value) == null ? void 0 : _o.email) : null, ((_p = state.client.value) == null ? void 0 : _p.phone) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, (_q = state.client.value) == null ? void 0 : _q.phone) : null), !isWalkIn && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-action-wrap" }, !state.disabledEdit && /* @__PURE__ */ import_react.default.createElement(
       import_antd.Dropdown,
       {
         menu: {
@@ -234,7 +237,7 @@ var VerticalClient = (props) => {
       clientChangeNotSetPet: true,
       state,
       dispatch: petDispatch,
-      hideTitle: !((_o = (_n = state.pet) == null ? void 0 : _n.value) == null ? void 0 : _o.length),
+      hideTitle: !((_s = (_r = state.pet) == null ? void 0 : _r.value) == null ? void 0 : _s.length),
       handleOpenModal,
       addButtonProps: {
         onClick: handleOpenClientModal,
@@ -256,7 +259,7 @@ var VerticalClient = (props) => {
     {
       modalOpen: state.modalOpen,
       loading,
-      autoFocus: !((_r = (_q = (_p = context == null ? void 0 : context.appHelper) == null ? void 0 : _p.utils) == null ? void 0 : _q.isTerminal) == null ? void 0 : _r.call(_q)),
+      autoFocus: !((_v = (_u = (_t = context == null ? void 0 : context.appHelper) == null ? void 0 : _t.utils) == null ? void 0 : _u.isTerminal) == null ? void 0 : _v.call(_u)),
       ref: modalRef,
       onClose: handleClose,
       handleSelectClient,
@@ -266,11 +269,12 @@ var VerticalClient = (props) => {
       formData: state.pet.formData,
       searchChange,
       options: renderList,
-      holder: (_s = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _s.holder,
-      client: (_t = state == null ? void 0 : state.client) == null ? void 0 : _t.value,
+      holder: (_w = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _w.holder,
+      client: (_x = state == null ? void 0 : state.client) == null ? void 0 : _x.value,
       loadMore,
       showPet: (boardConfig == null ? void 0 : boardConfig.type) === "form",
-      handleAddPet
+      handleAddPet,
+      franchiseeLoading
     }
   ));
 };

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

@@ -216,7 +216,6 @@ var Info = () => {
       }
     });
   };
-  console.log("state.service.cacheItem", state.service.cacheItem);
   const renderList = (0, import_react.useMemo)(() => {
     var _a2;
     let _list = ((_a2 = state.service) == null ? void 0 : _a2.services) || [];
@@ -228,6 +227,7 @@ var Info = () => {
       search ? (item) => isIncludes(item.title) : void 0
     );
   }, [search, (_a = state.service) == null ? void 0 : _a.services]);
+  console.log("state.service.renderList", renderList);
   const isService = (0, import_react.useMemo)(() => {
     return state.service.value.length > 0;
   }, [state.service.value]);

package/lib/components/booking/utils.js

@@ -205,7 +205,7 @@ var formatProductListByCategory = (list, filterItem) => {
       };
     }
   }
-  return Object.values(categoryObject);
+  return Object.values(categoryObject).sort((a, b) => b.sort - a.sort);
 };
 var getResourceTimeIsUsable = (item, cacheItem) => {
   const startDate = (0, import_dayjs.default)(cacheItem._extend.start_date.format("YYYY-MM-DD") + " " + getServeStartTime(cacheItem._extend.start_time));

package/package.json

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