@pisell/private-materials 3.0.163 → 3.0.165

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

@@ -39,9 +39,10 @@ var import_editService = __toESM(require("./editService"));
 var import_index = require("./index.less");
 var import_serviceList = __toESM(require("./serviceList"));
 var import_addTimeModal = __toESM(require("./addTimeModal"));
+var import_useClearCart = __toESM(require("../../hooks/useClearCart"));
 var Service = () => {
   var _a, _b;
-  const { state } = (0, import_react.useContext)(import_model.Context);
+  const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const detailRef = (0, import_react.useRef)();
   (0, import_react.useEffect)(() => {
     document.body.id = "body";
@@ -70,6 +71,7 @@ var Service = () => {
       (_b2 = (_a2 = detailRef.current) == null ? void 0 : _a2.init) == null ? void 0 : _b2.call(_a2, cacheItem);
     }, 100);
   };
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-wrap" }, /* @__PURE__ */ import_react.default.createElement(import_serviceList.default, { onEdit: handleEdit }), /* @__PURE__ */ import_react.default.createElement(import_addService.default, { onEdit: handleEdit })), /* @__PURE__ */ import_react.default.createElement(import_editService.default, { ref: detailRef }), showAddTimeModal && /* @__PURE__ */ import_react.default.createElement(import_addTimeModal.default, null));
+  const clearCart = (0, import_useClearCart.default)(state, dispatch);
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-wrap" }, clearCart, /* @__PURE__ */ import_react.default.createElement(import_serviceList.default, { onEdit: handleEdit }), /* @__PURE__ */ import_react.default.createElement(import_addService.default, { onEdit: handleEdit })), /* @__PURE__ */ import_react.default.createElement(import_editService.default, { ref: detailRef }), showAddTimeModal && /* @__PURE__ */ import_react.default.createElement(import_addTimeModal.default, null));
 };
 var service_default = import_react.default.memo(Service);

package/lib/components/booking/info/service/index.less

@@ -1,3 +1,21 @@
 .pisell-lowcode__booking-service-wrap {
   margin-top: 16px;
+  .pisell-lowcode__booking-service-clear-btn {
+    cursor: pointer;
+    margin-top: -12px;
+    color: var(--Blue-700, #175CD3);
+    font-weight: 600;
+    line-height: 24px; /* 150% */
+    display: flex;
+    align-items: center;
+    margin-bottom: 4px;
+    padding: 12px 0;
+    .anticon {
+      font-size: 18px;
+      margin-right: 6px;
+    }
+  }
+  .pisell-lowcode__booking-service-clear-btn-disabled {
+    color: #98A2B3
+  }
 }

package/lib/components/booking/info/service/serviceItem/index.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
-import "./index.less";
-declare const ServiceItem: ({ d, handleEditService, state, handleLike, resourceItem, errorMessage, }: any) => React.JSX.Element;
+import React from 'react';
+import './index.less';
+declare const ServiceItem: ({ d, handleEditService, state, handleLike, resourceItem, errorMessage, handleDeleteService, }: any) => React.JSX.Element;
 export default ServiceItem;

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

@@ -41,13 +41,15 @@ var import_utils3 = require("../../../components/collapsibleList/utils");
 var import_antd = require("antd");
 var import_actions = __toESM(require("../actions"));
 var import_index = require("./index.less");
+var import_materials = require("@pisell/materials");
 var ServiceItem = ({
   d,
   handleEditService,
   state,
   handleLike,
   resourceItem,
-  errorMessage
+  errorMessage,
+  handleDeleteService
 }) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   let resourceName = (resourceItem == null ? void 0 : resourceItem.labelText) || d.relation_form_name;
@@ -64,6 +66,17 @@ var ServiceItem = ({
         handleEditService(d);
       }
     },
+    !state.channelDisabledEdit && /* @__PURE__ */ import_react.default.createElement(
+      "div",
+      {
+        className: "pisell-lowcode__booking-service-item-delete",
+        onClick: (e) => {
+          e.stopPropagation();
+          handleDeleteService(d);
+        }
+      },
+      /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "text", icon: /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-trash-01" }) })
+    ),
     d.id ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-title" }, d.title) : null,
     d._extend ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, state.renderType !== "eventBooking" && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-date" }, (0, import_utils.getServiceTime)(d, state.date.value)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-technician" }, d._extend.resource ? /* @__PURE__ */ import_react.default.createElement(
       import_like.default,

package/lib/components/booking/info/service/serviceItem/index.less

@@ -94,6 +94,14 @@
     margin: 0 -20px -16px;
     border-radius: 0 0 8px 8px;
   }
+
+  .pisell-lowcode__booking-service-item-delete {
+    position: absolute;
+    padding: 10px;
+    top: 0;
+    right: 0;
+    cursor: pointer;
+  }
 }
 
 .pisell-lowcode__booking-service-item-relation-details {

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

@@ -60,6 +60,22 @@ var ServiceList = ({ onEdit }) => {
     });
     onEdit == null ? void 0 : onEdit({ ...item, new: 0 });
   };
+  const handleDeleteService = (item) => {
+    if (state.disabledEdit || state.disableEventBookingEdit || state.channelDisabledEdit) {
+      return;
+    }
+    let _list = [...state.service.value];
+    _list = _list.filter((d) => d._id !== item._id);
+    dispatch({
+      type: "setService",
+      payload: {
+        editModal: false,
+        value: _list,
+        edit: true,
+        cacheItem: null
+      }
+    });
+  };
   const getResourceItem = (0, import_react.useCallback)(
     (id) => {
       if (id === 0) {
@@ -123,7 +139,8 @@ var ServiceList = ({ onEdit }) => {
         d,
         handleEditService,
         state,
-        handleLike
+        handleLike,
+        handleDeleteService
       }
     );
   }));

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

@@ -53,6 +53,8 @@ var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext")
 var import_notes = __toESM(require("../info/notes"));
 var import_info = require("../info/index.less");
 var import_antd = require("antd");
+var import_classnames = __toESM(require("classnames"));
+var import_useCreateBookingPageHeader = __toESM(require("../hooks/useCreateBookingPageHeader"));
 var defaultModules = {
   client: 1,
   date: 1,
@@ -71,6 +73,7 @@ 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 { createHeader, isBookingCreatePage, isBookingCreatePageCreateMode } = (0, import_useCreateBookingPageHeader.default)(globalState);
   (0, import_react.useEffect)(() => {
     document.body.id = "body";
     if (props.setState) {
@@ -195,9 +198,12 @@ var Info = (0, import_model.Provider)((props) => {
       style: {
         height: ((_k = (_j = context == null ? void 0 : context.appHelper) == null ? void 0 : _j.utils) == null ? void 0 : _k.isMobile) ? "100%" : "100vh"
       },
-      bodyClassName: "booking-info-warp"
+      bodyClassName: (0, import_classnames.default)("booking-info-warp", {
+        ["create-booking-page-info-wrap"]: isBookingCreatePage,
+        ["create-booking-page-info-wrap-create"]: isBookingCreatePageCreateMode
+      })
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, modules.client ? /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, modules.holder && !((_l = modal.state) == null ? void 0 : _l.disabledEdit) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, params.type === "form" ? /* @__PURE__ */ import_react.default.createElement(import_pet.default, null) : null) : null, modules.date ? /* @__PURE__ */ import_react.default.createElement(import_date.default, null) : null, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, createHeader, modules.client ? /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, modules.holder && !((_l = modal.state) == null ? void 0 : _l.disabledEdit) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, params.type === "form" ? /* @__PURE__ */ import_react.default.createElement(import_pet.default, null) : null) : null, modules.date ? /* @__PURE__ */ import_react.default.createElement(import_date.default, null) : null, /* @__PURE__ */ import_react.default.createElement(
       import_antd.Skeleton,
       {
         loading: globalState.loading,

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

@@ -1,6 +1,12 @@
 import React from 'react';
+import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
-declare const Info: ({ onEdit }: {
+interface AddServiceProps {
     onEdit: any;
-}) => React.JSX.Element;
+    dispatch?: any;
+    state?: any;
+    drawerProps?: PisellDrawerProps;
+    renderMode?: 'current' | 'drawer';
+}
+declare const Info: (props: AddServiceProps) => React.JSX.Element;
 export default Info;

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

@@ -63,13 +63,16 @@ var shopList = [
   6848,
   6305
 ];
-var Info = ({ onEdit }) => {
+var Info = (props) => {
   var _a, _b, _c, _d;
+  const { onEdit, drawerProps, renderMode } = props;
   const [search, setSearch] = (0, import_react.useState)("");
-  const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
+  let { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const searchRef = (0, import_react.useRef)();
   const context = (0, import_useEngineContext.default)();
+  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 setDefaultService = async (list) => {
     if (state.renderType !== "eventBooking") {
@@ -120,7 +123,7 @@ var Info = ({ onEdit }) => {
       }
     });
   };
-  const getServices = async () => {
+  const getServices = async (params) => {
     var _a2;
     setLoading(true);
     let data = await state.apis.getServices({
@@ -134,8 +137,10 @@ var Info = ({ onEdit }) => {
       with_count: ["bundleGroup", "optionGroup"],
       order_by_string: "sort:desc",
       status: "published",
-      _config: {
-        useCache: true
+      ...state.isBookingCreatePage ? { schedule_date: params == null ? void 0 : params.schedule_date } : {
+        _config: {
+          useCache: true
+        }
       }
     });
     setLoading(false);
@@ -210,6 +215,9 @@ var Info = ({ onEdit }) => {
           cacheItem._id = (_a2 = state.service.cacheItem) == null ? void 0 : _a2._id;
           cacheItem.new = 0;
         }
+        if (renderMode === "current") {
+          cacheItem.currentDefaultTime = state.date.value.format("HH:mm");
+        }
         cacheItem = (0, import_utils2.getProductExtend)({ cacheItem, state });
         if (state.renderType === "eventBooking") {
           cacheItem.autoClose = false;
@@ -277,12 +285,23 @@ var Info = ({ onEdit }) => {
       setSearch("");
     }
   }, [state.service.addModal]);
+  const currentDate = (0, import_react.useMemo)(() => {
+    return state.date.value.format("YYYY-MM-DD");
+  }, [state.date.value]);
+  (0, import_react.useEffect)(() => {
+    if (renderMode === "current") {
+      getServices({ schedule_date: currentDate });
+    }
+  }, [renderMode, currentDate]);
   (0, import_react.useEffect)(() => {
     if (state.renderType === "eventBooking" && state.modalOpen) {
       getServices();
     }
   }, [state.renderType, state.modalOpen]);
   const addButton = (0, import_react.useMemo)(() => {
+    if (state.isBookingCreatePage) {
+      return /* @__PURE__ */ import_react.default.createElement("div", { style: { height: 20 } });
+    }
     if (state.renderType === "eventBooking") {
       return isService ? /* @__PURE__ */ import_react.default.createElement("div", { style: { height: 20 } }) : /* @__PURE__ */ import_react.default.createElement(
         import_addButton.default,
@@ -311,10 +330,48 @@ var Info = ({ onEdit }) => {
     state.service.value,
     loading
   ]);
+  const isRenderCurrent = (0, import_react.useMemo)(() => {
+    return renderMode === "current";
+  }, [renderMode]);
+  const header = /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-header" }, /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Input,
+    {
+      ref: searchRef,
+      prefix: /* @__PURE__ */ import_react.default.createElement(import_SearchLg.default, null),
+      style: { marginTop: 16, height: 44 },
+      placeholder: import_utils4.locales.getText("pisell2.text.search"),
+      allowClear: true,
+      value: search,
+      onChange: (e) => {
+        setSearch(e.target.value);
+      }
+    }
+  ));
+  const content = /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body" }, /* @__PURE__ */ import_react.default.createElement(
+    import_TabProduct.default,
+    {
+      list: renderList,
+      amountSymbol: state.amountSymbol,
+      onChange: handleSelectProduct,
+      scrollDom: isRenderCurrent ? ".pisell-lowcode__booking-vertical-add-service-wrap" : ".booking-server-wrap .pisell-lowcode-drawer-body "
+    }
+  ));
+  if (isRenderCurrent) {
+    return /* @__PURE__ */ import_react.default.createElement(
+      "div",
+      {
+        className: "pisell-lowcode__booking-vertical-add-service-wrap",
+        style: { width: "100%", height: "100%", overflow: "auto" }
+      },
+      header,
+      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(
     import_drawer.default,
     {
-      open: state.service.addModal,
+      titleNoWrap: true,
+      open: state.service.addModal && !state.isBookingCreatePage,
       title: import_utils4.locales.getText("pisell2.text.select-service"),
       rootClassName: "booking-server-wrap",
       onClose: () => {
@@ -326,30 +383,10 @@ var Info = ({ onEdit }) => {
           }
         });
       },
-      header: /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-header" }, /* @__PURE__ */ import_react.default.createElement(
-        import_antd.Input,
-        {
-          ref: searchRef,
-          prefix: /* @__PURE__ */ import_react.default.createElement(import_SearchLg.default, null),
-          style: { marginTop: 16, height: 44 },
-          placeholder: import_utils4.locales.getText("pisell2.text.search"),
-          allowClear: true,
-          value: search,
-          onChange: (e) => {
-            setSearch(e.target.value);
-          }
-        }
-      ))
+      header,
+      ...drawerProps || {}
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body" }, /* @__PURE__ */ import_react.default.createElement(
-      import_TabProduct.default,
-      {
-        list: renderList,
-        amountSymbol: state.amountSymbol,
-        onChange: handleSelectProduct,
-        scrollDom: ".booking-server-wrap .pisell-lowcode-drawer-body"
-      }
-    ))
+    content
   ));
 };
 var addService_default = Info;

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

@@ -451,6 +451,7 @@ var AddTimeModal = () => {
   return /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {
+      titleNoWrap: true,
       open: state.service.addTimeModal,
       title: import_utils.locales.getText("page.booking.text.add-time"),
       rootClassName: "booking-server-wrap",

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

@@ -262,6 +262,11 @@ var Info = (_, ref) => {
     state.renderType,
     state.service.resourcesOrigin
   ]);
+  (0, import_react.useEffect)(() => {
+    if (state.isBookingCreatePage && state.service.editModal) {
+      setEditData(null);
+    }
+  }, [state.service.editModal, state.isBookingCreatePage]);
   (0, import_react.useEffect)(() => {
     getDiscount();
   }, [useTotal, (_i = (_h = state.service.cacheItem) == null ? void 0 : _h._extend) == null ? void 0 : _i.origin_total]);
@@ -347,6 +352,7 @@ var Info = (_, ref) => {
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {
+      titleNoWrap: true,
       zIndex: state.service.changeService ? 999 : 1e3,
       forceRender: true,
       open: state.service.editModal && !((_q = state.service.cacheItem) == null ? void 0 : _q.autoClose),
@@ -362,7 +368,7 @@ var Info = (_, ref) => {
         });
       }
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body-edit" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { layout: "vertical", form, onFinish }, /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "product_name" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name" }, ((_t = (_s = (_r = state.service) == null ? void 0 : _r.cacheItem) == null ? void 0 : _s._extend) == null ? void 0 : _t.product_name) || "-"), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleEdit }, import_utils.locales.getText("pisell2.text.edit")), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleChange }, import_utils.locales.getText("pisell2.text.change"))), /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body-edit" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { layout: "vertical", form, onFinish }, /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "product_name" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name" }, ((_t = (_s = (_r = state.service) == null ? void 0 : _r.cacheItem) == null ? void 0 : _s._extend) == null ? void 0 : _t.product_name) || "-"), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleEdit }, import_utils.locales.getText("pisell2.text.edit")), !state.isBookingCreatePage && /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleChange }, import_utils.locales.getText("pisell2.text.change"))), /* @__PURE__ */ import_react.default.createElement(
       import_collapsibleList.default,
       {
         style: { marginTop: bundles.length ? "8px" : 0 },

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

@@ -39,9 +39,10 @@ var import_editService = __toESM(require("./editService"));
 var import_service = require("../../info/service/index.less");
 var import_serviceList = __toESM(require("./serviceList"));
 var import_addTimeModal = __toESM(require("./addTimeModal"));
+var import_useClearCart = __toESM(require("../../hooks/useClearCart"));
 var Service = () => {
   var _a, _b;
-  const { state } = (0, import_react.useContext)(import_model.Context);
+  const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const detailRef = (0, import_react.useRef)();
   (0, import_react.useEffect)(() => {
     document.body.id = "body";
@@ -70,6 +71,7 @@ var Service = () => {
       (_b2 = (_a2 = detailRef.current) == null ? void 0 : _a2.init) == null ? void 0 : _b2.call(_a2, cacheItem);
     }, 100);
   };
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-wrap" }, /* @__PURE__ */ import_react.default.createElement(import_serviceList.default, { onEdit: handleEdit }), /* @__PURE__ */ import_react.default.createElement(import_addService.default, { onEdit: handleEdit })), /* @__PURE__ */ import_react.default.createElement(import_editService.default, { ref: detailRef }), showAddTimeModal && /* @__PURE__ */ import_react.default.createElement(import_addTimeModal.default, null));
+  const clearCart = (0, import_useClearCart.default)(state, dispatch);
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-wrap" }, clearCart, /* @__PURE__ */ import_react.default.createElement(import_serviceList.default, { onEdit: handleEdit }), /* @__PURE__ */ import_react.default.createElement(import_addService.default, { onEdit: handleEdit })), /* @__PURE__ */ import_react.default.createElement(import_editService.default, { ref: detailRef }), showAddTimeModal && /* @__PURE__ */ import_react.default.createElement(import_addTimeModal.default, null));
 };
 var service_default = import_react.default.memo(Service);

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

@@ -1,4 +1,4 @@
 import React from 'react';
 import './index.less';
-declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, }: any) => React.JSX.Element;
+declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => React.JSX.Element;
 export default ServiceItem;

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

@@ -41,6 +41,7 @@ var import_utils3 = require("../../../components/collapsibleList/utils");
 var import_antd = require("antd");
 var import_actions = __toESM(require("../actions"));
 var import_index = require("./index.less");
+var import_materials = require("@pisell/materials");
 var getName = (name, locale) => {
   return name[locale] || name["original"] || name["en"] || "";
 };
@@ -70,7 +71,8 @@ var ServiceItem = ({
   handleEditService,
   state,
   handleLike,
-  errorMessage
+  errorMessage,
+  handleDeleteService
 }) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   const isDiscount = (0, import_react.useMemo)(() => {
@@ -145,6 +147,17 @@ var ServiceItem = ({
         handleEditService(d);
       }
     },
+    !state.channelDisabledEdit && /* @__PURE__ */ import_react.default.createElement(
+      "div",
+      {
+        className: "pisell-lowcode__booking-service-item-delete",
+        onClick: (e) => {
+          e.stopPropagation();
+          handleDeleteService(d);
+        }
+      },
+      /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "text", icon: /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-trash-01" }) })
+    ),
     d.id ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-title" }, d.title) : null,
     d._extend && state.renderType !== "eventBooking" ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-date" }, (0, import_utils.getServiceTime)(d, state.date.value)), renderResources) : null,
     (((_d = (_c = d._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.bundle) || []).length ? /* @__PURE__ */ import_react.default.createElement(

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

@@ -57,6 +57,22 @@ var ServiceList = ({ onEdit }) => {
     });
     onEdit == null ? void 0 : onEdit(cacheItem);
   };
+  const handleDeleteService = (item) => {
+    if (state.disabledEdit || state.disableEventBookingEdit || state.channelDisabledEdit) {
+      return;
+    }
+    let _list = [...state.service.value];
+    _list = _list.filter((d) => d._id !== item._id);
+    dispatch({
+      type: "setService",
+      payload: {
+        editModal: false,
+        value: _list,
+        edit: true,
+        cacheItem: null
+      }
+    });
+  };
   const getErrorMessage = (0, import_react.useCallback)((service) => {
     let errorList = [];
     const list = Object.values(service._extend.resource || []);
@@ -122,7 +138,8 @@ var ServiceList = ({ onEdit }) => {
         d,
         handleEditService,
         state,
-        handleLike
+        handleLike,
+        handleDeleteService
       }
     );
   }));

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

@@ -223,7 +223,11 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
     if (findNextSliceProps.date && findNextSliceProps.date !== "00:00") {
       _extend.start_time = findNextSliceProps.date;
     } else {
-      _extend.start_time = (0, import_dayjs.default)().format("HH:mm");
+      if (cacheItem.currentDefaultTime) {
+        _extend.start_time = cacheItem.currentDefaultTime;
+      } else {
+        _extend.start_time = (0, import_dayjs.default)().format("HH:mm");
+      }
     }
   }
   _extend = {

package/lib/components/booking/locales.d.ts

@@ -196,6 +196,26 @@ declare const _default: {
         'page.booking.text.please-choose-an-option-2': string;
         'page.booking.text.resource.min-length-error': (x: number, y: string) => string;
         'page.booking.text.price-extra': (origin: string, current: string) => string;
+        'pisell2.booking.dashboard.groups-on-site-now': string;
+        'pisell2.booking.dashboard.groups-on-site-now-tip': string;
+        'pisell2.booking.dashboard.people-on-site-now': string;
+        'pisell2.booking.dashboard.people-on-site-now-tip': string;
+        'pisell2.booking.dashboard.total-visitors-today': string;
+        'pisell2.booking.dashboard.total-visitors-today-tip': string;
+        'pisell2.booking.dashboard.ongoing-visitors': string;
+        'pisell2.booking.dashboard.ongoing-visitors-tip': string;
+        'pisell2.booking.dashboard.upcoming-visitors': string;
+        'pisell2.booking.dashboard.upcoming-visitors-tip': string;
+        'pisell2.booking.dashboard.overdue-visitors': string;
+        'pisell2.booking.dashboard.overdue-visitors-tip': string;
+        'pisell2.booking.dashboard.completed-visitors': string;
+        'pisell2.booking.dashboard.completed-visitors-tip': string;
+        'pisell2.booking.dashboard.departed-visitors': string;
+        'pisell2.booking.dashboard.departed-visitors-tip': string;
+        'pisell2.booking.dashboard.default': string;
+        'pisell2.booking.info.text.clear-cart': string;
+        'pisell2.booking.info.text.clear-all': string;
+        'pisell2.booking.info.text.create-new': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -394,6 +414,26 @@ declare const _default: {
         'page.booking.text.please-choose-an-option-2': string;
         'page.booking.text.resource.min-length-error': (x: number, y: string) => string;
         'page.booking.text.price-extra': (origin: string, current: string) => string;
+        'pisell2.booking.dashboard.groups-on-site-now': string;
+        'pisell2.booking.dashboard.groups-on-site-now-tip': string;
+        'pisell2.booking.dashboard.people-on-site-now': string;
+        'pisell2.booking.dashboard.people-on-site-now-tip': string;
+        'pisell2.booking.dashboard.total-visitors-today': string;
+        'pisell2.booking.dashboard.total-visitors-today-tip': string;
+        'pisell2.booking.dashboard.ongoing-visitors': string;
+        'pisell2.booking.dashboard.ongoing-visitors-tip': string;
+        'pisell2.booking.dashboard.upcoming-visitors': string;
+        'pisell2.booking.dashboard.upcoming-visitors-tip': string;
+        'pisell2.booking.dashboard.overdue-visitors': string;
+        'pisell2.booking.dashboard.overdue-visitors-tip': string;
+        'pisell2.booking.dashboard.completed-visitors': string;
+        'pisell2.booking.dashboard.completed-visitors-tip': string;
+        'pisell2.booking.dashboard.departed-visitors': string;
+        'pisell2.booking.dashboard.departed-visitors-tip': string;
+        'pisell2.booking.dashboard.default': string;
+        'pisell2.booking.info.text.clear-cart': string;
+        'pisell2.booking.info.text.clear-all': string;
+        'pisell2.booking.info.text.create-new': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -592,6 +632,26 @@ declare const _default: {
         'page.booking.text.please-choose-an-option-2': string;
         'page.booking.text.resource.min-length-error': (x: number, y: string) => string;
         'page.booking.text.price-extra': (origin: string, current: string) => string;
+        'pisell2.booking.dashboard.groups-on-site-now': string;
+        'pisell2.booking.dashboard.groups-on-site-now-tip': string;
+        'pisell2.booking.dashboard.people-on-site-now': string;
+        'pisell2.booking.dashboard.people-on-site-now-tip': string;
+        'pisell2.booking.dashboard.total-visitors-today': string;
+        'pisell2.booking.dashboard.total-visitors-today-tip': string;
+        'pisell2.booking.dashboard.ongoing-visitors': string;
+        'pisell2.booking.dashboard.ongoing-visitors-tip': string;
+        'pisell2.booking.dashboard.upcoming-visitors': string;
+        'pisell2.booking.dashboard.upcoming-visitors-tip': string;
+        'pisell2.booking.dashboard.overdue-visitors': string;
+        'pisell2.booking.dashboard.overdue-visitors-tip': string;
+        'pisell2.booking.dashboard.completed-visitors': string;
+        'pisell2.booking.dashboard.completed-visitors-tip': string;
+        'pisell2.booking.dashboard.departed-visitors': string;
+        'pisell2.booking.dashboard.departed-visitors-tip': string;
+        'pisell2.booking.dashboard.default': string;
+        'pisell2.booking.info.text.clear-cart': string;
+        'pisell2.booking.info.text.clear-all': string;
+        'pisell2.booking.info.text.create-new': string;
     };
 };
 export default _default;