@pisell/private-materials 6.6.48 → 6.6.49

package/lib/components/ticketBooking/components/addServiceVariant/addService.js

@@ -66,7 +66,7 @@ var productListSetting = {
   isStock: 0
 };
 var AddSerivce = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const {
     onEdit,
     state,
@@ -75,9 +75,6 @@ var AddSerivce = (props) => {
     productDisplayConfig
   } = props;
   const context = (0, import_useEngineContext.default)();
-  const {
-    getData
-  } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const notAvailableRef = (0, import_react.useRef)(null);
   import_utils2.request.setRequest(context.appHelper.utils.request);
   const isActive = (0, import_IsActiveContext.useIsActive)();
@@ -89,9 +86,9 @@ var AddSerivce = (props) => {
     dispatch
   });
   const isBooking4 = (0, import_utils5.isBooking4Shop)(
-    ((_d = (_c = (_b = context.appHelper) == null ? void 0 : _b.utils) == null ? void 0 : _c.getData) == null ? void 0 : _d.call(_c, "shop_id")) || ((_i = (_h = (_g = (_f = (_e = context.appHelper.utils.store) == null ? void 0 : _e.getState) == null ? void 0 : _f.call(_e)) == null ? void 0 : _g.global) == null ? void 0 : _h.globalConfig) == null ? void 0 : _i.id),
+    ((_c = (_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.getData) == null ? void 0 : _c.call(_b, "shop_id")) || ((_h = (_g = (_f = (_e = (_d = context.appHelper.utils.store) == null ? void 0 : _d.getState) == null ? void 0 : _e.call(_d)) == null ? void 0 : _f.global) == null ? void 0 : _g.globalConfig) == null ? void 0 : _h.id),
     state == null ? void 0 : state.renderType,
-    (_j = context.appHelper.utils) == null ? void 0 : _j.businessUtils
+    (_i = context.appHelper.utils) == null ? void 0 : _i.businessUtils
   );
   const [currentProduct, setCurrentProduct] = (0, import_react.useState)(null);
   const [firstLoading, setFirstLoading] = (0, import_react.useState)(true);
@@ -136,11 +133,11 @@ var AddSerivce = (props) => {
   const menuList = (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.menu_list_tab) == null ? void 0 : _c2.menu_list) || [];
-  }, [(_k = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _k.config]);
+  }, [(_j = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _j.config]);
   const customerId = (0, import_react.useMemo)(() => {
     var _a2, _b2;
     return ((_b2 = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.id) || void 0;
-  }, [(_m = (_l = state.client) == null ? void 0 : _l.value) == null ? void 0 : _m.id]);
+  }, [(_l = (_k = state.client) == null ? void 0 : _k.value) == null ? void 0 : _l.id]);
   const scanAddService = (0, import_ahooks.useMemoizedFn)((list, code) => {
     let newService = [...state.service.value];
     list.forEach((item) => {
@@ -205,7 +202,7 @@ var AddSerivce = (props) => {
     }
   );
   const processAddService = (0, import_ahooks.useMemoizedFn)(async (item, _detail, e, notShowToast, startDate, endDate) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m2, _n, _o, _p, _q, _r, _s, _t;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m, _n, _o, _p, _q, _r, _s, _t;
     const other = JSON.parse(JSON.stringify(e));
     other.session = e.session;
     let cacheItem = {
@@ -213,7 +210,6 @@ var AddSerivce = (props) => {
       product_id: item.id,
       _id: (0, import_utils.getUniqueId)(),
       _key: e.key,
-      is_price_include_tax: getData("is_price_include_tax"),
       _extend: {
         start_date: startDate,
         quantity: (e == null ? void 0 : e.quantity) || 1,
@@ -259,7 +255,7 @@ var AddSerivce = (props) => {
       if (res && res.length > 0) {
         cacheItem._extend.holder_id = res;
       } else {
-        if (((_n = (_m2 = (_l2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _l2.config) == null ? void 0 : _m2.basic) == null ? void 0 : _n.subject_require) === "require") {
+        if (((_n = (_m = (_l2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _l2.config) == null ? void 0 : _m.basic) == null ? void 0 : _n.subject_require) === "require") {
           return;
         }
       }

package/lib/components/ticketBooking/index.js

@@ -233,7 +233,7 @@ var ticketBooking_default = (props) => {
   }, [isShowMenuBar, activeNavKey, propsProductDisplayConfig]);
   const storeRef = (0, import_react.useRef)(null);
   const context = (0, import_useEngineContext.default)();
-  const { pisellos, pisellosAllModule } = (_a = context.appHelper) == null ? void 0 : _a.utils;
+  const { pisellos, pisellosAllModule, businessUtils } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const { BookingTicket, ShopDiscountImpl } = pisellosAllModule || {};
   import_utils.locales.init(
     import_locales.default,
@@ -251,12 +251,14 @@ var ticketBooking_default = (props) => {
     storeRef.current = store;
   }, [bookingConfigParams, productExtensionType]);
   (0, import_react.useMemo)(() => {
+    var _a2;
     if (BookingTicket) {
       pisellos == null ? void 0 : pisellos.registerModule(new BookingTicket((0, import_utils3.getBookingTicketKey)(osKey)), {
         initialState: {},
         otherParams: {
           cacheId: (0, import_utils3.getBookingTicketKey)(osKey),
-          platform: "shop"
+          platform: "shop",
+          isFranchisee: (_a2 = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _a2.call(businessUtils, "franchisee")
         }
       });
     }

package/lib/plus/clinetSearch/index.d.ts

@@ -10,6 +10,7 @@ interface ClientSearchProps extends Omit<ComprehensiveSearchProps, 'resultDispla
     hasMore?: boolean;
     onLoadMore?: () => void;
     state?: any;
+    resultLoading?: boolean;
 }
 export declare type ClientSearchRef = {
     resetScrollPosition: () => void;

package/lib/plus/clinetSearch/index.js

@@ -52,6 +52,7 @@ var ClientSearch = (0, import_react.forwardRef)(
     hasMore,
     onLoadMore,
     state,
+    resultLoading,
     ...props
   }, ref) => {
     var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -85,12 +86,21 @@ var ClientSearch = (0, import_react.forwardRef)(
           ref: scrollContainerRef,
           id: "client-search_infinite-scroll",
           style: {
+            position: "relative",
             height: "calc(100% - 40px)",
             overflowY: "auto",
             overflowX: "hidden",
             display: "flex"
           }
         },
+        resultLoading && /* @__PURE__ */ import_react.default.createElement(
+          import_antd.Spin,
+          {
+            spinning: resultLoading || false,
+            className: "pisell-client-search-result-loading",
+            size: "large"
+          }
+        ),
         /* @__PURE__ */ import_react.default.createElement(
           import_InfiniteScroll.default,
           {

package/lib/plus/clinetSearch/index.less

@@ -93,3 +93,16 @@
     }
   }
 }
+
+.pisell-client-search-result-loading {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: rgba(255, 255, 255, 0.8);
+  z-index: 10;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.6.48",
+  "version": "6.6.49",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -61,10 +61,10 @@
     "styled-components": "^6.0.0-rc.3",
     "@react-spring/web": "^9.6.1",
     "@use-gesture/react": "^10.3.1",
-    "@pisell/date-picker": "3.0.7",
     "@pisell/utils": "3.0.2",
+    "@pisell/materials": "6.6.14",
     "@pisell/icon": "0.0.11",
-    "@pisell/materials": "6.6.14"
+    "@pisell/date-picker": "3.0.7"
   },
   "peerDependencies": {
     "react": "^18.0.0",