@pisell/private-materials 3.0.117 → 3.0.119

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

@@ -18,7 +18,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useContext, useEffect, useMemo, useState, useImperativeHandle, forwardRef } from 'react';
 import Delete_wght300_24px from '@pisell/icon/es/Delete_wght300_24px';
 import Drawer from "../../../components/drawer";
 import { Context } from "../../model";
@@ -30,13 +30,13 @@ 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 { getErrorList, getServiceTimes, deleteCacheParams, getProductTotalPrice } from "../../../utils";
 import Like from "../like";
 import { getNoResource } from "../../../mock";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj } from "../addService/utils";
 var submitLock = false;
-var Info = function Info() {
-  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service$cacheI6, _state$service3, _state$service3$cache, _state$service5, _state$service5$cache, _state$service5$cache2, _state$service5$cache3, _window$BaseMaterials, _state$service$cacheI7, _state$service6, _state$service6$cache, _state$service6$cache2, _state$service$cacheI8, _state$service$cacheI9, _state$service$cacheI10, _state$service$cacheI11, _state$bookingConfig5, _state$bookingConfig6, _state$bookingConfig7, _state$bookingConfig8;
+var Info = function Info(_, ref) {
+  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service$cacheI4, _state$service$cacheI5, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9, _state$service3, _state$service3$cache, _state$service5, _state$service5$cache, _state$service5$cache2, _state$service5$cache3, _window$BaseMaterials, _state$service$cacheI10, _state$service6, _state$service6$cache, _state$service6$cache2, _state$service$cacheI11, _state$service$cacheI12, _state$service$cacheI13, _state$service$cacheI14, _state$bookingConfig5, _state$bookingConfig6, _state$bookingConfig7, _state$bookingConfig8;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -59,12 +59,12 @@ var Info = function Info() {
     setSelectOpen = _useState4[1];
 
   // 当前商品信息+ 表单信息
-  var getCurrentCacheItem = function getCurrentCacheItem() {
+  var getCurrentCacheItem = function getCurrentCacheItem(_cacheItem) {
     // 获取当前表单数据
     var values = form.getFieldsValue();
-    var _cacheItem = state.service.cacheItem;
-    return _objectSpread(_objectSpread({}, _cacheItem), {}, {
-      _extend: _objectSpread(_objectSpread({}, _cacheItem === null || _cacheItem === void 0 ? void 0 : _cacheItem._extend), values)
+    var _item = _cacheItem || state.service.cacheItem;
+    return _objectSpread(_objectSpread({}, _item), {}, {
+      _extend: _objectSpread(_objectSpread({}, _item === null || _item === void 0 ? void 0 : _item._extend), values)
     });
   };
 
@@ -156,7 +156,7 @@ var Info = function Info() {
    */
   var getResources = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(cacheItem) {
-      var _state$service$cacheI, _list, autoClose, _cacheItem;
+      var _list, _cacheItem, autoClose;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -164,8 +164,8 @@ var Info = function Info() {
             _context.prev = 1;
             // 合并无资源
             _list = state.service.resourcesOrigin || [];
-            autoClose = (_state$service$cacheI = state.service.cacheItem) === null || _state$service$cacheI === void 0 ? void 0 : _state$service$cacheI.autoClose;
             _cacheItem = cacheItem || getCurrentCacheItem();
+            autoClose = _cacheItem === null || _cacheItem === void 0 ? void 0 : _cacheItem.autoClose;
             if (_cacheItem._extend) {
               _context.next = 7;
               break;
@@ -219,12 +219,12 @@ var Info = function Info() {
    * @Date: 2024-01-09 13:59
    */
   var handleDeleteProduct = function handleDeleteProduct() {
-    var _state$service$cacheI2;
+    var _state$service$cacheI;
     if (state.channelDisabledEdit) {
       return;
     }
     var _list = _toConsumableArray(state.service.value);
-    var _id = (_state$service$cacheI2 = state.service.cacheItem) === null || _state$service$cacheI2 === void 0 ? void 0 : _state$service$cacheI2._id;
+    var _id = (_state$service$cacheI = state.service.cacheItem) === null || _state$service$cacheI === void 0 ? void 0 : _state$service$cacheI._id;
     _list = _list.filter(function (d) {
       return d._id !== _id;
     });
@@ -305,8 +305,9 @@ var Info = function Info() {
    * @Date: 2024-01-09 14:03
    */
   var getDiscount = function getDiscount() {
-    var _state$service$cacheI3;
-    var oPrice = Number(((_state$service$cacheI3 = state.service.cacheItem) === null || _state$service$cacheI3 === void 0 ? void 0 : _state$service$cacheI3._extend.origin_total) || 0);
+    var _state$service$cacheI2;
+    console.log('折扣内', state.service.cacheItem);
+    var oPrice = Number(((_state$service$cacheI2 = state.service.cacheItem) === null || _state$service$cacheI2 === void 0 ? void 0 : _state$service$cacheI2._extend.origin_total) || 0);
     var cPrice = Number(useTotal || 0);
     var discount = '';
     // 原价 = 现价 为无折扣
@@ -395,22 +396,18 @@ var Info = function Info() {
         addModal: false,
         value: _list,
         edit: true,
-        cacheItem: null
+        cacheItem: null,
+        changeService: false
       }
     });
   };
-  var setEditData = useMemoizedFn(function () {
-    if (state.service.editModal) {
-      var cacheItem = state.service.cacheItem;
-      var values = cacheItem._extend;
-      form.setFieldsValue(values);
-      if (state.renderType !== 'eventBooking') {
-        // 获取资源列表
-        getResources();
-      }
-    } else {
-      setSelectOpen(undefined);
-      form.resetFields();
+  var setEditData = useMemoizedFn(function (_cacheItem) {
+    var cacheItem = _cacheItem || state.service.cacheItem;
+    var values = cacheItem._extend;
+    form.setFieldsValue(values);
+    if (state.renderType !== 'eventBooking') {
+      // 获取资源列表
+      getResources(_cacheItem);
     }
   });
 
@@ -423,12 +420,12 @@ var Info = function Info() {
    * @Date: 2024-01-09 14:06
    */
   var isReason = useMemo(function () {
-    var _state$service$cacheI4;
-    var oPrice = Number(((_state$service$cacheI4 = state.service.cacheItem) === null || _state$service$cacheI4 === void 0 ? void 0 : _state$service$cacheI4._extend.origin_total) || 0);
+    var _state$service$cacheI3;
+    var oPrice = Number(((_state$service$cacheI3 = state.service.cacheItem) === null || _state$service$cacheI3 === void 0 ? void 0 : _state$service$cacheI3._extend.origin_total) || 0);
     var cPrice = Number(useTotal || 0);
     // 原价 !== 现价
     return cPrice !== oPrice;
-  }, [useTotal, state.service.cacheItem]);
+  }, [useTotal, (_state$service$cacheI4 = state.service.cacheItem) === null || _state$service$cacheI4 === void 0 ? void 0 : (_state$service$cacheI5 = _state$service$cacheI4._extend) === null || _state$service$cacheI5 === void 0 ? void 0 : _state$service$cacheI5.origin_total]);
 
   /**
    * @title: 错误信息列表
@@ -450,25 +447,22 @@ var Info = function Info() {
    * @Date: 2024-01-09 14:07
    */
   useUpdateEffect(function () {
-    var _state$service$cacheI5;
+    var _state$service$cacheI6;
     // autoClose 不执行下面逻辑
-    if (state.service.cacheItem && !((_state$service$cacheI5 = state.service.cacheItem) !== null && _state$service$cacheI5 !== void 0 && _state$service$cacheI5.autoClose)) {
+    if (state.service.cacheItem && !((_state$service$cacheI6 = state.service.cacheItem) !== null && _state$service$cacheI6 !== void 0 && _state$service$cacheI6.autoClose)) {
       if (useStartTime && useDuration && state.renderType !== 'eventBooking') {
         getResources();
       }
     }
-  }, [useStartTime, useDuration, state.renderType, state.service.resourcesOrigin, (_state$service$cacheI6 = state.service.cacheItem) === null || _state$service$cacheI6 === void 0 ? void 0 : _state$service$cacheI6.autoClose]);
-
-  /**
-   * @title: 打开弹窗时 设置数据
-   * @description:
-   * @return {*}
-   * @Author: zhiwei.Wang
-   * @Date: 2024-01-09 14:07
-   */
+  }, [useStartTime, useDuration, state.renderType, state.service.resourcesOrigin, (_state$service$cacheI7 = state.service.cacheItem) === null || _state$service$cacheI7 === void 0 ? void 0 : _state$service$cacheI7.autoClose]);
   useEffect(function () {
-    setEditData();
-  }, [state.service.editModal, setEditData]);
+    // if (!state.service.editModal) {
+    //   setTimeout(() => {
+    //     setSelectOpen(undefined);
+    //     form.resetFields();
+    //   }, 200);
+    // }
+  }, [state.service.editModal]);
 
   /**
    * @title: 资源 时间 发生变化时, 重新计算错误信息
@@ -490,7 +484,7 @@ var Info = function Info() {
    */
   useEffect(function () {
     getDiscount();
-  }, [useTotal, state.service.cacheItem]);
+  }, [useTotal, (_state$service$cacheI8 = state.service.cacheItem) === null || _state$service$cacheI8 === void 0 ? void 0 : (_state$service$cacheI9 = _state$service$cacheI8._extend) === null || _state$service$cacheI9 === void 0 ? void 0 : _state$service$cacheI9.origin_total]);
 
   // useEffect(() => {
   // 	handleLikeResource("common");
@@ -568,18 +562,117 @@ var Info = function Info() {
   useEffect(function () {
     getResourcesData();
   }, [state.date.value]);
+
+  /**
+   * @title: 编辑商品
+   * @description:
+   * @param {any} e
+   * @return {*}
+   * @Author: zhiwei.Wang
+   * @Date: 2024-08-28 17:08
+   */
+  var handleEdit = function handleEdit(e) {
+    // 当前商品
+    var item = state.service.cacheItem;
+
+    // 表单数据
+    var values = form.getFieldsValue();
+
+    // 打开商品详情弹窗
+    state.action({
+      type: 'pisell1.handleOpenProductModal',
+      data: {
+        id: item.id,
+        date: state.date.value.format('YYYY-MM-DD'),
+        showConfig: {
+          option: false,
+          session: false,
+          variant: false,
+          package: true
+        },
+        value: item._extend.other
+      },
+      callback: function callback(e) {
+        // 重新生成商品
+        var cacheItem = _objectSpread(_objectSpread({}, item), {}, {
+          product_id: item.id,
+          _id: item === null || item === void 0 ? void 0 : item._id,
+          _key: e.key,
+          _extend: _objectSpread(_objectSpread(_objectSpread({}, item._extend), values), {}, {
+            // 覆盖选择的规格和套餐
+            other: JSON.parse(JSON.stringify(e))
+          }),
+          new: 0
+        });
+
+        // 获取商品总价
+        var _total = getProductTotalPrice(cacheItem);
+
+        // 用于折扣 可修改
+        cacheItem._extend.total = _total;
+
+        // 用于储存原价
+        cacheItem._extend.origin_total = _total;
+
+        // 覆盖商品
+        dispatch({
+          type: 'setService',
+          payload: {
+            cacheItem: cacheItem
+          }
+        });
+
+        // 更新表单内的商品价格
+        form.setFieldsValue({
+          total: _total
+        });
+      }
+    });
+  };
+
+  /**
+   * @title: 更换商品
+   * @description:
+   * @param {any} e
+   * @return {*}
+   * @Author: zhiwei.Wang
+   * @Date: 2024-08-28 17:10
+   */
+  var handleChange = function handleChange(e) {
+    if (state.channelDisabledEdit) {
+      return;
+    }
+    dispatch({
+      type: 'setService',
+      payload: {
+        addModal: true,
+        editModal: true,
+        //用于控制 添加商品 和 编辑服务弹窗的上下层级
+        changeService: true
+      }
+    });
+  };
+  useImperativeHandle(ref, function () {
+    return {
+      init: setEditData
+    };
+  });
+  console.log('state.service.value', state.service.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,
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Drawer
+  //通过zIndex的方式控制  添加商品 和 编辑服务弹窗的上下层级
+  , {
+    zIndex: state.service.changeService ? 999 : 1000,
     forceRender: true,
-    open: state.service.editModal && !((_state$service$cacheI7 = state.service.cacheItem) !== null && _state$service$cacheI7 !== void 0 && _state$service$cacheI7.autoClose),
+    open: state.service.editModal && !((_state$service$cacheI10 = state.service.cacheItem) !== null && _state$service$cacheI10 !== void 0 && _state$service$cacheI10.autoClose),
     title: locales.getText('pisell2.text.edit-service'),
     onClose: function onClose() {
       dispatch({
         type: 'setService',
         payload: {
           editModal: false,
-          cacheItem: null
+          cacheItem: null,
+          changeService: false
         }
       });
     }
@@ -599,22 +692,16 @@ var Info = function Info() {
   }, /*#__PURE__*/React.createElement(Form.Item, {
     name: "product_name"
   }, /*#__PURE__*/React.createElement("div", {
-    className: "current-service-info",
-    onClick: function onClick() {
-      if (state.channelDisabledEdit) {
-        return;
-      }
-      dispatch({
-        type: 'setService',
-        payload: {
-          addModal: true,
-          editModal: false
-        }
-      });
-    }
+    className: "current-service-info"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "current-service-info-name-wrap"
   }, /*#__PURE__*/React.createElement("div", {
     className: "current-service-info-name"
-  }, ((_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$cache2 = _state$service6$cache._extend) === null || _state$service6$cache2 === void 0 ? void 0 : _state$service6$cache2.product_name) || '-'), /*#__PURE__*/React.createElement(CollapsibleList, {
+  }, ((_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$cache2 = _state$service6$cache._extend) === null || _state$service6$cache2 === void 0 ? void 0 : _state$service6$cache2.product_name) || '-'), /*#__PURE__*/React.createElement(Button, {
+    onClick: handleEdit
+  }, locales.getText('pisell2.text.edit')), /*#__PURE__*/React.createElement(Button, {
+    onClick: handleChange
+  }, locales.getText('pisell2.text.change'))), /*#__PURE__*/React.createElement(CollapsibleList, {
     style: {
       marginTop: bundles.length ? '8px' : 0
     },
@@ -639,8 +726,8 @@ var Info = function Info() {
       width: '100%'
     },
     min: 0,
-    max: ((_state$service$cacheI8 = state.service.cacheItem) === null || _state$service$cacheI8 === void 0 ? void 0 : (_state$service$cacheI9 = _state$service$cacheI8._extend) === null || _state$service$cacheI9 === void 0 ? void 0 : _state$service$cacheI9.origin_total) || 0,
-    placeholder: ((_state$service$cacheI10 = state.service.cacheItem) === null || _state$service$cacheI10 === void 0 ? void 0 : (_state$service$cacheI11 = _state$service$cacheI10._extend) === null || _state$service$cacheI11 === void 0 ? void 0 : _state$service$cacheI11.origin_total) || '0'
+    max: ((_state$service$cacheI11 = state.service.cacheItem) === null || _state$service$cacheI11 === void 0 ? void 0 : (_state$service$cacheI12 = _state$service$cacheI11._extend) === null || _state$service$cacheI12 === void 0 ? void 0 : _state$service$cacheI12.origin_total) || 0,
+    placeholder: ((_state$service$cacheI13 = state.service.cacheItem) === null || _state$service$cacheI13 === void 0 ? void 0 : (_state$service$cacheI14 = _state$service$cacheI13._extend) === null || _state$service$cacheI14 === void 0 ? void 0 : _state$service$cacheI14.origin_total) || '0'
   }))), /*#__PURE__*/React.createElement(Col, {
     span: 12
   }, /*#__PURE__*/React.createElement(Form.Item, {
@@ -759,4 +846,4 @@ var Info = function Info() {
     }
   }, locales.getText('pisell2.text.apply'))))));
 };
-export default Info;
+export default /*#__PURE__*/forwardRef(Info);

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

@@ -1,5 +1,5 @@
 .pisell-lowcode__booking-service-body-edit {
-  padding: 24px 32px;
+  padding: 24px 32px 100px !important;
 }
 
 
@@ -14,6 +14,7 @@
   align-items: center;
   justify-content: center;
   gap: 12px;
+  background-color: #fff;
 
   .pisell-lowcode__booking-service-delete-wrap {
     height: 48px;
@@ -96,10 +97,19 @@
   overflow: hidden;
   padding: 11px;
 
-  .current-service-info-name {
-    font-size: 16px;
-    color: #101828;
-    font-weight: 650;
+  .current-service-info-name-wrap {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+
+    .current-service-info-name {
+      font-size: 16px;
+      color: #101828;
+      font-weight: 650;
+      flex: 1;
+    }
+
+    .current-service-info-change-btn {}
   }
 
   &:hover {

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

@@ -1,4 +1,4 @@
-import React, { useEffect, useContext, useMemo } from 'react';
+import React, { useEffect, useContext, useMemo, useRef } from 'react';
 import AddService from "./addService";
 import { Context } from "../model";
 import EditService from "./editService";
@@ -9,6 +9,7 @@ var Service = function Service() {
   var _state$bookingConfig2, _state$bookingConfig3;
   var _useContext = useContext(Context),
     state = _useContext.state;
+  var detailRef = useRef();
   useEffect(function () {
     document.body.id = 'body';
   }, []);
@@ -35,8 +36,20 @@ var Service = function Service() {
     }
     return true;
   }, [state, appointment_card.quick_time]);
+  var handleEdit = function handleEdit(cacheItem) {
+    setTimeout(function () {
+      var _detailRef$current, _detailRef$current$in;
+      (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 ? void 0 : (_detailRef$current$in = _detailRef$current.init) === null || _detailRef$current$in === void 0 ? void 0 : _detailRef$current$in.call(_detailRef$current, cacheItem);
+    }, 100);
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-wrap"
-  }, /*#__PURE__*/React.createElement(ServiceList, null), /*#__PURE__*/React.createElement(AddService, null)), /*#__PURE__*/React.createElement(EditService, null), showAddTimeModal && /*#__PURE__*/React.createElement(AddTimeModal, null));
+  }, /*#__PURE__*/React.createElement(ServiceList, {
+    onEdit: handleEdit
+  }), /*#__PURE__*/React.createElement(AddService, {
+    onEdit: handleEdit
+  })), /*#__PURE__*/React.createElement(EditService, {
+    ref: detailRef
+  }), showAddTimeModal && /*#__PURE__*/React.createElement(AddTimeModal, null));
 };
 export default Service;

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

@@ -1,4 +1,6 @@
-import React from "react";
-import "./index.less";
-declare const ServiceList: () => React.JSX.Element;
+import React from 'react';
+import './index.less';
+declare const ServiceList: ({ onEdit }: {
+    onEdit: any;
+}) => React.JSX.Element;
 export default ServiceList;

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

@@ -10,28 +10,29 @@ 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 React, { useCallback, useContext } from "react";
-import { locales } from "@pisell/utils";
+import React, { useCallback, useContext } from 'react';
+import { locales } from '@pisell/utils';
 import "./index.less";
 import { Context } from "../../model";
 import { getNoResource } from "../../../mock";
 import { getErrorList } from "../../../utils";
 import ServiceItem from "../serviceItem";
-var ServiceList = function ServiceList() {
+var ServiceList = function ServiceList(_ref) {
+  var onEdit = _ref.onEdit;
   var _useContext = useContext(Context),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
   var errorTypes = {
-    product: locales.getText("pisell2.text.status.service-error-1"),
-    time: locales.getText("pisell2.text.status.service-error-2"),
-    maxLimit: locales.getText("pisell2.text.status.service-error-3")
+    product: locales.getText('pisell2.text.status.service-error-1'),
+    time: locales.getText('pisell2.text.status.service-error-2'),
+    maxLimit: locales.getText('pisell2.text.status.service-error-3')
   };
   var handleEditService = function handleEditService(item) {
     if (state.disabledEdit || state.disableEventBookingEdit) {
       return;
     }
     dispatch({
-      type: "setService",
+      type: 'setService',
       payload: {
         editModal: true,
         cacheItem: _objectSpread(_objectSpread({}, item), {}, {
@@ -39,6 +40,9 @@ var ServiceList = function ServiceList() {
         })
       }
     });
+    onEdit === null || onEdit === void 0 ? void 0 : onEdit(_objectSpread(_objectSpread({}, item), {}, {
+      new: 0
+    }));
   };
   var getResourceItem = useCallback(function (id) {
     if (id === 0) {
@@ -50,15 +54,15 @@ var ServiceList = function ServiceList() {
   }, [state.service.resources]);
   var getErrorMessage = useCallback(function (service, resourceItem) {
     var errorList = getErrorList(resourceItem, service);
-    var errorMessage = "";
+    var errorMessage = '';
     if (!service.id) {
       return errorList[0].label;
     }
     if (errorList.length) {
       if (errorList.length > 1) {
-        errorMessage = "".concat(errorList.length, " ").concat(locales.getText("pisell2.text.warnings"));
+        errorMessage = "".concat(errorList.length, " ").concat(locales.getText('pisell2.text.warnings'));
       } else {
-        errorMessage = (resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.labelText) + " " + errorTypes[errorList[0].type];
+        errorMessage = (resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.labelText) + ' ' + errorTypes[errorList[0].type];
       }
     }
     return errorMessage;
@@ -77,7 +81,7 @@ var ServiceList = function ServiceList() {
       }) : d;
     });
     dispatch({
-      type: "setService",
+      type: 'setService',
       payload: {
         value: _list,
         edit: true

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

@@ -48,7 +48,7 @@ export var moveItemToFront = function moveItemToFront(arr, targetId) {
  */
 export var isInterval = function isInterval(time1, time2) {
   var interval = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1000;
-  return time2 - time1 < interval;
+  return Math.abs(time2 - time1) < interval;
 };
 
 /**

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

@@ -165,6 +165,13 @@ declare const _default: {
         "pisell2.text.add-client": string;
         'pisell2.text.variant-client-change': string;
         'pisell2.text.variant-client-no-data': string;
+        'page.event.booking.text.duplicate-enrollment': string;
+        'page.event.booking.text.duplicate-enrollment-content': ({ customerName, title, list, }: {
+            customerName: string;
+            title: string;
+            list: any[];
+        }) => string;
+        'page.event.booking.text.duplicate-enrollment-confirm': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -332,6 +339,13 @@ declare const _default: {
         "pisell2.text.add-client": string;
         'pisell2.text.variant-client-change': string;
         'pisell2.text.variant-client-no-data': string;
+        'page.event.booking.text.duplicate-enrollment': string;
+        'page.event.booking.text.duplicate-enrollment-content': ({ customerName, title, list, }: {
+            customerName: string;
+            title: string;
+            list: any[];
+        }) => string;
+        'page.event.booking.text.duplicate-enrollment-confirm': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -499,6 +513,13 @@ declare const _default: {
         "pisell2.text.add-client": string;
         'pisell2.text.variant-client-change': string;
         'pisell2.text.variant-client-no-data': string;
+        'page.event.booking.text.duplicate-enrollment': string;
+        'page.event.booking.text.duplicate-enrollment-content': ({ customerName, title, list, }: {
+            customerName: string;
+            title: string;
+            list: any[];
+        }) => string;
+        'page.event.booking.text.duplicate-enrollment-confirm': string;
     };
 };
 export default _default;

package/es/components/booking/locales.js

@@ -1,3 +1,4 @@
+import dayjs from "dayjs";
 export default {
   "en": {
     'pisell2.text.select-addons': "Select addons",
@@ -179,7 +180,24 @@ export default {
     "pisell2.text.actions": "Actions",
     "pisell2.text.add-client": "Add customer",
     'pisell2.text.variant-client-change': 'Change',
-    'pisell2.text.variant-client-no-data': "No record"
+    'pisell2.text.variant-client-no-data': "No record",
+    'page.event.booking.text.duplicate-enrollment': "Duplicate Enrollment",
+    'page.event.booking.text.duplicate-enrollment-content': function pageEventBookingTextDuplicateEnrollmentContent(_ref) {
+      var customerName = _ref.customerName,
+        title = _ref.title,
+        list = _ref.list;
+      var listStr = list.map(function (item) {
+        if (item.registration_type === 'single') {
+          return "(".concat(item.start_time, " ").concat(dayjs(item.start_date).format('DD/MM/YYYY'), ")");
+        } else if (item.registration_type === 'extra_include') {
+          return "(".concat(item.start_time, " ").concat(dayjs(item.start_date).format('DD/MM/YYYY'), " this and all future events)");
+        } else if (item.registration_type === 'all') {
+          return "(All events)";
+        }
+      });
+      return "".concat(customerName || '', " has already enrolled in the ").concat(title, " ").concat(listStr.join(','), ", Are you sure you want to enroll again\uFF1F");
+    },
+    'page.event.booking.text.duplicate-enrollment-confirm': 'Confirm'
   },
   'zh-CN': {
     'pisell2.text.refunded-amount': '已退金额',
@@ -366,7 +384,24 @@ export default {
     "pisell2.text.actions": "操作选项",
     "pisell2.text.add-client": "添加客户",
     'pisell2.text.variant-client-change': '更改客户',
-    'pisell2.text.variant-client-no-data': "暂无数据"
+    'pisell2.text.variant-client-no-data': "暂无数据",
+    'page.event.booking.text.duplicate-enrollment': "重复报名",
+    'page.event.booking.text.duplicate-enrollment-content': function pageEventBookingTextDuplicateEnrollmentContent(_ref2) {
+      var customerName = _ref2.customerName,
+        title = _ref2.title,
+        list = _ref2.list;
+      var listStr = list.map(function (item) {
+        if (item.registration_type === 'single') {
+          return "(".concat(item.start_date, " ").concat(item.start_time, ")");
+        } else if (item.registration_type === 'extra_include') {
+          return "(".concat(item.start_date, " ").concat(item.start_time, " \u6B64\u6B21\u53CA\u540E\u7EED\u6D3B\u52A8)");
+        } else if (item.registration_type === 'all') {
+          return "(\u6240\u6709\u6D3B\u52A8)";
+        }
+      });
+      return "".concat(customerName || '', "\u5DF2\u62A5\u540D").concat(title, " ").concat(listStr.join(','), ", \u786E\u5B9A\u8981\u518D\u6B21\u62A5\u540D\u5417\uFF1F");
+    },
+    'page.event.booking.text.duplicate-enrollment-confirm': '确认'
   },
   'zh-HK': {
     'pisell2.text.refunded-amount': '已退金額',
@@ -553,6 +588,23 @@ export default {
     "pisell2.text.actions": "操作選項",
     "pisell2.text.add-client": "添加客戶",
     'pisell2.text.variant-client-change': '更改客戶',
-    'pisell2.text.variant-client-no-data': "暫無數據"
+    'pisell2.text.variant-client-no-data': "暫無數據",
+    'page.event.booking.text.duplicate-enrollment': "重複報名",
+    'page.event.booking.text.duplicate-enrollment-content': function pageEventBookingTextDuplicateEnrollmentContent(_ref3) {
+      var customerName = _ref3.customerName,
+        title = _ref3.title,
+        list = _ref3.list;
+      var listStr = list.map(function (item) {
+        if (item.registration_type === 'single') {
+          return "(".concat(item.start_date, " ").concat(item.start_time, ")");
+        } else if (item.registration_type === 'extra_include') {
+          return "(".concat(item.start_date, " ").concat(item.start_time, " \u6B64\u6B21\u53CA\u5F8C\u7E8C\u6D3B\u52D5)");
+        } else if (item.registration_type === 'all') {
+          return "(\u6240\u6709\u6D3B\u52D5)";
+        }
+      });
+      return "".concat(customerName || '', "\u5DF2\u5831\u540D").concat(title, " ").concat(listStr.join(','), ", \u78BA\u5B9A\u8981\u518D\u6B21\u5831\u540D\u55CE\uFF1F");
+    },
+    'page.event.booking.text.duplicate-enrollment-confirm': '確認'
   }
 };