@pisell/private-materials 6.0.25 → 6.1.1

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

@@ -29,17 +29,22 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/booking/info/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
+  editSessionProduct: () => editSessionProduct,
   formatServiceListByTime: () => formatServiceListByTime,
   getIsBundleOrCombination: () => getIsBundleOrCombination,
   getMultiDayPrices: () => getMultiDayPrices,
   isBooking4Shop: () => isBooking4Shop,
   isDayBooking: () => isDayBooking,
   isInterval: () => isInterval,
+  isOpenAddTime: () => isOpenAddTime,
+  isShowAddTime: () => isShowAddTime,
   moveItemToFront: () => moveItemToFront,
   uniqueByField: () => uniqueByField
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
+var import_utils = require("../utils");
+var import_utils2 = require("../info2/service/addTimeModal/utils");
 var getIsBundleOrCombination = (productDetail) => {
   var _a;
   if ((_a = productDetail == null ? void 0 : productDetail.bundle_group) == null ? void 0 : _a.length) {
@@ -99,7 +104,46 @@ var isBooking4Shop = (shopId, renderType) => {
   if (renderType === "eventBooking") {
     return false;
   }
-  const booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8581, 8586];
+  const booking4Shops = [
+    8390,
+    1350,
+    1401,
+    3013,
+    7154,
+    7572,
+    7007,
+    8119,
+    7320,
+    7362,
+    6497,
+    6087,
+    6303,
+    6726,
+    8191,
+    6812,
+    6813,
+    6814,
+    7651,
+    8586,
+    8581,
+    9,
+    2155,
+    8030,
+    1749,
+    8194,
+    2327,
+    8609,
+    8610,
+    8782,
+    1285,
+    6124,
+    8727,
+    5538,
+    6988,
+    8872,
+    6930,
+    8824
+  ];
   return booking4Shops.includes(shopId);
 };
 function generateDateRange(start, end) {
@@ -125,14 +169,65 @@ var isDayBooking = (shopId) => {
   const dayBookingShops = [9];
   return dayBookingShops.includes(shopId);
 };
+var getAddTimeProducts = (state, currentService) => {
+  return (state.addTimeProducts || []).some(
+    (item) => (0, import_utils2.isUsableProduct)(item.add_time, currentService)
+  );
+};
+var isOpenAddTime = (state) => {
+  var _a, _b, _c;
+  const appointment_card = ((_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.information_tab) == null ? void 0 : _c.appointment_card) || {
+    quick_time: 1
+  };
+  if ((state == null ? void 0 : state.renderType) === "eventBooking") {
+    return false;
+  }
+  if (state == null ? void 0 : state.disabledEdit) {
+    return false;
+  }
+  if (appointment_card.quick_time !== 1) {
+    return false;
+  }
+  return true;
+};
+var isShowAddTime = (state, currentService) => {
+  if (!isOpenAddTime(state)) {
+    return false;
+  }
+  if ((0, import_utils.getIsEdit)(state)) {
+    return false;
+  }
+  if (!getAddTimeProducts(state, currentService)) {
+    return false;
+  }
+  return true;
+};
+var editSessionProduct = (cacheItem, session) => {
+  if ((0, import_utils.isSessionProduct)(cacheItem) && session) {
+    cacheItem._extend.start_date = session.start_at;
+    cacheItem._extend.startDate = session.start_at;
+    cacheItem._extend.start_time = session.start_time;
+    cacheItem._extend.end_time = session.end_time;
+    cacheItem._extend.end_date = session.end_at;
+    cacheItem._extend.endDate = session.end_at;
+    cacheItem._extend.duration = (0, import_utils.getDays)({ _extend: cacheItem._extend }, "minutes");
+    return {
+      duration: cacheItem._extend.duration,
+      start_time: session.start_time
+    };
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  editSessionProduct,
   formatServiceListByTime,
   getIsBundleOrCombination,
   getMultiDayPrices,
   isBooking4Shop,
   isDayBooking,
   isInterval,
+  isOpenAddTime,
+  isShowAddTime,
   moveItemToFront,
   uniqueByField
 });

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

@@ -56,6 +56,7 @@ var import_antd = require("antd");
 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 defaultModules = {
   client: 1,
   date: 1,
@@ -74,6 +75,8 @@ var Info = (0, import_model.Provider)((props) => {
     var _a2, _b2, _c2, _d2;
     return ((_d2 = (_c2 = (_b2 = (_a2 = modal.state) == null ? void 0 : _a2.bookingConfig) == null ? void 0 : _b2.config) == null ? void 0 : _c2.basic) == null ? void 0 : _d2.appointment_subject) || {};
   }, [(_d = (_c = (_b = (_a = modal.state) == null ? void 0 : _a.bookingConfig) == null ? void 0 : _b.config) == null ? void 0 : _c.basic) == null ? void 0 : _d.appointment_subject]);
+  const stateRef = (0, import_react.useRef)(globalState);
+  stateRef.current = globalState;
   const { createHeader, isBookingCreatePage, isBookingCreatePageCreateMode } = (0, import_useCreateBookingPageHeader.default)(globalState);
   (0, import_react.useEffect)(() => {
     document.body.id = "body";
@@ -90,7 +93,7 @@ var Info = (0, import_model.Provider)((props) => {
       });
     }
   }, []);
-  (0, import_react.useEffect)(() => {
+  (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m;
     const isFranchisee = (_d2 = (_c2 = (_b2 = (_a2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.businessUtils) == null ? void 0 : _c2.getAppByModal) == null ? void 0 : _d2.call(_c2, "franchisee");
     modal.dispatch({
@@ -153,6 +156,7 @@ var Info = (0, import_model.Provider)((props) => {
         modal.dispatch({
           type: "setService",
           payload: {
+            ...stateRef.current.service,
             resourcesOrigin: bookingResourceList.list || [],
             resourcesOriginMap: bookingResourceList.listMap
           }
@@ -161,14 +165,16 @@ var Info = (0, import_model.Provider)((props) => {
     }
     try {
       setTimeout(async () => {
+        var _a2, _b2, _c2, _d2;
         let data = await (0, import_serve.getResourceList)({
           date: currentDate
-        });
+        }, (_d2 = (_c2 = (_b2 = (_a2 = stateRef == null ? void 0 : stateRef.current) == null ? void 0 : _a2.service) == null ? void 0 : _b2.value) == null ? void 0 : _c2.map) == null ? void 0 : _d2.call(_c2, (item) => item == null ? void 0 : item.booking_id));
         data.date = currentDate;
         localStorage.setItem("bookingResourceList", JSON.stringify(data));
         modal.dispatch({
           type: "setService",
           payload: {
+            ...stateRef.current.service,
             resourcesOrigin: data.list || [],
             resourcesOriginMap: data.listMap
           }
@@ -178,11 +184,13 @@ var Info = (0, import_model.Provider)((props) => {
       console.log(err, "err");
     }
   };
-  (0, import_react.useEffect)(() => {
+  (0, import_ahooks.useDebounceEffect)(() => {
     if (currentDate) {
       getResourcesData();
     }
-  }, [currentDate]);
+  }, [currentDate], {
+    wait: 300
+  });
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, !!modal.state.setGlobalState ? /* @__PURE__ */ import_react.default.createElement(
     import_tabPane.default,
     {

package/lib/components/booking/info2/serve.d.ts

@@ -1,5 +1,5 @@
-export declare const getResourceList: (params: any) => Promise<{
-    list: any;
+export declare const getResourceList: (params: any, bookingId?: number[]) => Promise<{
+    list: any[];
     listMap: any;
 }>;
 export declare const createBookings: (params: any) => Promise<any>;

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

@@ -25,17 +25,10 @@ __export(serve_exports, {
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../utils");
-var import_mock = require("../mock");
-var getResourceList = async (params) => {
+var import_utils2 = require("./utils");
+var getResourceList = async (params, bookingId = []) => {
   let { data } = await import_utils.request.getRequest().get(`/shop/schedule/resource/list`, params);
-  const resourceList = (data || {}).concat([(0, import_mock.getNoResource2)({})]);
-  return {
-    list: resourceList,
-    listMap: resourceList.reduce((prev, item) => {
-      prev[item.id] = item;
-      return prev;
-    }, {})
-  };
+  return (0, import_utils2.getFormatResourceListAndMap)(data, bookingId);
 };
 var createBookings = async (params) => {
   let { data } = await import_utils.request.getRequest().post(`/shop/v1.1/order/appointment`, params);

package/lib/components/booking/info2/service/actions/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../../../info/service/actions/index.less';
 declare const Actions: ({ currentService }: {
     currentService: any;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {

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

@@ -47,6 +47,7 @@ var import_utils2 = require("./utils");
 var import_utils3 = require("../../../utils");
 var import_utils4 = require("@pisell/utils");
 var import_ahooks = require("ahooks");
+var import_utils5 = require("../../../../ticketBooking/utils");
 var shopList = [
   2886,
   4422,
@@ -64,7 +65,7 @@ var shopList = [
   6305
 ];
 var Info = (props) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f;
   const { onEdit, drawerProps, renderMode } = props;
   const [search, setSearch] = (0, import_react.useState)("");
   let { state, dispatch } = (0, import_react.useContext)(import_model.Context);
@@ -74,6 +75,11 @@ var Info = (props) => {
   state = state || (props == null ? void 0 : props.state);
   dispatch = dispatch || (props == null ? void 0 : props.dispatch);
   import_utils3.request.setRequest(context.appHelper.utils.request);
+  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;
+  }, [(_b = (_a = state.client) == null ? void 0 : _a.value) == null ? void 0 : _b.id]);
+  console.log(customerId, "customerIdcustomerId");
   const setDefaultService = async (list) => {
     if (state.renderType !== "eventBooking") {
       return;
@@ -138,19 +144,22 @@ var Info = (props) => {
     let data = await state.apis.getServices({
       skip: 1,
       num: 500,
-      extension_type: state.renderType === "eventBooking" ? void 0 : ["product_appointment", "appointment_ticket", "service_product"],
-      with: ["category"],
+      extension_type: state.renderType === "eventBooking" ? void 0 : [
+        "product_appointment",
+        "appointment_ticket",
+        "service_product",
+        "session_product",
+        "session_ticket"
+      ],
+      with: ["category", "resourceRelation"],
       ids: state.renderType === "eventBooking" ? (_c2 = state.eventOtherParams) == null ? void 0 : _c2.productIds : void 0,
       open_quotation: 1,
       with_schedule: 1,
       with_count: ["bundleGroup", "optionGroup"],
       order_by_string: "sort:desc",
       status: "published",
-      ...state.isBookingCreatePage ? { schedule_date: params == null ? void 0 : params.schedule_date } : {
-        _config: {
-          useCache: true
-        }
-      }
+      schedule_date: params == null ? void 0 : params.schedule_date,
+      customer_id: params == null ? void 0 : params.customer_id
     });
     setLoading(false);
     if (!state.service.addModal) {
@@ -178,7 +187,10 @@ var Info = (props) => {
     }
   };
   const handleSelectProduct = (item, type) => {
-    const isEject = type === "detail" || item.bundle_group_count > 0;
+    var _a2, _b2;
+    const isSession = (0, import_utils3.isSessionProduct)(item);
+    const isEject = (0, import_utils3.getIsEject)(item, type);
+    const isOnlySession = (0, import_utils3.getIsOnlySession)(item);
     let lock = false;
     state.action({
       type: "pisell1.handleOpenProductModal",
@@ -186,15 +198,19 @@ var Info = (props) => {
         id: item.id,
         date: state.date.value.format("YYYY-MM-DD"),
         showConfig: {
-          option: false,
-          session: false,
-          variant: false,
-          package: true
+          option: true,
+          session: isSession,
+          variant: true,
+          package: true,
+          number: (0, import_utils5.getIsShowNumber)(item, state)
         },
-        is_eject: isEject ? 1 : 0
+        is_eject: isEject ? 1 : 0,
+        isOnlySession,
+        isOS: isSession,
+        customer_id: (_b2 = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.id
       },
       callback: (e, extension_type, detail) => {
-        var _a2;
+        var _a3;
         if (lock) {
           return;
         }
@@ -202,26 +218,30 @@ var Info = (props) => {
         setTimeout(() => {
           lock = false;
         }, 2e3);
+        const _detail = detail || item;
+        const other = JSON.parse(JSON.stringify(e));
+        other.session = e.session;
         let cacheItem = {
-          ...detail || item,
+          ..._detail,
           product_id: item.id,
           _id: (0, import_utils4.getUniqueId)(),
           _key: e.key,
           _extend: {
             start_date: state.date.value,
-            quantity: 1,
-            price: item.price,
+            quantity: (e == null ? void 0 : e.quantity) || 1,
+            price: _detail.price,
             product_name: item.title,
-            other: JSON.parse(JSON.stringify(e))
+            other
           },
           new: 1
         };
+        console.log(cacheItem, "cacheItem", e);
         let _total = (0, import_utils3.getProductTotalPrice)(cacheItem);
         cacheItem._extend.total = _total;
         cacheItem._extend.origin_total = _total;
         const _isEdit = !!state.service.cacheItem;
         if (_isEdit) {
-          cacheItem._id = (_a2 = state.service.cacheItem) == null ? void 0 : _a2._id;
+          cacheItem._id = (_a3 = state.service.cacheItem) == null ? void 0 : _a3._id;
           cacheItem.new = 0;
         }
         if (renderMode === "current") {
@@ -233,12 +253,22 @@ var Info = (props) => {
         }
         if (cacheItem.autoClose) {
           cacheItem.autoClose = false;
-          let _list = [...state.service.value, cacheItem];
+          let newValue = [...state.service.value];
+          if (!newValue.some((item2) => item2._id === cacheItem._id)) {
+            newValue.push(cacheItem);
+          } else {
+            newValue = newValue.map((item2) => {
+              if (item2._id === cacheItem._id) {
+                return { ...cacheItem, new: 0 };
+              }
+              return item2;
+            });
+          }
           dispatch({
             type: "setService",
             payload: {
               addModal: false,
-              value: _list,
+              value: newValue,
               edit: true,
               changeService: false
             }
@@ -268,49 +298,50 @@ var Info = (props) => {
       _list,
       search ? (item) => isIncludes(item.title) : void 0
     );
-  }, [search, (_a = state.service) == null ? void 0 : _a.services]);
+  }, [search, (_c = state.service) == null ? void 0 : _c.services]);
   const isService = (0, import_react.useMemo)(() => {
     return state.service.value.length > 0;
   }, [state.service.value]);
   (0, import_react.useEffect)(() => {
-    var _a2, _b2, _c2, _d2, _e, _f, _g;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g, _h, _i, _j;
     if (shopList.includes(
-      (_e = (_d2 = (_c2 = (_b2 = (_a2 = context.appHelper.utils.store) == null ? void 0 : _a2.getState) == null ? void 0 : _b2.call(_a2)) == null ? void 0 : _c2.global) == null ? void 0 : _d2.globalConfig) == null ? void 0 : _e.id
+      ((_c2 = (_b2 = (_a2 = context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.getData) == null ? void 0 : _c2.call(_b2, "shop_id")) || ((_h = (_g = (_f2 = (_e2 = (_d2 = context.appHelper.utils.store) == null ? void 0 : _d2.getState) == null ? void 0 : _e2.call(_d2)) == null ? void 0 : _f2.global) == null ? void 0 : _g.globalConfig) == null ? void 0 : _h.id)
     ) || state.closeAutoOpenService) {
       return;
     }
-    if (state.modalOpen && !state.bookingId && state.renderType !== "eventBooking" && ((_g = (_f = state.service) == null ? void 0 : _f.value) == null ? void 0 : _g.length) === 0) {
+    if (state.modalOpen && !state.bookingId && state.renderType !== "eventBooking" && ((_j = (_i = state.service) == null ? void 0 : _i.value) == null ? void 0 : _j.length) === 0) {
       setTimeout(() => {
         handleSelectService();
       }, 10);
     }
-  }, [state.modalOpen, state.bookingId, (_b = state.service) == null ? void 0 : _b.value]);
+  }, [state.modalOpen, state.bookingId, (_d = state.service) == null ? void 0 : _d.value]);
   const showAddButton = (0, import_react.useMemo)(() => {
     return !state.disabledEdit && !state.channelDisabledEdit;
   }, [state.disabledEdit, state.channelDisabledEdit]);
+  const currentDate = (0, import_react.useMemo)(() => {
+    return state.date.value.format("YYYY-MM-DD");
+  }, [state.date.value]);
   (0, import_ahooks.useUpdateEffect)(() => {
     if (state.service.addModal) {
-      getServices();
+      getServices({ schedule_date: currentDate, customer_id: customerId });
       setSearch("");
     }
-  }, [state.service.addModal]);
-  const currentDate = (0, import_react.useMemo)(() => {
-    return state.date.value.format("YYYY-MM-DD");
-  }, [state.date.value]);
+  }, [state.service.addModal, currentDate, customerId]);
   (0, import_react.useEffect)(() => {
     if (renderMode === "current") {
-      getServices({ schedule_date: currentDate });
+      getServices({ schedule_date: currentDate, customer_id: customerId });
     }
-  }, [renderMode, currentDate]);
+  }, [renderMode, currentDate, customerId]);
   (0, import_react.useEffect)(() => {
     if (state.renderType === "eventBooking" && state.modalOpen) {
-      getServices();
+      getServices({ schedule_date: currentDate, customer_id: customerId });
     }
-  }, [state.renderType, state.modalOpen]);
+  }, [state.renderType, state.modalOpen, currentDate, customerId]);
   const addButton = (0, import_react.useMemo)(() => {
     if (state.isBookingCreatePage) {
       return /* @__PURE__ */ import_react.default.createElement("div", { style: { height: 20 } });
     }
+    return null;
     if (state.renderType === "eventBooking") {
       return isService ? /* @__PURE__ */ import_react.default.createElement("div", { style: { height: 20 } }) : /* @__PURE__ */ import_react.default.createElement(
         import_addButton.default,
@@ -376,7 +407,7 @@ var Info = (props) => {
       content
     );
   }
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, ((_d = (_c = state.service) == null ? void 0 : _c.cacheItem) == null ? void 0 : _d.autoClose) && /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { loading: true, active: true, round: true }), addButton, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, ((_f = (_e = state.service) == null ? void 0 : _e.cacheItem) == null ? void 0 : _f.autoClose) && /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { loading: true, active: true, round: true }), addButton, /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {
       titleNoWrap: true,

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

@@ -55,11 +55,20 @@ export declare const getTimeObj: ({ cacheItem, useStartTime, currentResource, st
  * @Author: zhiwei.Wang
  * @Date: 2024-01-09 13:38
  */
-export declare const formatResources: ({ cacheItem, resourcesOrigin }: any) => {
-    list: any[];
+export declare const formatResources: ({ cacheItem, resourcesOrigin, id }: any) => {
+    list: any;
     maps: any;
 };
 export declare const setDefaultResource: ({ cacheItem, resources }: any) => any;
+/**
+ * @title: 设置默认容量
+ * @description:
+ * @param {any} param1
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-09-19 20:26
+ */
+export declare const setDefaultCapacitys: ({ capacitys, cacheItem }: any) => any;
 /**
  * @title: 预生成服务的 extend
  * @description:
@@ -68,4 +77,12 @@ export declare const setDefaultResource: ({ cacheItem, resources }: any) => any;
  * @Author: zhiwei.Wang
  * @Date: 2024-06-01 13:25
  */
-export declare const getProductExtend: ({ cacheItem, state }: any) => any;
+export declare const getProductExtend: ({ cacheItem, state, isDisabledTime }: any) => any;
+/**
+ * @title: 格式化服务列表
+ * @description: 后端列表返回的product_resource.resources 的optional_resource等不是最新数据
+ * 使用with resourceRelation后 返回的resource_relation是实时数据
+ * 这里做一次转换
+ * @param list
+ */
+export declare const transServiceList: (list: any[]) => any[];