@pisell/private-materials 3.0.13 → 3.0.15

package/es/components/booking/addons/index.d.ts

@@ -13,5 +13,5 @@ export interface InfoProps {
     setGlobalState: any;
 }
 export declare const formatProducts: (values: any) => any;
-declare const Addons: (props: any) => JSX.Element;
+declare const Addons: (props: any) => any;
 export default Addons;

package/es/components/booking/addons/model.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/es/components/booking/components/addButton/index.d.ts

@@ -7,14 +7,14 @@
  */
 import React from "react";
 import "./index.less";
-interface AddButtonProps {
-    onClick: () => void;
-    title: string;
-    subTitle: string;
-    showSub: boolean;
-    style: any;
-    disabled: boolean;
-    loading: any;
+export interface AddButtonProps {
+    onClick?: () => void;
+    title?: string;
+    subTitle?: string;
+    showSub?: boolean;
+    style?: React.CSSProperties;
+    disabled?: boolean;
+    loading?: boolean;
 }
 declare const AddButton: React.FC<AddButtonProps>;
 export default AddButton;

package/es/components/booking/components/addButton/index.js

@@ -26,7 +26,7 @@ var AddButton = function AddButton(_ref) {
     if (disabled) {
       message.warning(locales.getText("pisell2.text.please-select-the-customer-first"));
     } else {
-      onClick();
+      onClick === null || onClick === void 0 ? void 0 : onClick();
     }
   };
 

package/es/components/booking/components/drawer/index.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
 import { DrawerProps } from "antd";
 import "./index.less";
-interface PisellDrawerProps extends DrawerProps {
+export interface PisellDrawerProps extends DrawerProps {
     header?: React.ReactNode;
     titleNoWrap?: boolean;
 }

package/es/components/booking/components/footer/FooterMenus/index.js

@@ -7,7 +7,7 @@ var FooterMenus = function FooterMenus(_ref) {
     dispatch = _ref.dispatch;
   var items = useMemo(function () {
     var list = [];
-    if (state.bookingId) {
+    if (state.bookingId && state.renderType !== 'eventBooking') {
       list.push({
         label: locales.getText("pisell2.text.rebook"),
         key: "rebook"

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

@@ -259,7 +259,7 @@ var Footer = function Footer(props) {
    */
   var handleSave = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref4) {
-      var type, _setLoading, saveOtherValue, _state$onSave, callbackData, values, api;
+      var type, _setLoading, editApi, createApi, saveOtherValue, _state$onSave, callbackData, values, api;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -267,60 +267,62 @@ var Footer = function Footer(props) {
             // 区分loading, 是点击的checkout 还是save
             _setLoading = type === "checkout" ? setCheckoutLoading : setLoading;
             _setLoading(true);
+            editApi = state.renderType === 'eventBooking' ? state.apis.editEventBooking : state.apis.editBooking;
+            createApi = state.renderType === 'eventBooking' ? state.apis.createEventBooking : state.apis.createBooking;
             saveOtherValue = {};
             if (!(type === "save")) {
-              _context4.next = 11;
+              _context4.next = 13;
               break;
             }
-            _context4.next = 7;
+            _context4.next = 9;
             return state === null || state === void 0 ? void 0 : (_state$onSave = state.onSave) === null || _state$onSave === void 0 ? void 0 : _state$onSave.call(state, state.client);
-          case 7:
+          case 9:
             _context4.t0 = _context4.sent;
             if (_context4.t0) {
-              _context4.next = 10;
+              _context4.next = 12;
               break;
             }
             _context4.t0 = {};
-          case 10:
+          case 12:
             saveOtherValue = _context4.t0;
-          case 11:
-            _context4.prev = 11;
+          case 13:
+            _context4.prev = 13;
             callbackData = null; // 格式化提交的参数
             values = formatValues(_objectSpread(_objectSpread({}, state), saveOtherValue)); // 区分是新增还是编辑
-            api = state.bookingId ? state.apis.editBooking : state.apis.createBooking; // 如果有addons改动, 则先保存
+            api = state.bookingId ? editApi : createApi; // 如果有addons改动, 则先保存
             if (!addonsEdit) {
-              _context4.next = 18;
+              _context4.next = 20;
               break;
             }
-            _context4.next = 18;
+            _context4.next = 20;
             return handleSaveAddons();
-          case 18:
+          case 20:
             if (!infoEdit) {
-              _context4.next = 23;
+              _context4.next = 25;
               break;
             }
-            _context4.next = 21;
+            _context4.next = 23;
             return api(values);
-          case 21:
+          case 23:
             callbackData = _context4.sent;
             message.success(locales.getText(state.bookingId ? "pisell2.text.appointment-updated" : "pisell2.text.created-successfully"));
-          case 23:
+          case 25:
             // 回调关闭弹窗
             state === null || state === void 0 ? void 0 : state.callback(callbackData);
             _setLoading(false);
 
             // return数据  checkout时需要
             return _context4.abrupt("return", callbackData);
-          case 28:
-            _context4.prev = 28;
-            _context4.t1 = _context4["catch"](11);
+          case 30:
+            _context4.prev = 30;
+            _context4.t1 = _context4["catch"](13);
             console.log(_context4.t1);
             _setLoading(false);
-          case 32:
+          case 34:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, null, [[11, 28]]);
+      }, _callee4, null, [[13, 30]]);
     }));
     return function handleSave(_x3) {
       return _ref5.apply(this, arguments);
@@ -636,12 +638,12 @@ var Footer = function Footer(props) {
       if (!state.bookingDetail) {
         return true;
       }
-      if (!((_state$addons3 = state.addons) !== null && _state$addons3 !== void 0 && _state$addons3.load)) {
+      if (!((_state$addons3 = state.addons) !== null && _state$addons3 !== void 0 && _state$addons3.load) && state.renderType !== 'eventBooking') {
         return true;
       }
     }
     return false;
-  }, [state.bookingId, state.bookingDetail, (_state$addons4 = state.addons) === null || _state$addons4 === void 0 ? void 0 : _state$addons4.load]);
+  }, [state.bookingId, state.bookingDetail, (_state$addons4 = state.addons) === null || _state$addons4 === void 0 ? void 0 : _state$addons4.load, state.renderType]);
   return /*#__PURE__*/React.createElement(Skeleton, {
     title: false,
     round: true,

package/es/components/booking/components/footer/utils.js

@@ -26,13 +26,14 @@ var formatCustomer = function formatCustomer(data) {
 };
 var formatBookings = function formatBookings(data) {
   var list = data.service.value;
+  var eventOtherParams = data.eventOtherParams;
   var bookings = [];
   bookings = list.map(function (item) {
     var start_date = item._extend.startDate.format('YYYY-MM-DD');
     var start_time = item._extend.startDate.format("HH:mm");
     var end_date = item._extend.endDate.format('YYYY-MM-DD');
     var end_time = item._extend.endDate.format("HH:mm");
-    return {
+    return _objectSpread({
       "product": {
         "num": item._extend.quantity,
         "price": item.price,
@@ -60,7 +61,7 @@ var formatBookings = function formatBookings(data) {
       "start_date": start_date,
       "duration": flexibleObj.getValue(item._extend.duration),
       "number": item._extend.number || 1
-    };
+    }, eventOtherParams || {});
   });
   return bookings;
 };
@@ -86,7 +87,7 @@ var formatHolder = function formatHolder(data, values) {
 // https://menutech.w.eolink.com/home/api-studio/inside/K2bI3n465fe7244b3dbd6679d87caedfbb0636bf8c29eda/api/2778666/detail/53001549?spaceKey=menutech
 export var formatValues = function formatValues(state) {
   var values = {
-    type: "appointment_booking",
+    type: state.renderType === 'eventBooking' ? "event_booking_v2" : "appointment_booking",
     platform: "shop",
     sales_channel: "my_pisel",
     bookings: [],

package/es/components/booking/forms/forms.d.ts

@@ -21,5 +21,5 @@ export interface InfoProps {
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 17:10
  */
-declare const Forms: (props: any) => JSX.Element;
+declare const Forms: (props: any) => any;
 export default Forms;

package/es/components/booking/forms/forms.js

@@ -31,7 +31,8 @@ import "./index.less";
  */
 var Forms = Provider(function (props) {
   var forms = props.forms,
-    value = props.value,
+    _props$value = props.value,
+    value = _props$value === void 0 ? [] : _props$value,
     modalOpen = props.modalOpen,
     onChange = props.onChange,
     action = props.action,

package/es/components/booking/forms/index.d.ts

@@ -5,5 +5,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Forms: (props: any) => JSX.Element;
+declare const Forms: (props: any) => any;
 export default Forms;

package/es/components/booking/forms/model.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/es/components/booking/index.d.ts

@@ -1,2 +1,2 @@
-declare const Booking: (props: any) => JSX.Element;
+declare const Booking: (props: any) => any;
 export default Booking;

package/es/components/booking/info/client/index.js

@@ -141,7 +141,6 @@ var Info = function Info() {
     return item.name || (item.display_name || "").trim() || (item.nickname || "").trim() || "";
   }, [locales.localeMap]);
   var handleSelectClient = function handleSelectClient(value) {
-    console.log("valuevalue", value);
     var _value = (value === null || value === void 0 ? void 0 : value[value.length - 1]) || walkInData;
     if (_value.loading) {
       return;

package/es/components/booking/info/date/index.less

@@ -1,5 +1,5 @@
 .pisell-lowcode__booking-body-select-date {
-  padding: 24px 0;
+  padding: 24px 0 8px;
   font-weight: 550;
 
   .pisell-lowcode-picker-input>input {

package/es/components/booking/info/index.d.ts

@@ -8,5 +8,5 @@ export interface InfoProps {
     slot: any;
     setState: any;
 }
-declare const Info: (props: any) => JSX.Element;
+declare const Info: (props: any) => any;
 export default Info;

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

@@ -18,6 +18,7 @@ import localeTexts from "../locales";
 import { locales } from "@pisell/utils";
 import { findNextDuration, flexibleObj, formatResource, getErrorList, sliceDayIntoFiveMinutes } from "../utils";
 import { updateServiceDate } from "./date";
+import Notes from "./notes";
 import "./index.less";
 var defaultModules = {
   client: 1,
@@ -28,7 +29,7 @@ var defaultModules = {
 };
 locales.init(localeTexts, localStorage.getItem("umi_locale") || "en");
 var Info = Provider(function (props) {
-  var _modal$state2, _modal$state2$booking, _modal$state2$booking2, _modal$state2$booking3, _modal$state3;
+  var _modal$state2, _modal$state2$booking, _modal$state2$booking2, _modal$state2$booking3, _modal$state4, _modal$state4$notes, _modal$state5;
   // return <Payments {...props} />;
   var style = props.style,
     globalState = props.globalState,
@@ -73,12 +74,28 @@ var Info = Provider(function (props) {
       }
     });
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, {
-    style: style,
-    header: globalState !== null && globalState !== void 0 && globalState.bookingId ? /*#__PURE__*/React.createElement(Header, {
+  var header = useMemo(function () {
+    if ((globalState === null || globalState === void 0 ? void 0 : globalState.renderType) === "eventBooking") {
+      return locales.getText("pisell2.text.enroll");
+    }
+    return globalState !== null && globalState !== void 0 && globalState.bookingId ? /*#__PURE__*/React.createElement(Header, {
       state: modal.state,
       dispatch: modal.dispatch
-    }) : locales.getText("pisell2.text.new-appointment"),
+    }) : locales.getText("pisell2.text.new-appointment");
+  }, [globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, modal.state, modal.dispatch, globalState === null || globalState === void 0 ? void 0 : globalState.renderType]);
+  var notes = useMemo(function () {
+    var _modal$state3, _modal$state3$notes;
+    if (!modules.note) {
+      return null;
+    }
+    return globalState !== null && globalState !== void 0 && globalState.bookingId ? globalState.renderType === "eventBooking" ? /*#__PURE__*/React.createElement(Notes, null) : null : /*#__PURE__*/React.createElement(AddNote, {
+      value: (_modal$state3 = modal.state) === null || _modal$state3 === void 0 ? void 0 : (_modal$state3$notes = _modal$state3.notes) === null || _modal$state3$notes === void 0 ? void 0 : _modal$state3$notes.orderNote,
+      onChange: addNote
+    });
+  }, [modules.note, globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, globalState.render, (_modal$state4 = modal.state) === null || _modal$state4 === void 0 ? void 0 : (_modal$state4$notes = _modal$state4.notes) === null || _modal$state4$notes === void 0 ? void 0 : _modal$state4$notes.orderNote]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, {
+    style: style,
+    header: header,
     footer: /*#__PURE__*/React.createElement(Footer, {
       state: modal.state,
       dispatch: modal.dispatch,
@@ -87,9 +104,6 @@ var Info = Provider(function (props) {
     bodyClassName: "booking-info-warp"
   }, /*#__PURE__*/React.createElement("div", {
     className: "booking-info"
-  }, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, modules.holder && !((_modal$state3 = modal.state) !== null && _modal$state3 !== void 0 && _modal$state3.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === "form" ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, modules.service ? /*#__PURE__*/React.createElement(React.Fragment, null, modal.state.date.value ? /*#__PURE__*/React.createElement(Service, null) : null) : null, modules.note ? /*#__PURE__*/React.createElement(React.Fragment, null, globalState !== null && globalState !== void 0 && globalState.bookingId ? null : /*#__PURE__*/React.createElement(AddNote, {
-    value: modal.state.notes.orderNote,
-    onChange: addNote
-  })) : null, slot ? slot : null)) : null);
+  }, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, modules.holder && !((_modal$state5 = modal.state) !== null && _modal$state5 !== void 0 && _modal$state5.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === "form" ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, modules.service ? /*#__PURE__*/React.createElement(React.Fragment, null, modal.state.date.value ? /*#__PURE__*/React.createElement(Service, null) : null) : null, notes, slot ? slot : null)) : null);
 });
 export default Info;

package/es/components/booking/info/model.d.ts

@@ -1,9 +1,10 @@
+/// <reference types="react" />
 import { FormState } from "../model";
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/es/components/booking/info/notes/index.d.ts

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

package/es/components/booking/info/notes/index.js

@@ -0,0 +1,83 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+import React, { useContext, useMemo } from 'react';
+import { Context } from "../model";
+import { locales } from "@pisell/utils";
+import NoteBlock from "../../notes/NoteBlock";
+var Notes = function Notes() {
+  var _modal$state3, _modal$state3$notes, _modal$state5;
+  var modal = useContext(Context);
+  var orderNote = useMemo(function () {
+    var _modal$state, _modal$state$notes, _modal$state2, _modal$state2$notes;
+    if (!((_modal$state = modal.state) !== null && _modal$state !== void 0 && (_modal$state$notes = _modal$state.notes) !== null && _modal$state$notes !== void 0 && _modal$state$notes.orderNote)) {
+      return [];
+    }
+    return [{
+      id: 0,
+      content: ((_modal$state2 = modal.state) === null || _modal$state2 === void 0 ? void 0 : (_modal$state2$notes = _modal$state2.notes) === null || _modal$state2$notes === void 0 ? void 0 : _modal$state2$notes.orderNote) || ""
+    }];
+  }, [(_modal$state3 = modal.state) === null || _modal$state3 === void 0 ? void 0 : (_modal$state3$notes = _modal$state3.notes) === null || _modal$state3$notes === void 0 ? void 0 : _modal$state3$notes.orderNote]);
+  var noteChange = function noteChange(_ref) {
+    var note = _ref.note,
+      status = _ref.status,
+      noteType = _ref.noteType;
+    if (noteType === "internal") {
+      var _modal$state4;
+      var _list = _toConsumableArray((_modal$state4 = modal.state) === null || _modal$state4 === void 0 ? void 0 : _modal$state4.notes.internalNotes);
+      if (status == "add") {
+        _list.push(note);
+      }
+      if (status == "remove") {
+        _list = _list.filter(function (item) {
+          return item.id != note.id;
+        });
+      }
+      if (status == "edit") {
+        _list = _list.map(function (item) {
+          if (item.id == note.id) {
+            return note;
+          }
+          return item;
+        });
+      }
+      modal.dispatch({
+        type: "setNotes",
+        payload: {
+          internalNotes: _list
+        }
+      });
+      return;
+    }
+    if (noteType === "order") {
+      modal.dispatch({
+        type: "setNotes",
+        payload: {
+          orderNote: note.content || "",
+          edit: false
+        }
+      });
+    }
+  };
+  return /*#__PURE__*/React.createElement(NoteBlock, {
+    noteType: "order",
+    maxLength: 1,
+    title: "".concat(locales.getText("pisell2.text.order-notes"), ":"),
+    describe: "",
+    notes: orderNote,
+    apis: modal === null || modal === void 0 ? void 0 : (_modal$state5 = modal.state) === null || _modal$state5 === void 0 ? void 0 : _modal$state5.apis,
+    placeholder: locales.getText("pisell2.text.add-order-notes"),
+    isEdit: true,
+    onChange: function onChange(e, type, noteType) {
+      noteChange({
+        note: e,
+        status: type,
+        noteType: noteType
+      });
+    }
+  });
+};
+export default Notes;

package/es/components/booking/info/pet/index.js

@@ -28,7 +28,7 @@ import FormsCom from "../../forms/forms";
 import { changeFormValues } from "../../forms/format";
 import { isWalkIn } from "../../utils";
 var Pet = function Pet() {
-  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$pet, _state$client$value2, _state$client8, _state$client8$value, _state$client9;
+  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$client$value2, _state$client8, _state$client8$value, _state$client9;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
@@ -136,7 +136,6 @@ var Pet = function Pet() {
       return _ref2.apply(this, arguments);
     };
   }();
-  console.log("values", (_state$pet = state.pet) === null || _state$pet === void 0 ? void 0 : _state$pet.value);
 
   /**
    * @title: 获取预约主体表单
@@ -167,7 +166,7 @@ var Pet = function Pet() {
             _context2.prev = 5;
             _context2.next = 8;
             return state.apis.getForms({
-              relation_type: "appointment_booking",
+              relation_type: state.renderType === 'eventBooking' ? "event_booking_v2" : "appointment_booking",
               relation_id: ((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : (_state$bookingDetail$ = _state$bookingDetail.bookings) === null || _state$bookingDetail$ === void 0 ? void 0 : _state$bookingDetail$.id) || 0
               // _config: { useCache: true },
             });
@@ -300,11 +299,11 @@ var Pet = function Pet() {
 
   // 当客户id 发生改变时, 检测当前表单是否是该客户的, 如果不是则移除
   useEffect(function () {
-    var _state$pet2, _state$client7, _state$client7$value, _state$pet3;
+    var _state$pet, _state$client7, _state$client7$value, _state$pet2;
     var changeFormValuesData = changeFormValues({
-      values: ((_state$pet2 = state.pet) === null || _state$pet2 === void 0 ? void 0 : _state$pet2.value) || {},
+      values: ((_state$pet = state.pet) === null || _state$pet === void 0 ? void 0 : _state$pet.value) || {},
       clientId: (_state$client7 = state.client) === null || _state$client7 === void 0 ? void 0 : (_state$client7$value = _state$client7.value) === null || _state$client7$value === void 0 ? void 0 : _state$client7$value.id,
-      forms: ((_state$pet3 = state.pet) === null || _state$pet3 === void 0 ? void 0 : _state$pet3.formData) || []
+      forms: ((_state$pet2 = state.pet) === null || _state$pet2 === void 0 ? void 0 : _state$pet2.formData) || []
     });
     dispatch({
       type: "setPet",
@@ -326,7 +325,6 @@ var Pet = function Pet() {
       getForms(true);
     }
   }, [state.bookingId, state.bookingDetail, params.form_id, params.type, (_state$client8 = state.client) === null || _state$client8 === void 0 ? void 0 : (_state$client8$value = _state$client8.value) === null || _state$client8$value === void 0 ? void 0 : _state$client8$value.id]);
-  console.log("state.pet.formData", state.pet.formData);
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-pet-wraps"
   }, /*#__PURE__*/React.createElement(FormsCom, {