@pisell/private-materials 3.2.39 → 3.3.0

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

@@ -36,7 +36,7 @@ import "./index.less";
 import { Page, PisellAdjustPriceInputNumber } from '@pisell/materials';
 import dayjs from 'dayjs';
 import { getNoResource } from "../../../mock";
-import { getDays, getErrorList, getProductTotalPrice } from "../../../utils";
+import { getDays, getErrorList, getProductTotalPrice, isSessionProduct } from "../../../utils";
 import { createBookingItemsByGroup, filterItemByGroupId, getGroupTotalPrice, isGroupBooking } from "../../service2/Group/utils";
 import useSelectPet from "../../service2/hooks/useSelectPet";
 import { disabledDate as _disabledDate, formatDayTime, isDayBooking, isDayBookingProduct, isEventBooking } from "../../service2/utils";
@@ -667,6 +667,7 @@ var Info = function Info(_, ref) {
       dayValue.product_variant = ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.other) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.product_variant_id) || 0;
       dayValue.product_option = option || [];
     }
+    var isSession = isSessionProduct(item);
 
     // 打开商品详情弹窗
     state.action({
@@ -676,11 +677,12 @@ var Info = function Info(_, ref) {
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
           option: isDayBookingMode ? true : false,
-          session: false,
+          session: isSession,
           variant: isDayBookingMode ? true : false,
           package: true
         },
         value: _objectSpread(_objectSpread({}, ((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.other) || {}), dayValue),
+        isOS: isSession,
         customer_id: isDayBookingMode ? ((_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id) || 1 : undefined
       },
       callback: function () {
@@ -1064,13 +1066,13 @@ var Info = function Info(_, ref) {
       }]
     }, /*#__PURE__*/React.createElement(Duration, _extends({}, durationProps, {
       timeObj: timeObj
-    })))), isDayBookingMode && (holderLists === null || holderLists === void 0 ? void 0 : holderLists.length) > 0 ? /*#__PURE__*/React.createElement(Col, {
-      span: 12
+    })))), (holderLists === null || holderLists === void 0 ? void 0 : holderLists.length) > 0 ? /*#__PURE__*/React.createElement(Col, {
+      span: isDayBookingMode ? 12 : 24
     }, /*#__PURE__*/React.createElement(Form.Item, {
       label: locales.getText('pisell2.text.holder'),
       name: "holder_id",
       rules: [{
-        required: true
+        required: isDayBookingMode
       }]
     }, /*#__PURE__*/React.createElement(Holder, {
       size: "large"

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

@@ -49,9 +49,9 @@ var Service = function Service() {
     className: "pisell-lowcode__booking-service-wrap"
   }, clearCart, /*#__PURE__*/React.createElement(ServiceList, {
     onEdit: handleEdit
-  }), /*#__PURE__*/React.createElement(AddService, {
+  }), !state.isBookingCreatePage ? /*#__PURE__*/React.createElement(AddService, {
     onEdit: handleEdit
-  })), /*#__PURE__*/React.createElement(EditService, {
+  }) : null), /*#__PURE__*/React.createElement(EditService, {
     ref: detailRef
   }), showAddTimeModal && /*#__PURE__*/React.createElement(AddTimeModal, null));
 };

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;

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

@@ -26,6 +26,7 @@ var ServiceList = function ServiceList(_ref) {
   var errorTypes = {
     product: locales.getText('pisell2.text.status.service-error-1'),
     time: locales.getText('pisell2.text.status.service-error-2'),
+    limit: locales.getText('pisell2.text.status.service-error-3'),
     maxLimit: locales.getText('pisell2.text.status.service-error-3')
   };
   var handleEditService = function handleEditService(item) {

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

@@ -9,7 +9,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { getUniqueId } from '@pisell/utils';
 import { useCallback, useMemo } from 'react';
-import { deleteCacheParams, getProductTotalPrice, getServiceTimes } from "../../../utils";
+import { deleteCacheParams, getProductTotalPrice, getServiceTimes, isSessionProduct } from "../../../utils";
 import { concatBookings, createBookingItemsByGroup } from "../../service2/Group/utils";
 import { isBookingProduct, isDayBookingProduct, isDaysBooking, isEventBooking } from "../../service2/utils";
 import { getMultiDay, getProductExtend } from "../addService/utils";
@@ -68,6 +68,11 @@ export var useService = function useService(_ref) {
               cacheItem._extend.end_date = state.date.end_date;
               cacheItem._extend.sub_type = 'days';
             }
+            if (isSessionProduct(cacheItem) && _params.session) {
+              cacheItem._extend.start_date = _params.session.start_at;
+              cacheItem._extend.start_time = _params.session.start_time;
+              cacheItem._extend.end_date = _params.session.end_at;
+            }
             _total = getProductTotalPrice(cacheItem); // 用于折扣 可修改
             cacheItem._extend.total = _total;
             // 用于储存原价
@@ -90,24 +95,24 @@ export var useService = function useService(_ref) {
               state: state
             });
             if (!isDayBookingMode) {
-              _context.next = 20;
+              _context.next = 21;
               break;
             }
-            _context.next = 18;
+            _context.next = 19;
             return getMultiDay({
               start_date: cacheItem._extend.startDate,
               end_date: cacheItem._extend.endDate,
               state: state,
               cacheItem: cacheItem
             });
-          case 18:
+          case 19:
             cacheItem = _context.sent;
             if (isDayBookingProduct(cacheItem, state)) {
               // 更换商品需要删除当前组下面的所有子预约 --待实现 在这里删除会导致如果直接返回还需要恢复
               // const newList = filterItemByGroupId(cacheItem._id,state.service.value)
               cacheItem = concatBookings(createBookingItemsByGroup(cacheItem));
             }
-          case 20:
+          case 21:
             if (isEventBookingMode) {
               cacheItem.autoClose = false;
             } else {
@@ -119,7 +124,7 @@ export var useService = function useService(_ref) {
               }
             }
             return _context.abrupt("return", cacheItem);
-          case 22:
+          case 23:
           case "end":
             return _context.stop();
         }
@@ -269,7 +274,7 @@ export var useService = function useService(_ref) {
         changeService: false
       }
     });
-    onEdit(booking);
+    onEdit === null || onEdit === void 0 || onEdit(booking);
   };
   return {
     createBookingData: createBookingData,

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

@@ -124,7 +124,8 @@ export var createBookingItemsByGroup = function createBookingItemsByGroup(item,
   return bookings;
 };
 export var isGroupBooking = function isGroupBooking(_id) {
-  return (_id === null || _id === void 0 ? void 0 : _id.indexOf('bookingGroup_')) === 0;
+  var _id$indexOf;
+  return (_id === null || _id === void 0 || (_id$indexOf = _id.indexOf) === null || _id$indexOf === void 0 ? void 0 : _id$indexOf.call(_id, 'bookingGroup_')) === 0;
 };
 export var getProductByGroupId = function getProductByGroupId(groupId, items) {
   return items.filter(function (item) {

package/es/components/booking/info/service2/Lists.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange }: any) => JSX.Element;
 export default Lists;

package/es/components/booking/info/service2/hooks/useSelectPet.js

@@ -1,7 +1,11 @@
 import { useMemo } from 'react';
-import { formatHolderLists } from "../utils";
+import { formatHolderLists, isDaysBooking } from "../utils";
 var useSelectPet = function useSelectPet(state) {
-  var _state$pet2;
+  var _state$pet2, _state$pet4;
+  var isDaysBookingBol = useMemo(function () {
+    return isDaysBooking(state);
+  }, [state === null || state === void 0 ? void 0 : state.renderType]);
+
   /**
    * @title: pets数据
    * @description:
@@ -25,9 +29,13 @@ var useSelectPet = function useSelectPet(state) {
    * @Date: 2024-12-03 11:40
    */
   var holderLists = useMemo(function () {
-    var _lists = formatHolderLists(petLists);
-    return _lists;
-  }, [petLists]);
+    var _state$pet3;
+    if (isDaysBookingBol) {
+      var _lists = formatHolderLists(petLists);
+      return _lists;
+    }
+    return (state === null || state === void 0 || (_state$pet3 = state.pet) === null || _state$pet3 === void 0 ? void 0 : _state$pet3.holders) || [];
+  }, [petLists, isDaysBookingBol, state === null || state === void 0 || (_state$pet4 = state.pet) === null || _state$pet4 === void 0 ? void 0 : _state$pet4.holders]);
 
   /**
    * @title: 获取pet名称

package/es/components/booking/info/service2/utils.d.ts

@@ -43,14 +43,15 @@ export declare const isDayBookingProduct: (item: any, state: any) => boolean | u
  * @title: 更新商品数据
  * @description:
  * @param {any} state
+ * @param currentItem
  * @param {string} type
- * @param {any} _id // 商品id
  * @param {any} other
+ * @param actions
  * @return {*}
  * @Author: WangHan
  * @Date: 2025-01-03 15:00
  */
-export declare const updateServices: (state: any, currentItem: any, type?: string, other?: any) => any;
+export declare const updateServices: (state: any, currentItem: any, type?: string, other?: any, actions?: any) => any;
 export declare const formItems: (items: any[]) => any[];
 /**
  * @title: 格式化商品数据
@@ -60,7 +61,8 @@ export declare const formItems: (items: any[]) => any[];
  * @Author: WangHan
  * @Date: 2024-11-29 17:36
  */
-export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean) => {
+export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean, isGeneral?: boolean, isParallelResource?: boolean) => {
+    _origin: any;
     id: any;
     _id: any;
     name: any;
@@ -87,7 +89,6 @@ export declare const formatProducts: (lists: any[], state: any, isRenderGroup?:
     locale: any;
     symbol: any;
     items: any[];
-    _origin: any;
 }[];
 /**
  * @title: 禁用日期
@@ -237,4 +238,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => Promise<any> | never[];
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;