@pisell/private-materials 6.6.2 → 6.7.2

package/lib/components/booking/info2/cartClientCard/index.js

@@ -36,7 +36,6 @@ var import_react = __toESM(require("react"));
 var import_ahooks = require("ahooks");
 var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
-var import_lodash = require("lodash");
 var import_locales = __toESM(require("./locales"));
 var import_clientCard = __toESM(require("../../../../plus/clientCard"));
 var import_clinetSearch = __toESM(require("../../../../plus/clinetSearch"));
@@ -76,7 +75,6 @@ var CartClientCard = (0, import_react.forwardRef)(({
     ((_c = (_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.storage) == null ? void 0 : _c.get("umi_locale")) || "en"
   );
   const changeCustomerToGlobalState = (0, import_ahooks.useMemoizedFn)((value) => {
-    var _a2, _b2;
     dispatch({
       type: "setClient",
       payload: {
@@ -84,14 +82,6 @@ var CartClientCard = (0, import_react.forwardRef)(({
         edit: true
       }
     });
-    if ((_b2 = (_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) {
-      dispatch({
-        type: "setService",
-        payload: {
-          value: state.service.value.map((item) => ({ ...item, _extend: { ...item._extend, holder_id: [] } }))
-        }
-      });
-    }
   });
   const {
     customers,
@@ -158,34 +148,10 @@ var CartClientCard = (0, import_react.forwardRef)(({
     selectCustomer(null);
   };
   const handleViewClient = (data) => {
-    const newSelectedCustomer = (0, import_lodash.cloneDeep)(selectedCustomer);
     state.action({
       type: "pisell1.handleOpenCustomerModal",
       data: { id: state.client.value.id },
       callback: (data2) => {
-        console.log("data>>>>>", data2);
-        const _selectedCustomer = {
-          ...newSelectedCustomer || {},
-          display_name: (data2 == null ? void 0 : data2.display_name) || "",
-          email: (data2 == null ? void 0 : data2.email) || "",
-          phone: (data2 == null ? void 0 : data2.phone) || "",
-          nickname: (data2 == null ? void 0 : data2.nickname) || "",
-          country_calling_code: (data2 == null ? void 0 : data2.country_calling_code) || "",
-          first_name: (data2 == null ? void 0 : data2.first_name) || "",
-          last_name: (data2 == null ? void 0 : data2.last_name) || "",
-          contacts_info: (data2 == null ? void 0 : data2.contacts_info) || null
-        };
-        selectCustomer(_selectedCustomer);
-        if (JSON.stringify((newSelectedCustomer == null ? void 0 : newSelectedCustomer.contacts_info) || {}) !== JSON.stringify((data2 == null ? void 0 : data2.contacts_info) || {})) {
-          dispatch({
-            type: "setContactsInfo",
-            payload: {
-              value: (data2 == null ? void 0 : data2.contacts_info) || {},
-              client_id: data2 == null ? void 0 : data2.id
-            }
-          });
-        }
-        handleSearchClient("");
       }
     });
   };
@@ -271,6 +237,11 @@ var CartClientCard = (0, import_react.forwardRef)(({
       (0, import_utils3.setHandleSetClient)(handleSetClient);
     }
   }, [isActive]);
+  (0, import_react.useEffect)(() => {
+    return () => {
+      (0, import_utils3.setHandleSetClient)(null);
+    };
+  }, [isActive]);
   const tags = (0, import_react.useMemo)(() => {
     var _a2;
     if (!selectedCustomer) return;

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

@@ -58,9 +58,9 @@ var import_classnames = __toESM(require("classnames"));
 var import_useCreateBookingPageHeader = __toESM(require("../hooks/useCreateBookingPageHeader"));
 var import_locales2 = require("../../../utils/locales");
 var import_ahooks = require("ahooks");
+var import_contactInfoMode = __toESM(require("./service/contactInfoMode"));
 var import_cartClientCard = __toESM(require("./cartClientCard"));
 var import_materials = require("@pisell/materials");
-var import_contactInfoMode = __toESM(require("./service/contactInfoMode"));
 var defaultModules = {
   client: 1,
   date: 1,
@@ -299,12 +299,7 @@ var Info = (0, import_model.Provider)((props) => {
       dispatch: modal.dispatch,
       source: "info"
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, createHeader, /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info-client-line" }, modules.client ? (globalState == null ? void 0 : globalState.isBookingTicket2) ? /* @__PURE__ */ import_react.default.createElement("div", { style: { flex: 1, overflow: "hidden" } }, /* @__PURE__ */ import_react.default.createElement(
-      import_cartClientCard.default,
-      {
-        clientCardProps: { dropdown: dropdownProps }
-      }
-    )) : /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, (globalState == null ? void 0 : globalState.isBookingTicket2) ? /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, createHeader, /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info-client-line" }, modules.client ? (globalState == null ? void 0 : globalState.isBookingTicket2) ? /* @__PURE__ */ import_react.default.createElement("div", { style: { flex: 1, overflow: "hidden" } }, /* @__PURE__ */ import_react.default.createElement(import_cartClientCard.default, { clientCardProps: { dropdown: dropdownProps } })) : /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, (globalState == null ? void 0 : globalState.isBookingTicket2) ? /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: "booking-info-client-line-code",

package/lib/components/booking/info2/serve.js

@@ -27,7 +27,12 @@ module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../utils");
 var import_utils2 = require("./utils");
 var getResourceList = async (params, bookingId = []) => {
-  let { data } = await import_utils.request.getRequest().get(`/shop/schedule/resource/list`, params);
+  let { data } = await import_utils.request.getRequest().get(`/shop/schedule/resource/list`, params, {
+    cache: {
+      mode: "remote_local",
+      type: "indexDB"
+    }
+  });
   return (0, import_utils2.getFormatResourceListAndMap)(data, bookingId);
 };
 var createBookings = async (params) => {

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

@@ -49,7 +49,6 @@ var import_utils4 = require("@pisell/utils");
 var import_ahooks = require("ahooks");
 var import_utils5 = require("../../../info/service2/utils");
 var import_utils6 = require("../../../../ticketBooking/utils");
-var import_utils7 = require("../../../info/service2/Group/utils");
 var shopList = [
   2886,
   4422,
@@ -224,7 +223,7 @@ var Info = (props) => {
         isOS: isSession,
         customer_id: (_c2 = (_b2 = state.client) == null ? void 0 : _b2.value) == null ? void 0 : _c2.id
       },
-      callback: async (e, extension_type, detail) => {
+      callback: (e, extension_type, detail) => {
         var _a3, _b3;
         if (lock) {
           return;
@@ -250,10 +249,7 @@ var Info = (props) => {
           },
           new: 1
         };
-        const isMultiDay = (0, import_utils2.isMultiDayProduct)(cacheItem);
-        if (isMultiDay) {
-          cacheItem._extend.end_date = state.date.value.add(1, "day");
-        }
+        console.log(cacheItem, "cacheItem", e);
         let _total = (0, import_utils3.getProductTotalPrice)(cacheItem);
         cacheItem._extend.total = _total;
         cacheItem._extend.origin_total = _total;
@@ -266,19 +262,7 @@ var Info = (props) => {
           cacheItem.currentDefaultTime = state.date.value.format("HH:mm");
         }
         cacheItem = (0, import_utils2.getProductExtend)({ cacheItem, state });
-        const getMultiDayCacheItem = async (isConcatBookings) => {
-          cacheItem = await (0, import_utils2.getMultiDay)({
-            start_date: cacheItem._extend.start_date,
-            end_date: cacheItem._extend.end_date,
-            state,
-            cacheItem
-          });
-          cacheItem = (0, import_utils7.createBookingItemsByGroup)(cacheItem);
-          if (isConcatBookings) {
-            cacheItem = (0, import_utils7.concatBookings)(cacheItem);
-          }
-        };
-        if (state.renderType === "eventBooking" || isMultiDay) {
+        if (state.renderType === "eventBooking") {
           cacheItem.autoClose = false;
         }
         if (cacheItem.autoClose) {
@@ -305,9 +289,6 @@ var Info = (props) => {
           });
         } else {
           (_b3 = window.openBookingEditModal) == null ? void 0 : _b3.call(window);
-          if (isMultiDay) {
-            await getMultiDayCacheItem(true);
-          }
           dispatch({
             type: "setService",
             payload: {

package/lib/components/booking/info2/service/addService/utils.d.ts

@@ -79,14 +79,6 @@ export declare const setDefaultCapacitys: ({ capacitys, cacheItem }: any) => any
  * @Date: 2024-09-19 20:23
  */
 export declare const getResourceByIds: (resourcesOriginMap: any, cacheItem: any, extraParams?: any) => any[];
-/**
- * @title: 是否是跨日商品
- * @description:
- * @param {any} cacheItem
- * @return {*}
- */
-export declare const isMultiDayProduct: (product: any) => boolean;
-export declare const getMultiDay: ({ start_date, end_date, state, cacheItem, }: any) => Promise<any>;
 /**
  * @title: 预生成服务的 extend
  * @description:

package/lib/components/booking/info2/service/addService/utils.js

@@ -32,13 +32,11 @@ __export(utils_exports, {
   formatResources: () => formatResources,
   getDurationProps: () => getDurationProps,
   getFlexibleOption: () => getFlexibleOption,
-  getMultiDay: () => getMultiDay,
   getProductExtend: () => getProductExtend,
   getResourceByIds: () => getResourceByIds,
   getTimeObj: () => getTimeObj,
   getTimeSlices: () => getTimeSlices,
   getUsableTime: () => getUsableTime,
-  isMultiDayProduct: () => isMultiDayProduct,
   setDefaultCapacitys: () => setDefaultCapacitys,
   setDefaultResource: () => setDefaultResource,
   transServiceList: () => transServiceList
@@ -53,8 +51,6 @@ var import_AlertTriangle = __toESM(require("@pisell/icon/es/AlertTriangle"));
 var import_utils3 = require("../editService/utils");
 var import_mock = require("../../../mock");
 var import_lodash = require("lodash");
-var import_utils4 = require("../../../info/service2/utils");
-var import_utils5 = require("../../../info/utils");
 var getUsableTime = (cacheItem) => {
   try {
     let items = [];
@@ -142,7 +138,6 @@ var getTimeObj = ({
   durationProps
 }) => {
   var _a, _b, _c;
-  const isMultiDay = isMultiDayProduct(cacheItem);
   const flexibleOption = getFlexibleOption({
     cacheItem,
     useStartTime,
@@ -153,8 +148,7 @@ var getTimeObj = ({
   });
   let obj = (0, import_utils.sliceDayIntoFiveMinutes)(
     (_c = (_b = (_a = state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.service_time,
-    import_utils2.locales.locale,
-    isMultiDay
+    import_utils2.locales.locale
   );
   let timeSlices = [...obj.timeSlices];
   let durationSlicesBasedOnTime = [...obj.durationSlicesBasedOnTime];
@@ -163,7 +157,7 @@ var getTimeObj = ({
   }
   if (useDuration && !durationSlicesBasedOnTime.some((d) => d.value === useDuration)) {
     durationSlicesBasedOnTime.unshift({
-      label: (0, import_utils.getDiscountTime)(useDuration, isMultiDay),
+      label: (0, import_utils.getDiscountTime)(useDuration),
       value: useDuration,
       //@ts-ignore
       disabled: true
@@ -401,44 +395,13 @@ var getIsAutoClose = (cacheItem) => {
     }
   );
 };
-var isMultiDayProduct = (product) => {
-  var _a;
-  return ((_a = product == null ? void 0 : product.duration) == null ? void 0 : _a.type) === "days";
-};
-var getMultiDay = async ({
-  start_date,
-  end_date,
-  state,
-  cacheItem
-}) => {
-  let _cacheItem = cacheItem || state.service.cacheItem;
-  if (isMultiDayProduct(_cacheItem)) {
-    const { multiDayPrices, price } = await (0, import_utils4.updateAppointmentServicePrice)(
-      state,
-      {
-        start_date,
-        end_date,
-        product_id: _cacheItem.product_id
-      }
-    );
-    _cacheItem._extend.multiDayPrices = (0, import_utils5.getMultiDayPrices)(multiDayPrices || []);
-    if (!(multiDayPrices == null ? void 0 : multiDayPrices.length)) {
-      _cacheItem._extend.price = price;
-    }
-    return _cacheItem;
-  }
-  return _cacheItem;
-};
 var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f, _g;
+  console.time("console.time getProductExtend");
   const isNew = cacheItem.new || !cacheItem._extend.endDate;
   let _cacheItem = { ...cacheItem };
   const resourcesOriginMap = state.service.resourcesOriginMap || {};
   _cacheItem._data = {};
-  if (isMultiDayProduct(cacheItem)) {
-    _cacheItem._extend.holder_id = ((_a = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a.holder_id) || [];
-    _cacheItem._extend.sub_type = "days";
-  }
   if (isNew) {
     _cacheItem._data.timeObj = getTimeObj({
       cacheItem,
@@ -456,7 +419,7 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
       cacheItem,
       {
         //  此数据用来控制 该商品所展示的资源是自身关联的,  还是全部的
-        resourceTab: (_c = (_b = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _b.config) == null ? void 0 : _c.resource_tab,
+        resourceTab: (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.resource_tab,
         resourcesOrigin: state.service.resourcesOrigin
       }
     );
@@ -482,8 +445,10 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
         state
       });
       if ((0, import_utils.getDuration)(_cacheItem == null ? void 0 : _cacheItem.duration) === "flexible") {
-        _cacheItem._extend.duration = (_f = (_e = (_d = _cacheItem._data.timeObj) == null ? void 0 : _d.durationSlicesBasedOnTime) == null ? void 0 : _e[0]) == null ? void 0 : _f.value;
-        const { startDate, endDate } = (0, import_utils.getServiceTimes)(_cacheItem);
+        _cacheItem._extend.duration = (_e = (_d = (_c = _cacheItem._data.timeObj) == null ? void 0 : _c.durationSlicesBasedOnTime) == null ? void 0 : _d[0]) == null ? void 0 : _e.value;
+        const { startDate, endDate } = (0, import_utils.getServiceTimes)({
+          _extend: _cacheItem._extend
+        });
         _cacheItem._extend.endDate = endDate;
       }
     }
@@ -514,7 +479,7 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
         {
           extraResources,
           //  此数据用来控制 该商品所展示的资源是自身关联的,  还是全部的
-          resourceTab: (_h = (_g = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _g.config) == null ? void 0 : _h.resource_tab,
+          resourceTab: (_g = (_f = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _f.config) == null ? void 0 : _g.resource_tab,
           resourcesOrigin: state.service.resourcesOrigin
         }
       );
@@ -534,7 +499,7 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
       state
     });
   }
-  console.log("_cacheItem_cacheItem", _cacheItem);
+  console.timeEnd("console.time getProductExtend");
   return _cacheItem;
 };
 var transServiceList = (list) => {
@@ -554,13 +519,11 @@ var transServiceList = (list) => {
   formatResources,
   getDurationProps,
   getFlexibleOption,
-  getMultiDay,
   getProductExtend,
   getResourceByIds,
   getTimeObj,
   getTimeSlices,
   getUsableTime,
-  isMultiDayProduct,
   setDefaultCapacitys,
   setDefaultResource,
   transServiceList