@pisell/private-materials 3.0.197 → 3.0.199

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

@@ -33,11 +33,6 @@ declare const _default: {
         'pisell2.text.start_time': string;
         'pisell2.text.duration': string;
         'pisell2.text.resource': string;
-        'pisell2.text.end_time': string;
-        'pisell2.text.start_date': string;
-        'pisell2.text.end_date': string;
-        'pisell2.text.quantity': string;
-        'pisell2.text.holder': string;
         'pisell2.text.warnings': string;
         'pisell2.text.order-notes': string;
         'pisell2.text.add-order-notes': string;
@@ -53,7 +48,6 @@ declare const _default: {
         'pisell2.text.updated': string;
         'pisell2.text.appointment-updated': string;
         'pisell2.text.please-create-an-appointment-first': string;
-        'pisell2.text.day': (val: number) => string;
         'pisell2.text.min': string;
         'pisell2.text.h': string;
         'pisell2.text.other': string;
@@ -224,20 +218,6 @@ declare const _default: {
         'pisell2.booking.info.text.create-new': string;
         'pisell2.booking.info.text.form-agreement-yes': string;
         'pisell2.booking.info.text.form-agreement-no': string;
-        'pisell2.text.open.items': string;
-        'pisell2.text.cart.of': (val: any) => string;
-        'pisell2.text.no.selected': string;
-        'pisell2.text.select.items': string;
-        'pisell2.text.edit-select-service': string;
-        'pisell2.text.missing.reservation.title': string;
-        'pisell2.text.missing.reservation.content': string;
-        'pisell2.text.confirm': string;
-        'pisell2.text.cancel': string;
-        'pisell2.text.change.pet.title': string;
-        'pisell2.text.change.pet.content': string;
-        'pisell2.text.change.pet.content1': string;
-        'pisell2.text.change.pet.confirm': string;
-        'pisell2.text.change.pet.cancel': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -276,11 +256,6 @@ declare const _default: {
         'pisell2.text.discount': string;
         'pisell2.text.discount-reason': string;
         'pisell2.text.start_time': string;
-        'pisell2.text.end_time': string;
-        'pisell2.text.start_date': string;
-        'pisell2.text.end_date': string;
-        'pisell2.text.quantity': string;
-        'pisell2.text.holder': string;
         'pisell2.text.duration': string;
         'pisell2.text.resource': string;
         'pisell2.text.warnings': string;
@@ -300,7 +275,6 @@ declare const _default: {
         'pisell2.text.appointment-updated': string;
         'pisell2.text.updated': string;
         'pisell2.text.please-create-an-appointment-first': string;
-        'pisell2.text.day': (val: number) => string;
         'pisell2.text.min': string;
         'pisell2.text.h': string;
         'pisell2.text.other': string;
@@ -464,20 +438,6 @@ declare const _default: {
         'pisell2.booking.info.text.create-new': string;
         'pisell2.booking.info.text.form-agreement-yes': string;
         'pisell2.booking.info.text.form-agreement-no': string;
-        'pisell2.text.open.items': string;
-        'pisell2.text.cart.of': (val: any) => string;
-        'pisell2.text.no.selected': string;
-        'pisell2.text.select.items': string;
-        'pisell2.text.edit-select-service': string;
-        'pisell2.text.missing.reservation.title': string;
-        'pisell2.text.missing.reservation.content': string;
-        'pisell2.text.confirm': string;
-        'pisell2.text.cancel': string;
-        'pisell2.text.change.pet.title': string;
-        'pisell2.text.change.pet.content': string;
-        'pisell2.text.change.pet.content1': string;
-        'pisell2.text.change.pet.confirm': string;
-        'pisell2.text.change.pet.cancel': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -516,11 +476,6 @@ declare const _default: {
         'pisell2.text.discount': string;
         'pisell2.text.discount-reason': string;
         'pisell2.text.start_time': string;
-        'pisell2.text.end_time': string;
-        'pisell2.text.start_date': string;
-        'pisell2.text.end_date': string;
-        'pisell2.text.quantity': string;
-        'pisell2.text.holder': string;
         'pisell2.text.duration': string;
         'pisell2.text.resource': string;
         'pisell2.text.warnings': string;
@@ -538,7 +493,6 @@ declare const _default: {
         'pisell2.text.appointment-updated': string;
         'pisell2.text.updated': string;
         'pisell2.text.please-create-an-appointment-first': string;
-        'pisell2.text.day': (val: number) => string;
         'pisell2.text.min': string;
         'pisell2.text.h': string;
         'pisell2.text.other': string;
@@ -704,20 +658,6 @@ declare const _default: {
         'pisell2.booking.info.text.create-new': string;
         'pisell2.booking.info.text.form-agreement-yes': string;
         'pisell2.booking.info.text.form-agreement-no': string;
-        'pisell2.text.open.items': string;
-        'pisell2.text.cart.of': (val: any) => string;
-        'pisell2.text.no.selected': string;
-        'pisell2.text.select.items': string;
-        'pisell2.text.edit-select-service': string;
-        'pisell2.text.missing.reservation.title': string;
-        'pisell2.text.missing.reservation.content': string;
-        'pisell2.text.confirm': string;
-        'pisell2.text.cancel': string;
-        'pisell2.text.change.pet.title': string;
-        'pisell2.text.change.pet.content': string;
-        'pisell2.text.change.pet.content1': string;
-        'pisell2.text.change.pet.confirm': string;
-        'pisell2.text.change.pet.cancel': string;
     };
 };
 export default _default;

package/es/components/booking/locales.js

@@ -34,11 +34,6 @@ export default {
     'pisell2.text.start_time': 'Start time',
     'pisell2.text.duration': 'Duration',
     'pisell2.text.resource': 'Resource',
-    'pisell2.text.end_time': 'End time',
-    'pisell2.text.start_date': 'Start date',
-    'pisell2.text.end_date': 'End date',
-    'pisell2.text.quantity': 'Quantity',
-    'pisell2.text.holder': 'Holder',
     'pisell2.text.warnings': 'Warnings',
     'pisell2.text.order-notes': 'Order notes',
     'pisell2.text.add-order-notes': 'Add Order note',
@@ -54,9 +49,6 @@ export default {
     'pisell2.text.updated': ' updated',
     'pisell2.text.appointment-updated': 'Appointment updated',
     'pisell2.text.please-create-an-appointment-first': 'Please create an appointment first',
-    'pisell2.text.day': function pisell2TextDay(val) {
-      return "".concat(val > 1 ? 'days' : 'day');
-    },
     'pisell2.text.min': 'min',
     'pisell2.text.h': 'h',
     'pisell2.text.other': 'Other',
@@ -258,23 +250,7 @@ export default {
     'pisell2.booking.info.text.clear-all': "Clear all",
     'pisell2.booking.info.text.create-new': "Create new",
     'pisell2.booking.info.text.form-agreement-yes': "Yes",
-    'pisell2.booking.info.text.form-agreement-no': "No",
-    'pisell2.text.open.items': 'Open items',
-    'pisell2.text.cart.of': function pisell2TextCartOf(val) {
-      return "Cart of ".concat(val);
-    },
-    'pisell2.text.no.selected': 'No items selected',
-    'pisell2.text.select.items': 'Select items',
-    'pisell2.text.edit-select-service': 'Edit items',
-    'pisell2.text.missing.reservation.title': 'Missing Reservation Type',
-    'pisell2.text.missing.reservation.content': 'You have not selected a reservation type, Please select one before proceeding.',
-    'pisell2.text.confirm': 'Confirm',
-    'pisell2.text.cancel': 'Cancel',
-    'pisell2.text.change.pet.title': 'You have changed the holder information. Do you want to keep the items under their name?',
-    'pisell2.text.change.pet.content': 'Selecting “Keep” will move the items to Open Items. Selecting “Discard” will clear all items under the holder’s name.',
-    'pisell2.text.change.pet.content1': 'Reservation-type items cannot be added to the Open Items cart and will be removed.',
-    'pisell2.text.change.pet.confirm': 'Keep (Add to open items)',
-    'pisell2.text.change.pet.cancel': 'Discard (Clear items)'
+    'pisell2.booking.info.text.form-agreement-no': "No"
   },
   'zh-CN': {
     'pisell2.text.refunded-amount': '已退金额',
@@ -313,11 +289,6 @@ export default {
     'pisell2.text.discount': '折扣',
     'pisell2.text.discount-reason': '折扣原因',
     'pisell2.text.start_time': '开始时间',
-    'pisell2.text.end_time': '结束时间',
-    'pisell2.text.start_date': '开始日期',
-    'pisell2.text.end_date': '结束日期',
-    'pisell2.text.quantity': '数量',
-    'pisell2.text.holder': '预约主体',
     'pisell2.text.duration': '时长',
     'pisell2.text.resource': '资源',
     'pisell2.text.warnings': '个警告',
@@ -338,9 +309,6 @@ export default {
     'pisell2.text.appointment-updated': '预约已更新',
     'pisell2.text.updated': '已更新',
     'pisell2.text.please-create-an-appointment-first': '请先创建预约',
-    'pisell2.text.day': function pisell2TextDay(val) {
-      return '天';
-    },
     'pisell2.text.min': '分钟',
     'pisell2.text.h': '小时',
     'pisell2.text.other': '未分类',
@@ -539,23 +507,7 @@ export default {
     'pisell2.booking.info.text.clear-all': "清空",
     'pisell2.booking.info.text.create-new': "新建",
     'pisell2.booking.info.text.form-agreement-yes': "是",
-    'pisell2.booking.info.text.form-agreement-no': "否",
-    'pisell2.text.open.items': '公共购物车',
-    'pisell2.text.cart.of': function pisell2TextCartOf(val) {
-      return "".concat(val, "\u7684\u8D2D\u7269\u8F66");
-    },
-    'pisell2.text.no.selected': '未选择任何项目',
-    'pisell2.text.select.items': '选择项目',
-    'pisell2.text.edit-select-service': '编辑项目',
-    'pisell2.text.missing.reservation.title': '缺少预约类型',
-    'pisell2.text.missing.reservation.content': '您尚未选择预约类型，请在继续操作前选择。',
-    'pisell2.text.confirm': '确定',
-    'pisell2.text.cancel': '取消',
-    'pisell2.text.change.pet.title': '您已变更持有人信息，是否保留该持有人名下的商品？',
-    'pisell2.text.change.pet.content': '选择“保留”将商品添加到未分配商品（公共购物车）中；选择“不保留”将清空该持有人名下的所有商品。',
-    'pisell2.text.change.pet.content1': '预约类商品无法添加到公共购物车，将会被删除。',
-    'pisell2.text.change.pet.confirm': '保留（添加到未分配中）',
-    'pisell2.text.change.pet.cancel': '不保留（清空商品）'
+    'pisell2.booking.info.text.form-agreement-no': "否"
   },
   'zh-HK': {
     'pisell2.text.refunded-amount': '已退金額',
@@ -594,11 +546,6 @@ export default {
     'pisell2.text.discount': '折扣',
     'pisell2.text.discount-reason': '折扣原因',
     'pisell2.text.start_time': '開始時間',
-    'pisell2.text.end_time': '結束時間',
-    'pisell2.text.start_date': '開始日期',
-    'pisell2.text.end_date': '結束日期',
-    'pisell2.text.quantity': '數量',
-    'pisell2.text.holder': '預約主體',
     'pisell2.text.duration': '時長',
     'pisell2.text.resource': '資源',
     'pisell2.text.warnings': '個警告',
@@ -617,9 +564,6 @@ export default {
     'pisell2.text.appointment-updated': '預約已更新',
     'pisell2.text.updated': '已更新',
     'pisell2.text.please-create-an-appointment-first': '請先創建預約',
-    'pisell2.text.day': function pisell2TextDay(val) {
-      return '天';
-    },
     'pisell2.text.min': '分鍾',
     'pisell2.text.h': '小時',
     'pisell2.text.other': '未分類',
@@ -820,22 +764,6 @@ export default {
     'pisell2.booking.info.text.clear-all': "清空",
     'pisell2.booking.info.text.create-new': "新建",
     'pisell2.booking.info.text.form-agreement-yes': "是",
-    'pisell2.booking.info.text.form-agreement-no': "否",
-    'pisell2.text.open.items': '公共購物車',
-    'pisell2.text.cart.of': function pisell2TextCartOf(val) {
-      return "".concat(val, "\u7684\u8CFC\u7269\u8ECA");
-    },
-    'pisell2.text.no.selected': '未選擇任何項目',
-    'pisell2.text.select.items': '選擇項目',
-    'pisell2.text.edit-select-service': '編輯項目',
-    'pisell2.text.missing.reservation.title': '缺少預約類型',
-    'pisell2.text.missing.reservation.content': '您尚未選擇預約類型，請在繼續操作前選擇。',
-    'pisell2.text.confirm': '確定',
-    'pisell2.text.cancel': '取消',
-    'pisell2.text.change.pet.title': '您已變更持有人信息，是否保留該持有人名下的商品？',
-    'pisell2.text.change.pet.content': '選擇“保留”將商品添加到未分配商品（公共購物車）中；選擇“不保留”將清空該持有人名下的所有商品。',
-    'pisell2.text.change.pet.content1': '預約類商品無法添加到公共購物車，將會被刪除。',
-    'pisell2.text.change.pet.confirm': '保留（添加到未分配中）',
-    'pisell2.text.change.pet.cancel': '不保留（清空商品）'
+    'pisell2.booking.info.text.form-agreement-no': "否"
   }
 };

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

@@ -29,7 +29,6 @@ export interface FormState {
     };
     date: {
         value: any;
-        end_date: any;
         edit: boolean;
     };
     service: {
@@ -76,7 +75,7 @@ export interface FormState {
     bookingId: string | number;
     bookingDetail: any;
     channelDisabledEdit: boolean;
-    renderType?: 'eventBooking' | 'dayBooking';
+    renderType?: 'eventBooking';
     modalOpen?: boolean;
     isTerminal?: boolean;
     isFranchisee?: boolean;
@@ -97,8 +96,6 @@ export interface FormState {
     /** 是否terminal创建booking页面 */
     isBookingCreatePage?: boolean;
     loading: boolean;
-    isTerminalDayBookingPage?: boolean;
-    activeCartId?: any[];
 }
 export declare const walkInData: {
     id: number;

package/es/components/booking/model.js

@@ -42,8 +42,7 @@ var defaultState = {
     value: walkInData
   },
   date: {
-    value: dayjs(),
-    end_date: dayjs().add(1, 'days')
+    value: dayjs()
   },
   service: {
     addModal: false,
@@ -93,8 +92,7 @@ var defaultState = {
   action: function action(props) {
     console.log(props);
   },
-  bookingId: 0,
-  activeCartId: [0]
+  bookingId: 0
 };
 var _miniRedux = miniRedux({
     namespace: 'state',

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

@@ -21,7 +21,7 @@ export declare const request: Request;
  * @Author: zhiwei.Wang
  * @Date: 2024-04-26 14:00
  */
-export declare const getDiscountTime: (service_times: number, isDay?: boolean) => string;
+export declare const getDiscountTime: (service_times: number) => string;
 /**
  * @title: 时间切片
  * @description:
@@ -31,7 +31,7 @@ export declare const getDiscountTime: (service_times: number, isDay?: boolean) =
  * @Author: zhiwei.Wang
  * @Date: 2024-04-26 13:59
  */
-export declare const sliceDayIntoFiveMinutes: (config: any, locale: string, isDay?: boolean) => {
+export declare const sliceDayIntoFiveMinutes: (config: any, locale: string) => {
     timeSlices: {
         label: string;
         value: string;
@@ -115,7 +115,7 @@ export declare const getServiceTimes: (service: any) => {
     startDate: dayjs.Dayjs;
     endDate: dayjs.Dayjs;
 };
-export declare const getErrorList: (resource: any, cacheItem: any, isDay?: boolean) => {
+export declare const getErrorList: (resource: any, cacheItem: any) => {
     label: any;
     type: string;
 }[];
@@ -131,15 +131,6 @@ export declare const formatResource: (resourceItem: any, cacheItem?: any, format
 export declare const getLastServer: (list: any) => any;
 export declare const getCacheParams: () => any;
 export declare const deleteCacheParams: () => void;
-/**
- * @title: 获取跨日预约的时长
- * @description:
- * @param {any} cacheItem
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-01 22:43
- */
-export declare const getDays: (cacheItem: any, type: 'minutes' | 'days') => any;
 /**
  * @title: 创建一个服务商品
  * @description:

package/es/components/booking/utils.js

@@ -15,7 +15,6 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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 dayjs from 'dayjs';
 import { locales } from '@pisell/utils';
-import { isDayBooking, formatDayDate } from "./info/service2/utils";
 import { intersectionBy } from 'lodash';
 var Request = /*#__PURE__*/function () {
   function Request() {
@@ -45,15 +44,10 @@ export var request = new Request();
  * @Author: zhiwei.Wang
  * @Date: 2024-04-26 14:00
  */
-export var getDiscountTime = function getDiscountTime(service_times, isDay) {
-  if (!service_times || service_times < 0) {
+export var getDiscountTime = function getDiscountTime(service_times) {
+  if (!service_times) {
     return '';
   }
-
-  // 跨日预约
-  if (isDay) {
-    return "".concat(service_times, " ").concat(locales.getText('pisell2.text.day')(service_times));
-  }
   if (service_times < 60) {
     return "".concat(service_times, " ").concat(locales.getText('pisell2.text.min'));
   } else {
@@ -77,7 +71,7 @@ export var getDiscountTime = function getDiscountTime(service_times, isDay) {
  * @Author: zhiwei.Wang
  * @Date: 2024-04-26 13:59
  */
-export var sliceDayIntoFiveMinutes = function sliceDayIntoFiveMinutes(config, locale, isDay) {
+export var sliceDayIntoFiveMinutes = function sliceDayIntoFiveMinutes(config, locale) {
   var _locale = locale;
   var dayjsLocale = _locale === 'en-US' || _locale === 'en' ? 'en' : 'zh-cn';
   dayjs.locale(dayjsLocale);
@@ -88,34 +82,12 @@ export var sliceDayIntoFiveMinutes = function sliceDayIntoFiveMinutes(config, lo
   var timeSlices = [];
   var durationSlicesBasedOnTime = [];
   var currentTime = startTime;
-
-  // 跨日预约
-  if (isDay) {
-    var currentDay = 1;
-    while (currentDay <= 30) {
-      var timeLabel = currentTime.format('hh:mm A');
-      var timeValue = currentTime.format('HH:mm');
-      timeSlices.push({
-        label: timeLabel,
-        value: timeValue
-      });
-      durationSlicesBasedOnTime.push({
-        label: "".concat(currentDay, " ").concat(locales.getText('pisell2.text.day')(currentDay)),
-        value: currentDay
-      });
-      currentDay++;
-    }
-    return {
-      timeSlices: timeSlices,
-      durationSlicesBasedOnTime: durationSlicesBasedOnTime
-    };
-  }
   while (currentTime.isBefore(endTime)) {
-    var _timeLabel = currentTime.format('hh:mm A');
-    var _timeValue = currentTime.format('HH:mm');
+    var timeLabel = currentTime.format('hh:mm A');
+    var timeValue = currentTime.format('HH:mm');
     timeSlices.push({
-      label: _timeLabel,
-      value: _timeValue
+      label: timeLabel,
+      value: timeValue
     });
     var nextTime = currentTime.add(timeSlice, 'minute');
     var durationValue = nextTime.diff(startTime, 'minute');
@@ -304,29 +276,6 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
  * @Date: 2024-01-09 13:57
  */
 export var formatTimes = function formatTimes(resourceItem, cacheItem) {
-  var _cacheItem$_extend;
-  if ((cacheItem === null || cacheItem === void 0 ? void 0 : (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.sub_type) === 'days') {
-    var isResourceItem = (resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.form_record_id) > 0;
-
-    // 是否在最大预约数量的区间内
-    var isMaxLimitRange = (resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.sold_out) === 1;
-
-    // 是否在日期范围内
-    var isDateRange = (resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.available_status) === 1;
-
-    // 是否可用
-    var isUsable = isDateRange && !isMaxLimitRange;
-    var usableTime = {
-      isMaxLimitRange: isMaxLimitRange,
-      isDateRange: isDateRange,
-      isUsable: isResourceItem ? isUsable : true
-    };
-    resourceItem._extend = _objectSpread(_objectSpread({}, resourceItem._extend), {}, {
-      usableTime: usableTime
-    });
-    return resourceItem;
-  }
-
   // 可用的time列表
   var usableTimes = [];
   var _resourceItem = _objectSpread({}, resourceItem);
@@ -486,7 +435,7 @@ export var getServiceTimes = function getServiceTimes(service) {
     endDate: endDate
   };
 };
-export var getErrorList = function getErrorList(resource, cacheItem, isDay) {
+export var getErrorList = function getErrorList(resource, cacheItem) {
   if (!(cacheItem !== null && cacheItem !== void 0 && cacheItem.id)) {
     return [{
       label: locales.getText('pisell2.text.no-product-added'),
@@ -499,7 +448,7 @@ export var getErrorList = function getErrorList(resource, cacheItem, isDay) {
   var list = [];
   // 当前资源不可用
   if (!resource.usable) {
-    var _resource$_extend, _resource$_extend2, _resource$_extend2$us, _resource$_extend3;
+    var _resource$_extend, _resource$_extend2;
     // 挂接的商品不可用
     if (!(resource !== null && resource !== void 0 && (_resource$_extend = resource._extend) !== null && _resource$_extend !== void 0 && _resource$_extend.usableProduct)) {
       list.push({
@@ -507,35 +456,23 @@ export var getErrorList = function getErrorList(resource, cacheItem, isDay) {
         type: 'product'
       });
     }
-    var startText = '';
-    var endText = '';
-
-    // 跨日预约
-    if (isDay) {
-      var _cacheItem$_extend2 = cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem._extend,
-        start_date = _cacheItem$_extend2.start_date,
-        end_date = _cacheItem$_extend2.end_date;
-      startText = start_date === null || start_date === void 0 ? void 0 : start_date.format('YYYY-MM-DD');
-      endText = end_date ? end_date === null || end_date === void 0 ? void 0 : end_date.format('YYYY-MM-DD') : '';
-    } else {
-      var _getServiceTimes = getServiceTimes(cacheItem),
-        startDate = _getServiceTimes.startDate,
-        endDate = _getServiceTimes.endDate;
-      // 如果跨天  结束时间前面加一个明天
-      startText = startDate.format('hh:mm A');
-      endText = endDate.format('hh:mm A');
-      if (dayjs(endDate).isAfter(startDate, 'day')) {
-        endText = locales.getText('pisell1.text.tomorrow') + endText;
-      }
+    var _getServiceTimes = getServiceTimes(cacheItem),
+      startDate = _getServiceTimes.startDate,
+      endDate = _getServiceTimes.endDate;
+    // 如果跨天  结束时间前面加一个明天
+    var startText = startDate.format('hh:mm A');
+    var endText = endDate.format('hh:mm A');
+    if (dayjs(endDate).isAfter(startDate, 'day')) {
+      endText = locales.getText('pisell1.text.tomorrow') + endText;
     }
-    if (isDay ? !((_resource$_extend2 = resource._extend) !== null && _resource$_extend2 !== void 0 && (_resource$_extend2$us = _resource$_extend2.usableTime) !== null && _resource$_extend2$us !== void 0 && _resource$_extend2$us.isDateRange) : !((_resource$_extend3 = resource._extend) !== null && _resource$_extend3 !== void 0 && _resource$_extend3.usableTime)) {
+    if (!((_resource$_extend2 = resource._extend) !== null && _resource$_extend2 !== void 0 && _resource$_extend2.usableTime)) {
       list.push({
         label: locales.getText('pisell1.text.resource-error-message-2')(resource.labelText, startText, endText),
         type: 'time'
       });
     } else {
-      var _resource$_extend4, _resource$_extend4$us, _resource$_extend5, _resource$_extend5$us, _resource$_extend5$us2;
-      if (isDay ? (_resource$_extend4 = resource._extend) === null || _resource$_extend4 === void 0 ? void 0 : (_resource$_extend4$us = _resource$_extend4.usableTime) === null || _resource$_extend4$us === void 0 ? void 0 : _resource$_extend4$us.isMaxLimitRange : !((_resource$_extend5 = resource._extend) !== null && _resource$_extend5 !== void 0 && (_resource$_extend5$us = _resource$_extend5.usableTime) !== null && _resource$_extend5$us !== void 0 && (_resource$_extend5$us2 = _resource$_extend5$us._extend) !== null && _resource$_extend5$us2 !== void 0 && _resource$_extend5$us2.isMaxLimitRange)) {
+      var _resource$_extend3;
+      if (!((_resource$_extend3 = resource._extend) !== null && _resource$_extend3 !== void 0 && _resource$_extend3.usableTime._extend.isMaxLimitRange)) {
         list.push({
           label: locales.getText('pisell1.text.resource-error-message-3')(resource.labelText, startText, endText),
           type: 'limit'
@@ -555,7 +492,6 @@ export var getErrorList = function getErrorList(resource, cacheItem, isDay) {
  * @Date: 2024-01-09 13:40
  */
 export var formatResource = function formatResource(resourceItem, cacheItem, formatLabel) {
-  var _cacheItem$_extend3;
   // 当前资源
   var _resourceItem = _objectSpread({}, resourceItem);
 
@@ -568,12 +504,6 @@ export var formatResource = function formatResource(resourceItem, cacheItem, for
   // 格式化label
   _resourceItem.labelText = _resourceItem.room_name || _resourceItem.name;
   var usable = _resourceItem._extend.usableTime && _resourceItem._extend.usableProduct;
-
-  // 跨日预约
-  if ((cacheItem === null || cacheItem === void 0 ? void 0 : (_cacheItem$_extend3 = cacheItem._extend) === null || _cacheItem$_extend3 === void 0 ? void 0 : _cacheItem$_extend3.sub_type) === 'days') {
-    var _resourceItem$_extend, _resourceItem$_extend2, _resourceItem$_extend3;
-    usable = ((_resourceItem$_extend = _resourceItem._extend) === null || _resourceItem$_extend === void 0 ? void 0 : (_resourceItem$_extend2 = _resourceItem$_extend.usableTime) === null || _resourceItem$_extend2 === void 0 ? void 0 : _resourceItem$_extend2.isUsable) && ((_resourceItem$_extend3 = _resourceItem._extend) === null || _resourceItem$_extend3 === void 0 ? void 0 : _resourceItem$_extend3.usableProduct);
-  }
   _resourceItem.usable = usable;
   if (formatLabel) {
     _resourceItem.label = formatLabel(_resourceItem);
@@ -595,28 +525,6 @@ export var deleteCacheParams = function deleteCacheParams() {
   sessionStorage.removeItem('pisell2.booking.serviceParams');
 };
 
-/**
- * @title: 获取跨日预约的时长
- * @description: 
- * @param {any} cacheItem
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-01 22:43
- */
-export var getDays = function getDays(cacheItem, type) {
-  var _cacheItem$_extend4, _cacheItem$_extend5;
-  // 计算天数
-  if (type === 'days') {
-    var _formatDayDate = formatDayDate(cacheItem._extend),
-      start_date = _formatDayDate.start_date,
-      end_date = _formatDayDate.end_date;
-    return end_date.diff(start_date, 'day');
-  }
-  var startDate = dayjs((_cacheItem$_extend4 = cacheItem._extend) === null || _cacheItem$_extend4 === void 0 ? void 0 : _cacheItem$_extend4.start_date);
-  var endDate = dayjs((_cacheItem$_extend5 = cacheItem._extend) === null || _cacheItem$_extend5 === void 0 ? void 0 : _cacheItem$_extend5.end_date);
-  return endDate.diff(startDate, type);
-};
-
 /**
  * @title: 创建一个服务商品
  * @description:
@@ -632,14 +540,13 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
   if (!cacheItem.new && cacheItem._extend.endDate) {
     return cacheItem._extend;
   }
-  var isDay = isDayBooking(state);
 
   // 获取上一个服务商品
-  var lastServer = isDay ? false : getLastServer(state.service.value);
+  var lastServer = getLastServer(state.service.value);
 
   // 下一个商品的扩展参数
   var _extend = {
-    duration: isDay ? getDays(cacheItem, 'days') : findNextDuration(cacheItem.duration, timeObj.durationSlicesBasedOnTime, cacheItem === null || cacheItem === void 0 ? void 0 : (_cacheItem$duration = cacheItem.duration) === null || _cacheItem$duration === void 0 ? void 0 : _cacheItem$duration.value)
+    duration: findNextDuration(cacheItem.duration, timeObj.durationSlicesBasedOnTime, cacheItem === null || cacheItem === void 0 ? void 0 : (_cacheItem$duration = cacheItem.duration) === null || _cacheItem$duration === void 0 ? void 0 : _cacheItem$duration.value)
   };
 
   // 如果有上一个商品, 将上一个商品的某些参数 设置到新商品上
@@ -692,17 +599,6 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
     }
   }
   _extend = _objectSpread(_objectSpread({}, _extend), cacheItem._extend);
-
-  // 跨日预约
-  if (isDay) {
-    var _formatDayDate2 = formatDayDate(_extend),
-      start_date = _formatDayDate2.start_date,
-      end_date = _formatDayDate2.end_date;
-    _extend = _objectSpread(_objectSpread({}, _extend), {}, {
-      start_date: start_date,
-      end_date: end_date
-    });
-  }
   return _extend;
 };
 

package/es/components/eftpos/form/index.js

@@ -9,6 +9,7 @@ import React from 'react';
 import { Input, InputNumber, Checkbox, Radio, Cascader, DatePicker, Select, Slider, Switch, TimePicker, Transfer, TreeSelect, Upload, Form } from 'antd';
 import { CheckboxGroup, RadioGroup } from "../group";
 import Surcharge, { getCommName, getCommDefaultVal } from "../surcharge";
+import Receipt, { getCommName as getCommNameReceipt, getCommDefaultVal as getCommDefaultValReceipt } from "../receipt";
 import DeviceList from "../deviceList";
 
 // 通用表单配置
@@ -32,7 +33,8 @@ var Mapping = {
 };
 var CustomMapping = {
   Surcharge: Surcharge,
-  DeviceList: DeviceList
+  DeviceList: DeviceList,
+  Receipt: Receipt
 };
 
 /**
@@ -53,13 +55,13 @@ var CustomFormItem = function CustomFormItem(_ref) {
       return /*#__PURE__*/React.createElement(CustomFormItem, {
         formItemList: item.children,
         onChange: onChange,
-        key: item.name ? item.name + level : Component + index + level,
+        key: item.name ? "".concat(item.name).concat(level) : "".concat(Component).concat(index).concat(level),
         level: level + 1
       });
     }
     if (_typeof(Component) === 'object') {
       return /*#__PURE__*/React.createElement(Component, _extends({}, item, {
-        key: item.name + level
+        key: "".concat(item.name).concat(level)
       }));
     }
     if (Mapping[Component]) {
@@ -67,7 +69,7 @@ var CustomFormItem = function CustomFormItem(_ref) {
       var input = item.input,
         formItemProps = _objectWithoutProperties(item, _excluded2);
       return /*#__PURE__*/React.createElement(Form.Item, _extends({}, formItemProps, {
-        key: item.name + level
+        key: "".concat(item.name).concat(level)
       }), /*#__PURE__*/React.createElement(Comm, input));
     }
     if (Mapping[Component]) {
@@ -75,13 +77,13 @@ var CustomFormItem = function CustomFormItem(_ref) {
       var _input = item.input,
         _formItemProps = _objectWithoutProperties(item, _excluded3);
       return /*#__PURE__*/React.createElement(Form.Item, _extends({}, _formItemProps, {
-        key: item.name + level
+        key: "".concat(item.name).concat(level)
       }), /*#__PURE__*/React.createElement(_Comm, _input));
     }
     if (CustomMapping[Component]) {
       var _Comm2 = CustomMapping[Component];
       return /*#__PURE__*/React.createElement(_Comm2, _extends({}, item, {
-        key: item.name + level
+        key: "".concat(item.name).concat(level)
       }));
     }
     throw TypeError("pos\u7269\u6599\u5E93 \u8F93\u5165\u7EC4\u4EF6\u7C7B\u578B ".concat(Component, " \u65E0\u6CD5\u6620\u5C04,\u8BF7\u6B63\u786E\u4F20\u5165\u7EC4\u4EF6\u7C7B\u578B"));
@@ -92,5 +94,9 @@ export var helpMapping = {
   Surcharge: {
     getCommName: getCommName,
     getCommDefaultVal: getCommDefaultVal
+  },
+  Receipt: {
+    getCommName: getCommNameReceipt,
+    getCommDefaultVal: getCommDefaultValReceipt
   }
 };