@pisell/private-materials 3.0.69 → 3.0.71

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

@@ -443,6 +443,7 @@ var Pet = function Pet() {
       closeCallback: function closeCallback() {
         searchChange("");
       },
+      showDropDown: !state.disableEventBookingEdit,
       searchChange: searchChange,
       searchValue: params.search,
       loadMore: loadMore,
@@ -487,6 +488,8 @@ var Pet = function Pet() {
       style: {
         margin: 0
       },
+      disabled: state.disableEventBookingEdit,
+      showDisabledMessage: !state.disableEventBookingEdit,
       addCallback: function () {
         var _addCallback2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {

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

@@ -34,7 +34,7 @@ import { locales, getUniqueId } from "@pisell/utils";
 import { useUpdateEffect } from "ahooks";
 var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303, 6080];
 var Info = function Info() {
-  var _state$service3, _state$service4, _state$service4$cache;
+  var _state$service3, _state$service5, _state$service6, _state$service6$cache;
   var _useState = useState(""),
     _useState2 = _slicedToArray(_useState, 2),
     search = _useState2[0],
@@ -219,7 +219,6 @@ var Info = function Info() {
         is_eject: isEject ? 1 : 0
       },
       callback: function callback(e) {
-        var _state$service;
         var cacheItem = _objectSpread(_objectSpread({}, item), {}, {
           product_id: item.id,
           _id: getUniqueId(),
@@ -248,7 +247,12 @@ var Info = function Info() {
           cacheItem: cacheItem,
           state: state
         });
-        cacheItem.autoClose = !_isEdit && (cacheItem._extend.resource || cacheItem._extend.resource === 0 || (((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.resourcesOrigin) || []).length === 1);
+        if (state.renderType === 'eventBooking') {
+          cacheItem.autoClose = false;
+        } else {
+          var _state$service;
+          cacheItem.autoClose = !_isEdit && (cacheItem._extend.resource || cacheItem._extend.resource === 0 || (((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.resourcesOrigin) || []).length === 1);
+        }
         dispatch({
           type: "setService",
           payload: {
@@ -275,17 +279,18 @@ var Info = function Info() {
     return state.service.value.length > 0;
   }, [state.service.value]);
   useEffect(function () {
-    var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper$ut5;
+    var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper$ut5, _state$service4, _state$service4$value;
     // Salonip 不要这个
 
     if (shopList.includes((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 ? void 0 : (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 ? void 0 : (_context$appHelper$ut3 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut3 === void 0 ? void 0 : (_context$appHelper$ut4 = _context$appHelper$ut3.global) === null || _context$appHelper$ut4 === void 0 ? void 0 : (_context$appHelper$ut5 = _context$appHelper$ut4.globalConfig) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.id)) {
       return;
     }
+
     // 如果弹窗打开,并且是创建, 则自动打开选择服务的弹窗
-    if (state.modalOpen && !state.bookingId && state.renderType !== "eventBooking") {
+    if (state.modalOpen && !state.bookingId && state.renderType !== "eventBooking" && ((_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : (_state$service4$value = _state$service4.value) === null || _state$service4$value === void 0 ? void 0 : _state$service4$value.length) === 0) {
       handleSelectService();
     }
-  }, [state.modalOpen, state.bookingId]);
+  }, [state.modalOpen, state.bookingId, (_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : _state$service5.value]);
   var showAddButton = useMemo(function () {
     return !state.disabledEdit && !state.channelDisabledEdit;
   }, [state.disabledEdit, state.channelDisabledEdit]);
@@ -325,7 +330,7 @@ var Info = function Info() {
       }
     });
   }, [state.renderType, showAddButton, isService, state.service.value, loading]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, ((_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : (_state$service4$cache = _state$service4.cacheItem) === null || _state$service4$cache === void 0 ? void 0 : _state$service4$cache.autoClose) && /*#__PURE__*/React.createElement(Skeleton, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, ((_state$service6 = state.service) === null || _state$service6 === void 0 ? void 0 : (_state$service6$cache = _state$service6.cacheItem) === null || _state$service6$cache === void 0 ? void 0 : _state$service6$cache.autoClose) && /*#__PURE__*/React.createElement(Skeleton, {
     loading: true,
     active: true,
     round: true

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

@@ -29,12 +29,13 @@ import "./index.less";
 import CollapsibleList from "../../../components/collapsibleList";
 import { renderBundles } from "../../../components/collapsibleList/utils";
 import { useUpdateEffect, useMemoizedFn } from "ahooks";
+// import SelectTime from "../../../../../../../materials/src/components/select-time";
 import { getErrorList, getServiceTimes, deleteCacheParams } from "../../../utils";
 import Like from "../like";
 import { getNoResource } from "../../../mock";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj } from "../addService/utils";
 var Info = function Info() {
-  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service3, _state$service3$cache, _state$service5, _state$service5$cache, _state$service5$cache2, _state$service5$cache3, _state$service$cacheI5, _state$service6, _state$service6$cache, _state$service6$cache2, _state$service$cacheI6, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9;
+  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service3, _state$service3$cache, _state$service5, _state$service5$cache, _state$service5$cache2, _state$service5$cache3, _window$BaseMaterials, _state$service$cacheI5, _state$service6, _state$service6$cache, _state$service6$cache2, _state$service$cacheI6, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9, _state$bookingConfig5, _state$bookingConfig6, _state$bookingConfig7, _state$bookingConfig8;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -540,6 +541,7 @@ var Info = function Info() {
   useEffect(function () {
     getResourcesData();
   }, [state.date.value]);
+  var SelectTime = (_window$BaseMaterials = window.BaseMaterials) === null || _window$BaseMaterials === void 0 ? void 0 : _window$BaseMaterials.SelectTime;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Drawer, {
     zIndex: 1000,
     forceRender: true,
@@ -642,9 +644,22 @@ var Info = function Info() {
     rules: [{
       required: true
     }]
-  }, /*#__PURE__*/React.createElement(Select, {
-    size: "large"
-  }, renderOptions(timeObj.timeSlices)))), /*#__PURE__*/React.createElement(Col, {
+  }, SelectTime ? /*#__PURE__*/React.createElement(SelectTime, {
+    slice: (_state$bookingConfig5 = state.bookingConfig) === null || _state$bookingConfig5 === void 0 ? void 0 : (_state$bookingConfig6 = _state$bookingConfig5.config) === null || _state$bookingConfig6 === void 0 ? void 0 : (_state$bookingConfig7 = _state$bookingConfig6.basic) === null || _state$bookingConfig7 === void 0 ? void 0 : (_state$bookingConfig8 = _state$bookingConfig7.service_time) === null || _state$bookingConfig8 === void 0 ? void 0 : _state$bookingConfig8.value,
+    onChange: function onChange(e) {
+      console.log("eeee", e);
+    },
+    timePickerProps: {
+      style: {
+        width: "100%"
+      }
+    },
+    timeProps: {
+      style: {
+        zoom: 0.8
+      }
+    }
+  }) : null)), /*#__PURE__*/React.createElement(Col, {
     span: 12
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: locales.getText("pisell2.text.duration"),

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

@@ -27,7 +27,7 @@ var ServiceList = function ServiceList() {
     maxLimit: locales.getText("pisell2.text.status.service-error-3")
   };
   var handleEditService = function handleEditService(item) {
-    if (state.disabledEdit) {
+    if (state.disabledEdit || state.disableEventBookingEdit) {
       return;
     }
     dispatch({

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

@@ -40,7 +40,7 @@ declare const _default: {
         'pisell2.text.add-notes': string;
         'pisell2.text.notes': string;
         'pisell2.text.new-appointment': string;
-        'pisell2.text.enroll': string;
+        'pisell2.text.enroll.detail': string;
         'pisell2.text.add-products-successfully': string;
         'pisell2.text.add': string;
         'pisell2.text.created-successfully': string;
@@ -194,7 +194,7 @@ declare const _default: {
         'pisell2.text.add-notes': string;
         'pisell2.text.notes': string;
         'pisell2.text.new-appointment': string;
-        'pisell2.text.enroll': string;
+        'pisell2.text.enroll.detail': string;
         'pisell2.text.add-products-successfully': string;
         'pisell2.text.refund': string;
         'pisell2.text.refund-amount': string;
@@ -343,7 +343,7 @@ declare const _default: {
         'pisell2.text.add-notes': string;
         'pisell2.text.notes': string;
         'pisell2.text.new-appointment': string;
-        'pisell2.text.enroll': string;
+        'pisell2.text.enroll.detail': string;
         'pisell2.text.add-products-successfully': string;
         'pisell2.text.add': string;
         'pisell2.text.created-successfully': string;

package/es/components/booking/locales.js

@@ -40,7 +40,7 @@ export default {
     'pisell2.text.add-notes': 'Add Notes',
     'pisell2.text.notes': 'Notes',
     'pisell2.text.new-appointment': 'New appointment',
-    'pisell2.text.enroll': 'Enroll',
+    'pisell2.text.enroll.detail': 'Details',
     'pisell2.text.add-products-successfully': 'Add products successfully',
     'pisell2.text.add': 'Add',
     'pisell2.text.created-successfully': 'Appointment created',
@@ -131,23 +131,23 @@ export default {
     'pisell2.text.add-contacts': 'Add contact',
     'pisell2.text.edit-profile': 'Edit profile',
     'pisell2.text.remove-contact': 'Remove contact',
-    'pisell2.text.order.sales.channel.online': "Online Store",
-    'pisell2.text.order.sales.channel.pos-terminal': "Pisell Terminal",
+    'pisell2.text.order.sales.channel.online': "Online store",
+    'pisell2.text.order.sales.channel.pos-terminal': "Pisell terminal",
     'pisell2.text.order.sales.channel.boxcocal': "Boxlocal",
-    'pisell2.text.order.sales.channel.tableorder': "Table Order",
-    'pisell2.text.order.sales.channel.reserve': "Google Reservation",
+    'pisell2.text.order.sales.channel.tableorder': "Table order",
+    'pisell2.text.order.sales.channel.reserve': "Google reservation",
     'pisell2.text.rebook': "Rebook",
     'pisell2.text.now': 'Now',
-    'pisell2.text.deposit-list': "Deposit List",
+    'pisell2.text.deposit-list': "Deposit list",
     'pisell2.text.deposit-item-status-paid': "Paid",
     'pisell2.text.deposit-item-status-unpaid': "Unpaid",
-    'pisell2.text.deposit-order-total': "Order Total",
-    'pisell2.text.deposit-order-detail': "Order Details",
-    'pisell2.text.deposit-collect-deposit': "Collect Deposit",
+    'pisell2.text.deposit-order-total': "Order total",
+    'pisell2.text.deposit-order-detail': "Order details",
+    'pisell2.text.deposit-collect-deposit': "Collect deposit",
     'pisell2.text.deposit-order-no': "Order No",
     'pisell2.text.deposit-amount': "Amount",
-    'pisell2.text.deposit-deposit-amount': "Deposit Amount",
-    'pisell2.text.deposit-generate-payment-link': "Generate Payment Link",
+    'pisell2.text.deposit-deposit-amount': "Deposit amount",
+    'pisell2.text.deposit-generate-payment-link': "Generate payment link",
     'pisell2.text.deposit-list-empty': "Please add a deposit",
     'pisell2.text.deposit-amount-message': "Amount must be greater than 0",
     'pisell2.text.deposit-amount-message2': "The deposit amount cannot be greater than the total order amount",
@@ -209,7 +209,7 @@ export default {
     'pisell2.text.add-notes': '添加备注',
     'pisell2.text.notes': '备注',
     'pisell2.text.new-appointment': '新预约',
-    'pisell2.text.enroll': '报名',
+    'pisell2.text.enroll.detail': '详情',
     'pisell2.text.add-products-successfully': '添加商品成功',
     'pisell2.text.refund': '退款',
     'pisell2.text.refund-amount': '退款金额',
@@ -378,7 +378,7 @@ export default {
     'pisell2.text.add-notes': '添加備注',
     'pisell2.text.notes': '備注',
     'pisell2.text.new-appointment': '新預約',
-    'pisell2.text.enroll': '报名',
+    'pisell2.text.enroll.detail': '詳情',
     'pisell2.text.add-products-successfully': '添加商品成功',
     //
     'pisell2.text.add': '添加',

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

@@ -86,6 +86,7 @@ export interface FormState {
         end_time: string;
         productIds: number[];
     };
+    disableEventBookingEdit?: boolean;
 }
 export declare const walkInData: {
     id: number;

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

@@ -87,12 +87,6 @@ var Payments = Provider(function (props) {
   useEffect(function () {
     if (state.bookingDetail) {
       init();
-      state.action({
-        type: "pisell1.registerPlugin",
-        data: {
-          pluginList: ["RefundPlugin"]
-        }
-      });
     }
   }, [state.bookingDetail]);
   var getRefundInfo = /*#__PURE__*/function () {

package/es/components/booking/utils.js

@@ -576,7 +576,7 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
       _extend.start_time = findNextSlice(findNextSliceProps);
     } else {
       // 没有预设日期, 则使用当前 https://www.yuque.com/feg4xm/manual/tzvrnt05ifihkndg
-      _extend.start_time = 'now';
+      _extend.start_time = dayjs().format('HH:mm');
     }
   }
   _extend = _objectSpread(_objectSpread({}, _extend), cacheItem._extend);

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

@@ -15,6 +15,7 @@ export interface AddButtonProps {
     style?: React.CSSProperties;
     disabled?: boolean;
     loading?: boolean;
+    showDisabledMessage?: boolean;
 }
 declare const AddButton: React.FC<AddButtonProps>;
 export default AddButton;

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

@@ -46,13 +46,16 @@ var AddButton = ({
   subTitle,
   style,
   disabled,
-  loading
+  loading,
+  showDisabledMessage = true
 }) => {
   const _onClick = () => {
     if (disabled) {
-      import_antd.message.warning(
-        import_utils.locales.getText("pisell2.text.please-select-the-customer-first")
-      );
+      if (showDisabledMessage) {
+        import_antd.message.warning(
+          import_utils.locales.getText("pisell2.text.please-select-the-customer-first")
+        );
+      }
     } else {
       onClick == null ? void 0 : onClick();
     }

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

@@ -72,7 +72,8 @@ var CustomSelect = (props, ref) => {
     loadMore,
     modalOpen,
     closeCallback,
-    autoFocus
+    autoFocus,
+    showDropDown = true
   } = props;
   const searchRef = (0, import_react.useRef)();
   const [_value, set_value] = (0, import_react.useState)([]);
@@ -206,7 +207,7 @@ var CustomSelect = (props, ref) => {
         key: d[rowKey]
       },
       previewItemRender == null ? void 0 : previewItemRender(d),
-      /* @__PURE__ */ import_react.default.createElement(
+      showDropDown && /* @__PURE__ */ import_react.default.createElement(
         "div",
         {
           onClick: (e) => {

package/lib/components/booking/components/footer/FooterMenus/index.d.ts

@@ -1,4 +1,4 @@
 import React from "react";
 import "./index.less";
-declare const FooterMenus: ({ state, source }: any) => React.JSX.Element | null;
+declare const FooterMenus: ({ state, menuChange, items }: any) => React.JSX.Element | null;
 export default FooterMenus;

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

@@ -35,27 +35,7 @@ module.exports = __toCommonJS(FooterMenus_exports);
 var import_react = __toESM(require("react"));
 var import_menuButton = __toESM(require("../../../components/menuButton"));
 var import_index = require("./index.less");
-var import_utils = require("@pisell/utils");
-var FooterMenus = ({ state, source }) => {
-  const items = (0, import_react.useMemo)(() => {
-    let list = [];
-    if (source === "info" && state.bookingId && state.renderType !== "eventBooking") {
-      list.push({
-        label: import_utils.locales.getText("pisell2.text.rebook"),
-        key: "rebook"
-      });
-    }
-    return list;
-  }, [state, source]);
-  const handleRebook = () => {
-    var _a;
-    (_a = state.onRebook) == null ? void 0 : _a.call(state);
-  };
-  const menuChange = (e) => {
-    if (e.key === "rebook") {
-      handleRebook();
-    }
-  };
+var FooterMenus = ({ state, menuChange, items }) => {
   return items.length ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-footer-buttons-item-rebook" }, /* @__PURE__ */ import_react.default.createElement(
     import_menuButton.default,
     {
@@ -63,6 +43,9 @@ var FooterMenus = ({ state, source }) => {
       dropdownProps: {
         placement: "bottomLeft",
         menu: {
+          style: {
+            minWidth: 200
+          },
           items,
           onClick: menuChange
         }