@pisell/private-materials 3.0.214 → 3.1.2

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

@@ -32,7 +32,6 @@ interface CustomSelectProps {
     autoFocus?: boolean;
     showDropDown?: boolean;
     handleOpenModal?: () => void;
-    handleDayChange?: (value: any) => void;
 }
 declare const _default: React.ForwardRefExoticComponent<CustomSelectProps & React.RefAttributes<unknown>>;
 export default _default;

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

@@ -72,8 +72,7 @@ var CustomSelect = function CustomSelect(props, ref) {
     autoFocus = props.autoFocus,
     _props$showDropDown = props.showDropDown,
     showDropDown = _props$showDropDown === void 0 ? true : _props$showDropDown,
-    propsHandleOpenModal = props.handleOpenModal,
-    handleDayChange = props.handleDayChange;
+    propsHandleOpenModal = props.handleOpenModal;
   var searchRef = useRef();
 
   // 当前选择的值
@@ -153,7 +152,7 @@ var CustomSelect = function CustomSelect(props, ref) {
    * @Author: zhiwei.Wang
    * @Date: 2024-01-30 16:45
    */
-  var handleOpenModal = function handleOpenModal(item) {
+  var handleOpenModal = function handleOpenModal() {
     // 禁止则return
     if (disabled) {
       return;
@@ -242,9 +241,6 @@ var CustomSelect = function CustomSelect(props, ref) {
    * @Date: 2024-01-30 16:47
    */
   var handleRemoveItem = function handleRemoveItem(item) {
-    if (handleDayChange) {
-      handleDayChange(item);
-    }
     var _arr = changeArray(_value, item, rowKey);
     _onValueChange(_arr);
     set_value(_arr);

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

@@ -9,7 +9,6 @@ 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; }
 import { getDiscountTime, flexibleObj } from "../../utils";
 import { formatAmount } from '@pisell/utils';
-import { isDayBooking, isDayBookingProduct } from "../../info/service2/utils";
 var getRelationDetailsTotal = function getRelationDetailsTotal(relation_details) {
   var total = 0;
   var _iterator = _createForOfIteratorHelper(relation_details),
@@ -36,8 +35,6 @@ var getRelationDetailsTotal = function getRelationDetailsTotal(relation_details)
 var getProductAmount = function getProductAmount(state, isEdit) {
   var price = 0;
   var duration = 0;
-  // 是否是跨日预约
-  var isDay = isDayBooking(state);
   if (isEdit) {
     // 计算总价  服务 和 附加商品
     if (state !== null && state !== void 0 && state.service || state !== null && state !== void 0 && state.addons) {
@@ -45,65 +42,44 @@ var getProductAmount = function getProductAmount(state, isEdit) {
         _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var _item = _step2.value;
-          // 跨日预约
-          if (isDay) {
-            var quantity = _item._extend.quantity || 1;
-            price += Number(_item._extend.total) * Number(quantity);
-
-            // 普通商品不能加到时长上
-            var _duration = isDayBookingProduct(_item, state) ? _item._extend.duration : 0;
-            duration += _duration;
-          } else {
-            price += Number(_item._extend.total);
-
-            // 附加商品
-            price += getRelationDetailsTotal(_item._extend.relation_details || []);
-            duration += flexibleObj.getValue(_item._extend.duration);
-          }
+          var item = _step2.value;
+          // 预约商品
+          price += Number(item._extend.total);
+
+          // 附加商品
+          price += getRelationDetailsTotal(item._extend.relation_details || []);
+          // price += 
+          duration += flexibleObj.getValue(item._extend.duration);
         }
-
-        // 不是跨日预约才执行
       } catch (err) {
         _iterator2.e(err);
       } finally {
         _iterator2.f();
       }
-      if (!isDay) {
-        var _iterator3 = _createForOfIteratorHelper(state.addons.value),
-          _step3;
-        try {
-          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-            var item = _step3.value;
-            price += Number(item._extend.total) * item._extend.quantity;
-          }
-        } catch (err) {
-          _iterator3.e(err);
-        } finally {
-          _iterator3.f();
+      var _iterator3 = _createForOfIteratorHelper(state.addons.value),
+        _step3;
+      try {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var _item = _step3.value;
+          price += Number(_item._extend.total) * _item._extend.quantity;
         }
+      } catch (err) {
+        _iterator3.e(err);
+      } finally {
+        _iterator3.f();
       }
     }
   } else {
     var _state$bookingDetail, _state$service;
     price = Number((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.product_expect_amount);
-    var services = (state === null || state === void 0 ? void 0 : (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || [];
-    duration = services.reduce(function (pre, cur) {
-      var current = 0;
-      if (isDay) {
-        // 普通商品不能加到时长上
-        var _duration2 = isDayBookingProduct(cur, state) ? cur._extend.duration : 0;
-        current = _duration2 || 0;
-      } else {
-        var _cur$_extend;
-        current = flexibleObj.getValue(((_cur$_extend = cur._extend) === null || _cur$_extend === void 0 ? void 0 : _cur$_extend.duration) || 0);
-      }
-      return pre + current;
+    duration = ((state === null || state === void 0 ? void 0 : (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || []).reduce(function (pre, cur) {
+      var _cur$_extend;
+      return pre + flexibleObj.getValue(((_cur$_extend = cur._extend) === null || _cur$_extend === void 0 ? void 0 : _cur$_extend.duration) || 0);
     }, 0);
   }
   return {
     price: Number(price),
-    duration: getDiscountTime(duration, isDay)
+    duration: getDiscountTime(duration)
   };
 };
 var getProductItemTax = function getProductItemTax(item, bookingDetail) {

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

@@ -17,24 +17,22 @@ 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 { DownOutlined } from '@ant-design/icons';
+import React, { useEffect, useMemo, useState } from 'react';
 import ChevronDown from '@pisell/icon/es/ChevronDown';
-import { formatAmount, locales } from '@pisell/utils';
-import { Button, Dropdown, Modal, Skeleton, Space, message } from 'antd';
 import classNames from 'classnames';
-import React, { useEffect, useMemo, useRef, useState } from 'react';
-import useEngineContext from "../../../../hooks/useEngineContext";
+import { Skeleton, message, Dropdown, Space, Modal } from 'antd';
+import { formatAmount, locales } from '@pisell/utils';
+import { Button } from 'antd';
 import { formatProducts } from "../../addons";
-import { isDayBooking, isHasDayAppointmentProduct } from "../../info/service2/utils";
-import { isBooking4Shop } from "../../info/utils";
-import { createBookings, editBookings } from "../../info2/serve";
-import AppointmentProductModal from "./AppointmentProductModal";
-import FooterMenus from "./FooterMenus";
+import { formatValues } from "./utils";
 import { getSumTotal, is_price_include_tax } from "./amount";
+import FooterMenus from "./FooterMenus";
 import "./index.less";
-import { createEventBooking, editEventBooking } from "./serve";
-import { formatValues } from "./utils";
-
+import useEngineContext from "../../../../hooks/useEngineContext";
+import { DownOutlined } from '@ant-design/icons';
+import { eventBookingCheck } from "./serve";
+import { createBookings, editBookings } from "../../info2/serve";
+import { isBooking4Shop } from "../../info/utils";
 /**
  * @title: 底部
  * @description:
@@ -68,7 +66,6 @@ var Footer = function Footer(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     isShowPaymentLink = _useState8[0],
     setIsShowPaymentLink = _useState8[1];
-  var appointmentProductRef = useRef(null);
   var context = useEngineContext();
   var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
     isTerminal = _context$appHelper$ut.isTerminal,
@@ -289,36 +286,25 @@ var Footer = function Footer(props) {
    */
   var handleCheckout = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var isHasDayProducts, res;
+      var res;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             if (!isEdit) {
-              _context2.next = 10;
+              _context2.next = 6;
               break;
             }
-            if (!isDayBooking(state)) {
-              _context2.next = 5;
-              break;
-            }
-            isHasDayProducts = handleDaySubmit();
-            if (!isHasDayProducts) {
-              _context2.next = 5;
-              break;
-            }
-            return _context2.abrupt("return");
-          case 5:
-            _context2.next = 7;
+            _context2.next = 3;
             return handleSave({
               type: 'checkout'
             });
-          case 7:
+          case 3:
             res = _context2.sent;
             goCheckout((res === null || res === void 0 ? void 0 : res.order_id) || state.bookingId);
             return _context2.abrupt("return");
-          case 10:
+          case 6:
             return _context2.abrupt("return", goCheckout(state.bookingId));
-          case 11:
+          case 7:
           case "end":
             return _context2.stop();
         }
@@ -370,7 +356,7 @@ var Footer = function Footer(props) {
   }();
   var getApis = function getApis() {
     var _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper$ut5, _context$appHelper$ut6;
-    if (isBooking4Shop((_context$appHelper$ut2 = context.appHelper.utils.store) === null || _context$appHelper$ut2 === void 0 ? void 0 : (_context$appHelper$ut3 = _context$appHelper$ut2.getState) === null || _context$appHelper$ut3 === void 0 ? void 0 : (_context$appHelper$ut4 = _context$appHelper$ut3.call(_context$appHelper$ut2)) === null || _context$appHelper$ut4 === void 0 ? void 0 : (_context$appHelper$ut5 = _context$appHelper$ut4.global) === null || _context$appHelper$ut5 === void 0 ? void 0 : (_context$appHelper$ut6 = _context$appHelper$ut5.globalConfig) === null || _context$appHelper$ut6 === void 0 ? void 0 : _context$appHelper$ut6.id, state.renderType) || state.renderType === 'dayBooking') {
+    if (isBooking4Shop((_context$appHelper$ut2 = context.appHelper.utils.store) === null || _context$appHelper$ut2 === void 0 ? void 0 : (_context$appHelper$ut3 = _context$appHelper$ut2.getState) === null || _context$appHelper$ut3 === void 0 ? void 0 : (_context$appHelper$ut4 = _context$appHelper$ut3.call(_context$appHelper$ut2)) === null || _context$appHelper$ut4 === void 0 ? void 0 : (_context$appHelper$ut5 = _context$appHelper$ut4.global) === null || _context$appHelper$ut5 === void 0 ? void 0 : (_context$appHelper$ut6 = _context$appHelper$ut5.globalConfig) === null || _context$appHelper$ut6 === void 0 ? void 0 : _context$appHelper$ut6.id, state.renderType)) {
       return {
         editBooking: editBookings,
         createBooking: createBookings
@@ -382,22 +368,6 @@ var Footer = function Footer(props) {
     };
   };
 
-  /**
-   * @title: 跨日预约提交之前的验证
-   * @description:
-   * @return {*}
-   * @Author: WangHan
-   * @Date: 2024-12-12 16:18
-   */
-  var handleDaySubmit = function handleDaySubmit() {
-    var _isHasDayProducts = isHasDayAppointmentProduct(state);
-    if (_isHasDayProducts) {
-      var _appointmentProductRe;
-      appointmentProductRef === null || appointmentProductRef === void 0 ? void 0 : (_appointmentProductRe = appointmentProductRef.current) === null || _appointmentProductRe === void 0 ? void 0 : _appointmentProductRe.open();
-    }
-    return _isHasDayProducts;
-  };
-
   /**
    * @title: 保存info
    * @description:
@@ -408,115 +378,110 @@ var Footer = function Footer(props) {
    */
   var handleSave = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref4) {
-      var type, _ref4$messageShow, messageShow, isHasDayProducts, _setLoading, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _state$onSave, callbackData, values, api;
+      var type, _ref4$messageShow, messageShow, _setLoading, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _state$onSave, callbackData, values, api, _yield$eventBookingCh, data, confirmed;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             type = _ref4.type, _ref4$messageShow = _ref4.messageShow, messageShow = _ref4$messageShow === void 0 ? true : _ref4$messageShow;
-            if (!isDayBooking(state)) {
-              _context4.next = 5;
-              break;
-            }
-            isHasDayProducts = handleDaySubmit();
-            if (!isHasDayProducts) {
-              _context4.next = 5;
-              break;
-            }
-            return _context4.abrupt("return");
-          case 5:
             // 区分loading, 是点击的checkout 还是save
             _setLoading = type === 'checkout' ? setCheckoutLoading : setLoading;
             _setLoading(true);
             _getApis = getApis(), createBooking = _getApis.createBooking, editBooking = _getApis.editBooking;
-            editApi = state.renderType === 'eventBooking' ? editEventBooking : editBooking;
-            createApi = state.renderType === 'eventBooking' ? createEventBooking : createBooking;
+            editApi = state.renderType === 'eventBooking' ? state.apis.editEventBooking : editBooking;
+            createApi = state.renderType === 'eventBooking' ? state.apis.createEventBooking : createBooking;
             saveOtherValue = {};
             if (!(type === 'save')) {
-              _context4.next = 18;
+              _context4.next = 14;
               break;
             }
-            _context4.next = 14;
+            _context4.next = 10;
             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 14:
+          case 10:
             _context4.t0 = _context4.sent;
             if (_context4.t0) {
-              _context4.next = 17;
+              _context4.next = 13;
               break;
             }
             _context4.t0 = {};
-          case 17:
+          case 13:
             saveOtherValue = _context4.t0;
-          case 18:
-            _context4.prev = 18;
+          case 14:
+            _context4.prev = 14;
             callbackData = null; // 格式化提交的参数
             values = formatValues(_objectSpread(_objectSpread({}, state), saveOtherValue)); // 区分是新增还是编辑
-            api = state.bookingId ? editApi : createApi; // 活动预约新建时校验重复 -- 暂不处理
-            // if (!state.bookingId && state.renderType === 'eventBooking') {
-            //   const { data } = await eventBookingCheck(values);
-            //   if (data.list.length) {
-            //     const confirmed = await modal.confirm({
-            //       icon: null,
-            //       title: locales.getText(
-            //         'page.event.booking.text.duplicate-enrollment'
-            //       ),
-            //       content: locales.getText(
-            //         'page.event.booking.text.duplicate-enrollment-content'
-            //       )({
-            //         customerName: data.customer_name,
-            //         title: data.title,
-            //         list: data.list,
-            //       }),
-            //       width: 480,
-            //       okText: locales.getText(
-            //         'page.event.booking.text.duplicate-enrollment-confirm'
-            //       ),
-            //     });
-            //     if (!confirmed) {
-            //       _setLoading(false);
-            //       return;
-            //     }
-            //   }
-            // }
-            // 如果有addons改动, 则先保存
+            api = state.bookingId ? editApi : createApi; // 活动预约新建时校验重复
+            if (!(!state.bookingId && state.renderType === 'eventBooking')) {
+              _context4.next = 30;
+              break;
+            }
+            _context4.next = 21;
+            return eventBookingCheck(values);
+          case 21:
+            _yield$eventBookingCh = _context4.sent;
+            data = _yield$eventBookingCh.data;
+            if (!data.list.length) {
+              _context4.next = 30;
+              break;
+            }
+            _context4.next = 26;
+            return modal.confirm({
+              icon: null,
+              title: locales.getText('page.event.booking.text.duplicate-enrollment'),
+              content: locales.getText('page.event.booking.text.duplicate-enrollment-content')({
+                customerName: data.customer_name,
+                title: data.title,
+                list: data.list
+              }),
+              width: 480,
+              okText: locales.getText('page.event.booking.text.duplicate-enrollment-confirm')
+            });
+          case 26:
+            confirmed = _context4.sent;
+            if (confirmed) {
+              _context4.next = 30;
+              break;
+            }
+            _setLoading(false);
+            return _context4.abrupt("return");
+          case 30:
             if (!addonsEdit) {
-              _context4.next = 25;
+              _context4.next = 33;
               break;
             }
-            _context4.next = 25;
+            _context4.next = 33;
             return handleSaveAddons();
-          case 25:
+          case 33:
             if (!infoEdit) {
-              _context4.next = 30;
+              _context4.next = 38;
               break;
             }
-            _context4.next = 28;
+            _context4.next = 36;
             return api(values, state.bookingId);
-          case 28:
+          case 36:
             callbackData = _context4.sent;
             if (messageShow) {
               message.success(locales.getText(state.bookingId ? 'pisell2.text.appointment-updated' : 'pisell2.text.created-successfully'));
             }
-          case 30:
-            debugger;
+          case 38:
             // 回调关闭弹窗
             state === null || state === void 0 ? void 0 : state.callback(callbackData);
             _setLoading(false);
 
             // return数据  checkout时需要
             return _context4.abrupt("return", callbackData || values);
-          case 36:
-            _context4.prev = 36;
-            _context4.t1 = _context4["catch"](18);
+          case 43:
+            _context4.prev = 43;
+            _context4.t1 = _context4["catch"](14);
             console.log(_context4.t1);
             if ((_context4.t1 === null || _context4.t1 === void 0 ? void 0 : _context4.t1.code) === 70101) {
               message.error(_context4.t1 === null || _context4.t1 === void 0 ? void 0 : _context4.t1.message);
             }
             _setLoading(false);
-          case 41:
+          case 48:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, null, [[18, 36]]);
+      }, _callee4, null, [[14, 43]]);
     }));
     return function handleSave(_x3) {
       return _ref5.apply(this, arguments);
@@ -834,7 +799,7 @@ var Footer = function Footer(props) {
 
   /**
    * @title: 清空按钮
-   * @description:
+   * @description: 
    * @return: *
    * @Author: shengjie.zuo
    * @Date: 2024-10-26 10:52:01
@@ -984,7 +949,7 @@ var Footer = function Footer(props) {
     }
     if (transaction_habit_selection.button_rows == 1) {
       if (state.appointment_status !== 'cancelled') {
-        if (!state.disabledEdit && !state.isBookingCreatePage && !isDayBooking(state)) {
+        if (!state.disabledEdit && !state.isBookingCreatePage) {
           arr.push(actionMap.sale);
         }
       }
@@ -1275,7 +1240,7 @@ var Footer = function Footer(props) {
     style: {
       marginTop: 12
     }
-  }, state.appointment_status !== 'cancelled' && !state.isBookingCreatePage && !isDayBooking(state) ? /*#__PURE__*/React.createElement(Button, {
+  }, state.appointment_status !== 'cancelled' && !state.isBookingCreatePage ? /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
       return handleSale();
     },
@@ -1287,8 +1252,6 @@ var Footer = function Footer(props) {
     },
     size: "large",
     className: "pisell-lowcode__booking-footer-buttons-item"
-  }, actionMap.orderDetail.label)) : null, contextHolder, /*#__PURE__*/React.createElement(AppointmentProductModal, {
-    ref: appointmentProductRef
-  }));
+  }, actionMap.orderDetail.label)) : null, contextHolder);
 };
 export default Footer;

package/es/components/booking/components/footer/serve.d.ts

@@ -1,3 +1 @@
 export declare const eventBookingCheck: (params: any) => Promise<any>;
-export declare const editEventBooking: (params: any, bookingId: string) => Promise<any>;
-export declare const createEventBooking: (params: any) => Promise<any>;

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

@@ -18,48 +18,4 @@ export var eventBookingCheck = /*#__PURE__*/function () {
   return function eventBookingCheck(_x) {
     return _ref.apply(this, arguments);
   };
-}();
-export var editEventBooking = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params, bookingId) {
-    var _yield$request$getReq, data;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          _context2.next = 2;
-          return request.getRequest().put("/shop/v1.1/eventbookingv2/order/".concat(bookingId), params);
-        case 2:
-          _yield$request$getReq = _context2.sent;
-          data = _yield$request$getReq.data;
-          return _context2.abrupt("return", data);
-        case 5:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2);
-  }));
-  return function editEventBooking(_x2, _x3) {
-    return _ref2.apply(this, arguments);
-  };
-}();
-export var createEventBooking = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-    var _yield$request$getReq2, data;
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
-        case 0:
-          _context3.next = 2;
-          return request.getRequest().post("/shop/v1.1/eventbookingv2/order", params);
-        case 2:
-          _yield$request$getReq2 = _context3.sent;
-          data = _yield$request$getReq2.data;
-          return _context3.abrupt("return", data);
-        case 5:
-        case "end":
-          return _context3.stop();
-      }
-    }, _callee3);
-  }));
-  return function createEventBooking(_x4) {
-    return _ref3.apply(this, arguments);
-  };
 }();