@pisell/private-materials 3.0.13 → 3.0.14-2.gray

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

@@ -25,7 +25,8 @@
     font-size: 14px;
     font-style: normal;
     font-weight: 400;
-    line-height: 20px; /* 142.857% */
+    line-height: 20px;
+    /* 142.857% */
   }
 
   .booking-header-line-2 {
@@ -34,6 +35,7 @@
     align-items: center;
     justify-content: space-between;
   }
+
   .booking-header-left {
     color: var(--Base-White, #FFF);
     font-size: 18px;
@@ -46,15 +48,128 @@
       display: flex;
       align-items: center;
       gap: 10px;
-      color: var(--Base-White, #FFF);
+      color: var(--Base-White, #FFF) !important;
       font-size: 18px;
       font-style: normal;
       font-weight: 400;
       cursor: pointer;
+      border: 1px solid #fff;
+      padding: 4px 12px;
+      border-radius: 24px;
+
+      span {
+        color: var(--Base-White, #FFF) !important;
+      }
 
       .booking-header-right-status-icon {
         font-size: 20px;
       }
     }
   }
+}
+
+.go-payments-modal-wrap {
+  padding: 0;
+}
+
+.go-payments-modal-content {
+  margin: 0 -24px;
+
+  .go-payments-modal-content-title {
+    color: var(--Gray-900, #101828);
+    font-size: 24px;
+    font-style: normal;
+    font-weight: 600;
+    line-height: 32px;
+    padding: 0 24px;
+  }
+
+  .go-payments-modal-content-desc {
+    color: var(--Gray-900, #101828);
+    font-size: 16px;
+    font-style: normal;
+    font-weight: 500;
+    line-height: 24px;
+    padding: 0 24px;
+    margin-top: 4px;
+  }
+
+  .cancelled-modal-content-title {
+    color: var(--Gray-900, #101828);
+    font-size: 24px;
+    font-style: normal;
+    font-weight: 600;
+    line-height: 32px;
+    padding: 0 24px;
+  }
+
+  .cancelled-modal-content-desc {
+    margin-top: 4px;
+    color: #101828;
+    font-size: 16px;
+    font-style: normal;
+    font-weight: 500;
+    line-height: 24px;
+    padding: 0 24px;
+
+    &.cancelled-modal-content-desc-red {
+      color: var(--Error-600, #D92D20);
+    }
+  }
+
+  .cancelled-modal-content-list-wrap {
+    padding: 0 24px;
+
+    .cancelled-modal-content-list-title {
+      color: var(--Gray-900, #101828);
+      font-size: 16px;
+      font-style: normal;
+      font-weight: 500;
+      line-height: 24px;
+      margin-top: 4px;
+    }
+
+    .cancelled-modal-content-ul {
+      margin-top: 4px;
+
+      .cancelled-modal-content-li {
+        color: var(--Gray-900, #101828);
+        font-size: 16px;
+        font-style: normal;
+        font-weight: 500;
+        line-height: 24px;
+      }
+
+    }
+
+  }
+
+  .go-payments-footer {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    border-top: 1px solid var(--Gray-200, #EAECF0);
+    margin-top: 16px;
+    padding: 24px 24px 4px;
+    width: 100%;
+
+    .go-payments-footer-btn {
+      flex: 1;
+      font-size: 16px;
+      font-style: normal;
+      font-weight: 600;
+    }
+
+    &.go-payments-footer-column {
+      flex-direction: column;
+      gap: 12px;
+
+      .go-payments-footer-btn {
+        width: 100%;
+      }
+    }
+
+
+  }
+
 }

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: any;
 export default Info;

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

@@ -16,9 +16,12 @@ import AddNote from "../notes/addNote";
 import Header from "./header";
 import localeTexts from "../locales";
 import { locales } from "@pisell/utils";
-import { findNextDuration, flexibleObj, formatResource, getErrorList, sliceDayIntoFiveMinutes } from "../utils";
+import { findNextDuration, flexibleObj, formatResource, getErrorList, sliceDayIntoFiveMinutes, request } from "../utils";
 import { updateServiceDate } from "./date";
+import useEngineContext from "../../../hooks/useEngineContext";
+import Notes from "./notes";
 import "./index.less";
+import classNames from "classnames";
 var defaultModules = {
   client: 1,
   date: 1,
@@ -28,7 +31,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, _context$appHelper4, _context$appHelper4$u, _modal$state5, _React$createElement;
   // return <Payments {...props} />;
   var style = props.style,
     globalState = props.globalState,
@@ -36,6 +39,8 @@ var Info = Provider(function (props) {
     modules = _props$modules === void 0 ? defaultModules : _props$modules,
     slot = props.slot;
   var modal = useContext(Context);
+  var context = useEngineContext();
+  request.setRequest(context.appHelper.utils.request);
   var params = useMemo(function () {
     var _modal$state, _modal$state$bookingC, _modal$state$bookingC2, _modal$state$bookingC3;
     return ((_modal$state = modal.state) === null || _modal$state === void 0 ? void 0 : (_modal$state$bookingC = _modal$state.bookingConfig) === null || _modal$state$bookingC === void 0 ? void 0 : (_modal$state$bookingC2 = _modal$state$bookingC.config) === null || _modal$state$bookingC2 === void 0 ? void 0 : (_modal$state$bookingC3 = _modal$state$bookingC2.basic) === null || _modal$state$bookingC3 === void 0 ? void 0 : _modal$state$bookingC3.appointment_subject) || {};
@@ -57,13 +62,19 @@ var Info = Provider(function (props) {
     }
   }, []);
   useEffect(function () {
+    var _context$appHelper, _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper2, _context$appHelper2$u, _context$appHelper2$u2, _context$appHelper3, _context$appHelper3$u, _context$appHelper3$u2, _context$appHelper3$u3, _context$appHelper3$u4, _context$appHelper3$u5;
+    var isFranchisee = context === null || context === void 0 ? void 0 : (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : (_context$appHelper$ut = _context$appHelper.utils) === null || _context$appHelper$ut === void 0 ? void 0 : (_context$appHelper$ut2 = _context$appHelper$ut.businessUtils) === null || _context$appHelper$ut2 === void 0 ? void 0 : (_context$appHelper$ut3 = _context$appHelper$ut2.getAppByModal) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.call(_context$appHelper$ut2, "franchisee");
     modal.dispatch({
       type: "setState",
-      payload: _objectSpread({
+      payload: _objectSpread(_objectSpread({
         setGlobalState: props.setGlobalState
-      }, globalState)
+      }, globalState), {}, {
+        isTerminal: context === null || context === void 0 ? void 0 : (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : (_context$appHelper2$u = _context$appHelper2.utils) === null || _context$appHelper2$u === void 0 ? void 0 : (_context$appHelper2$u2 = _context$appHelper2$u.isTerminal) === null || _context$appHelper2$u2 === void 0 ? void 0 : _context$appHelper2$u2.call(_context$appHelper2$u),
+        isFranchisee: isFranchisee,
+        timezone: context === null || context === void 0 ? void 0 : (_context$appHelper3 = context.appHelper) === null || _context$appHelper3 === void 0 ? void 0 : (_context$appHelper3$u = _context$appHelper3.utils) === null || _context$appHelper3$u === void 0 ? void 0 : (_context$appHelper3$u2 = _context$appHelper3$u.store) === null || _context$appHelper3$u2 === void 0 ? void 0 : (_context$appHelper3$u3 = _context$appHelper3$u2.getState()) === null || _context$appHelper3$u3 === void 0 ? void 0 : (_context$appHelper3$u4 = _context$appHelper3$u3.global) === null || _context$appHelper3$u4 === void 0 ? void 0 : (_context$appHelper3$u5 = _context$appHelper3$u4.globalConfig) === null || _context$appHelper3$u5 === void 0 ? void 0 : _context$appHelper3$u5.timezone
+      })
     });
-  }, [globalState]);
+  }, [JSON.stringify(globalState)]);
   var addNote = function addNote(e) {
     modal.dispatch({
       type: "setNotes",
@@ -73,23 +84,42 @@ 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.detail");
+    }
+    return globalState !== null && globalState !== void 0 && globalState.bookingId ? /*#__PURE__*/React.createElement(Header, {
       state: modal.state,
       dispatch: modal.dispatch
-    }) : locales.getText("pisell2.text.new-appointment"),
+    }) : /*#__PURE__*/React.createElement("div", {
+      className: "",
+      style: {
+        height: 0
+      }
+    });
+  }, [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, (_React$createElement = {
+    style: style,
+    header: header,
     footer: /*#__PURE__*/React.createElement(Footer, {
       state: modal.state,
       dispatch: modal.dispatch,
       source: "info"
-    }),
-    bodyClassName: "booking-info-warp"
-  }, /*#__PURE__*/React.createElement("div", {
+    })
+  }, _defineProperty(_React$createElement, "style", {
+    height: context !== null && context !== void 0 && (_context$appHelper4 = context.appHelper) !== null && _context$appHelper4 !== void 0 && (_context$appHelper4$u = _context$appHelper4.utils) !== null && _context$appHelper4$u !== void 0 && _context$appHelper4$u.isMobile ? "100%" : "100vh"
+  }), _defineProperty(_React$createElement, "bodyClassName", classNames('booking-info-warp', _defineProperty({}, 'create-booking-page-info-wrap', modal.state.isBookingCreatePage))), _React$createElement), /*#__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/index.less

@@ -15,4 +15,13 @@
   //   height: 42px;
   //   background: #069456;
   // }
+}
+#create-booking-page-info-wrap {
+  .pisell-lowcode__booking-tab-pane-footer {
+    padding: 12px 16px !important;
+  }
+}
+.create-booking-page-info-wrap {
+  position: initial !important;
+  padding: 0 16px !important;
 }

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

@@ -1,9 +1,10 @@
-import { FormState } from "../model";
+/// <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) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -4,22 +4,17 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import { miniRedux } from "@pisell/utils";
+import { miniRedux } from '@pisell/utils';
+import { formatServiceListByTime } from "./utils";
 export var walkInData = {
   id: 1,
-  nickname: "Select a customer"
+  nickname: 'Select a customer'
 };
 var defaultState = {};
 var _miniRedux = miniRedux({
-    namespace: "state",
+    namespace: 'state',
     state: defaultState,
-    reducers: {
-      setStateFn: function setStateFn(state, payload) {
-        return _objectSpread(_objectSpread({}, state), payload);
-      },
-      setState: function setState(state, payload) {
-        return _objectSpread(_objectSpread({}, state), payload);
-      },
+    effects: {
       setClient: function setClient(state, payload) {
         state.setGlobalState({
           client: _objectSpread(_objectSpread({}, state.client), payload)
@@ -27,8 +22,14 @@ var _miniRedux = miniRedux({
         // return { ...state, client: { ...state.client, ...payload } };
       },
       setService: function setService(state, payload) {
+        var obj = {};
+
+        // 拦截,  如果服务列表里 有两个相近时间的服务, 删除最后一个
+        if (payload.value) {
+          obj.value = formatServiceListByTime(payload.value);
+        }
         state.setGlobalState({
-          service: _objectSpread(_objectSpread({}, state.service), payload)
+          service: _objectSpread(_objectSpread(_objectSpread({}, state.service), payload), obj)
         });
       },
       setDate: function setDate(state, payload) {
@@ -58,13 +59,21 @@ var _miniRedux = miniRedux({
         var _val = {
           appointment_status: payload
         };
-        if (payload === "cancelled") {
+        if (payload === 'cancelled') {
           _val.disabledEdit = true;
         } else {
           _val.disabledEdit = false;
         }
         state.setGlobalState(_val);
       }
+    },
+    reducers: {
+      setStateFn: function setStateFn(state, payload) {
+        return _objectSpread(_objectSpread({}, state), payload);
+      },
+      setState: function setState(state, payload) {
+        return _objectSpread(_objectSpread({}, state), payload);
+      }
     }
   }),
   Provider = _miniRedux.Provider,

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

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

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

@@ -0,0 +1,87 @@
+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$state6;
+  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, _modal$state5, _modal$state5$refresh;
+      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
+        }
+      });
+      (_modal$state5 = modal.state) === null || _modal$state5 === void 0 ? void 0 : (_modal$state5$refresh = _modal$state5.refreshData) === null || _modal$state5$refresh === void 0 ? void 0 : _modal$state5$refresh.call(_modal$state5, {});
+      return;
+    }
+    if (noteType === "order") {
+      modal.dispatch({
+        type: "setNotes",
+        payload: {
+          orderNote: note.content || "",
+          edit: false
+        }
+      });
+    }
+  };
+  if (orderNote.length === 0 && modal.state.disableEventBookingEdit) {
+    return null;
+  }
+  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$state6 = modal.state) === null || _modal$state6 === void 0 ? void 0 : _modal$state6.apis,
+    placeholder: locales.getText("pisell2.text.add-order-notes"),
+    isEdit: false,
+    onChange: function onChange(e, type, noteType) {
+      noteChange({
+        note: e,
+        status: type,
+        noteType: noteType
+      });
+    }
+  });
+};
+export default Notes;

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

@@ -1,4 +1,14 @@
-import React from "react";
-import "./index.less";
-declare const Pet: () => React.JSX.Element;
+import React from 'react';
+import './index.less';
+import { InfoProps } from '../../forms/forms';
+interface PetProps {
+    state?: any;
+    dispatch?: any;
+    hideTitle?: boolean;
+    addButtonProps?: InfoProps['addButtonProps'];
+    handleOpenModal?: () => void;
+    clientChangeNotSetPet?: boolean;
+    previewItemTitleRender?: (item: any, index: number, values: any[]) => React.ReactNode;
+}
+declare const Pet: (props: PetProps) => React.JSX.Element;
 export default Pet;