@pisell/private-materials 6.0.24 → 6.1.1

package/es/components/booking/info2/utilsByBooking.js

@@ -9,7 +9,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import dayjs from 'dayjs';
 import { locales } from "@pisell/utils";
-import { getCacheParams, getServeStartTime, getLastServer, flexibleObj, getServiceTimes, findNextDuration } from "../utils";
+import { getCacheParams, getServeStartTime, getLastServer, flexibleObj, getServiceTimes, findNextDuration, getDays, isSessionProduct } from "../utils";
 
 // 获取当前剩余量
 var getUseableEventCount = function getUseableEventCount(eventList, current) {
@@ -69,7 +69,9 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
   });
 
   // 已预约的列表
-  var eventList = time.event_list || [];
+  var eventList = (time.event_list || []).filter(function (event) {
+    return event.id !== (cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.booking_id);
+  });
   var endDate = null;
   // 是否去计算数量
   var isCalcCount = true;
@@ -79,12 +81,13 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
    */
   if (isFlexible) {
     // 如果有event, 那么灵活时长时间只能在 最后一个event的结束时间 ~ time的结束时间内
-    if (eventList.length) {
-      timeStartDate = eventList.reduce(function (max, event) {
-        var endAt = dayjs(event.end_at);
-        return endAt.isAfter(max) ? endAt : max;
-      }, dayjs(eventList[0].end_at));
-    }
+    // if (eventList.length) {
+    //   timeStartDate = (eventList).reduce((max: any, event: any) => {
+    //     const endAt = dayjs(event.end_at);
+    //     return endAt.isAfter(max) ? endAt : max;
+    //   }, dayjs(eventList[0].end_at));
+    // }
+
     isDateRange = startDate.isAfter(timeStartDate) && startDate.isBefore(timeEndDate);
 
     // 如果灵活时长不在范围内, 则认为是已约满
@@ -93,7 +96,6 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
       isDateRange = true;
       isCountRange = false;
     }
-    // debugger
   } else {
     // 其余判断 开始时间 和 结束时间 是否都在范围内
     endDate = startDate.add(flexibleObj.getValue(cacheItem._extend.duration), "minute");
@@ -114,7 +116,7 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
     */
 
     // 取出已预约列表和当前预约重叠的时间段
-    var conflict = (time.event_list || []).filter(function (d) {
+    var conflict = (eventList || []).filter(function (d) {
       return isConflict({
         start_at: d.start_at,
         end_at: d.end_at
@@ -160,7 +162,9 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
   return time;
 };
 export var getSumCapacity = function getSumCapacity(_ref) {
+  var _cacheItem$_extend;
   var cacheItem = _ref.cacheItem;
+  var isCalcQuantity = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
   var sum = 0;
   var _iterator = _createForOfIteratorHelper(cacheItem._extend.capacity || []),
     _step;
@@ -174,7 +178,7 @@ export var getSumCapacity = function getSumCapacity(_ref) {
   } finally {
     _iterator.f();
   }
-  return sum;
+  return sum * (isCalcQuantity ? (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.quantity) || 1 : 1);
 };
 
 /**
@@ -284,6 +288,12 @@ export var formatResource = function formatResource(resourceItem, cacheItem, for
   return _resourceItem;
 };
 
+// 获取预约时间偏好设置
+export var getAppointmentTimingPreference = function getAppointmentTimingPreference(state) {
+  var _state$bookingConfig;
+  return (state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.information_tab) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.appointment_timing_preference) || "sequential";
+};
+
 /**
  * @title: 创建服务的开始时间和结束时间
  * @description: 
@@ -294,7 +304,9 @@ export var formatResource = function formatResource(resourceItem, cacheItem, for
  * @Date: 2024-01-26 14:09
  */
 export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTime(state, cacheItem, timeObj) {
-  var _cacheItem$duration;
+  var _cacheItem$duration, _cacheItem$_extend2;
+  var appointmentTimingPreference = getAppointmentTimingPreference(state);
+
   // 获取上一个服务商品
   var lastServer = getLastServer(state.service.value);
 
@@ -308,11 +320,17 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
   if (lastServer) {
     var lastServerStartDate = lastServer._extend.startDate;
     var lastServerEndDate = lastServer._extend.endDate;
-    // 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段,  不跨天则取上一个的结束时间
-    if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
-      _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
+
+    // 同时预约模式
+    if (appointmentTimingPreference === 'parallel') {
+      _extend.start_time = lastServerStartDate.format('HH:mm');
     } else {
-      _extend.start_time = lastServerEndDate.format("HH:mm");
+      // 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段,  不跨天则取上一个的结束时间
+      if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
+        _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
+      } else {
+        _extend.start_time = lastServerEndDate.format("HH:mm");
+      }
     }
   } else {
     // 没有上一个商品  资源为 0
@@ -354,5 +372,16 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
     endDate = _getServiceTimes2.endDate;
   _extend.startDate = startDate;
   _extend.endDate = endDate;
+  var session = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 || (_cacheItem$_extend2 = _cacheItem$_extend2.other) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.session;
+  if (isSessionProduct(cacheItem) && session) {
+    _extend.start_date = session.start_at;
+    _extend.startDate = session.start_at;
+    _extend.start_time = session.start_time;
+    _extend.end_date = session.end_at;
+    _extend.endDate = session.end_at;
+    _extend.duration = getDays({
+      _extend: _extend
+    }, 'minutes');
+  }
   return _extend;
 };

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

@@ -22,6 +22,8 @@ declare const _default: {
         'pisell2.text.leave-empty-for-walk-in': string;
         'pisell2.text.select-customer': string;
         'pisell2.text.create-new-customer': string;
+        'pisell2.text.filled': string;
+        'pisell2.text.not-filled': string;
         'pisell2.text.create-new': string;
         'pisell2.text.add-a-service': string;
         'pisell2.text.add-another-service': string;
@@ -33,6 +35,11 @@ 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;
@@ -48,6 +55,7 @@ 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;
@@ -195,6 +203,7 @@ declare const _default: {
         'page.booking.text.please-choose-an-option-1': string;
         'page.booking.text.please-choose-an-option-2': string;
         'page.booking.text.resource.min-length-error': (x: number, y: string) => string;
+        'page.booking.text.resource.check-auto-allocation-tip': string;
         'page.booking.text.price-extra': (origin: string, current: string) => string;
         'pisell2.booking.dashboard.groups-on-site-now': string;
         'pisell2.booking.dashboard.groups-on-site-now-tip': string;
@@ -218,6 +227,48 @@ 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;
+        'pisell2.text.booking-list': string;
+        'pisell2.text.edit-booking': string;
+        'pisell2.text.email-error-message': string;
+        'pisell2.text.phone-required-error-message': string;
+        'pisell2.text.email-required-error-message': string;
+        'pisell2.text.send-form-reminder': string;
+        'pisell2.text.send-sms-reminder': string;
+        'pisell2.text.send-email-reminder': string;
+        'pisell2.text.send-form-ok': string;
+        'pisell2.text.send-form-toast': string;
+        'pisell2.text.send-form-reminder-completed': string;
+        'pisell2.text.send-form-reminder-tooltip': string;
+        'pisell2.text.send-form-reminder-refresh': string;
+        'pisell2.text.send-form-reminder-error-message': string;
+        'pisell2.text.goodpass': string;
+        'pisell2.text.goodpass.product-vouchers': string;
+        'pisell2.text.goodpass.view-more': string;
+        'pisell2.text.goodpass.code': string;
+        'pisell2.text.goodpass.enter-code': string;
+        'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.goodpass.code-invalid-cart': string;
+        'pisell2.text.status.valid': string;
+        'pisell2.text.status.expired': string;
+        'pisell2.text.validity.expired': (str: string) => string;
+        'pisell2.text.validity.expiring_soon': (str: string) => string;
+        'pisell2.text.validity.valid_through': (str: string) => string;
+        'pisell2.text.quotation.product.change.title': string;
+        'pisell2.text.quotation.product.change.describe': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -247,6 +298,8 @@ declare const _default: {
         'pisell2.text.leave-empty-for-walk-in': string;
         'pisell2.text.select-customer': string;
         'pisell2.text.create-new-customer': string;
+        'pisell2.text.filled': string;
+        'pisell2.text.not-filled': string;
         'pisell2.text.create-new': string;
         'pisell2.text.add-a-service': string;
         'pisell2.text.add-another-service': string;
@@ -256,6 +309,11 @@ 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;
@@ -275,6 +333,7 @@ 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;
@@ -415,6 +474,7 @@ declare const _default: {
         'page.booking.text.please-choose-an-option-1': string;
         'page.booking.text.please-choose-an-option-2': string;
         'page.booking.text.resource.min-length-error': (x: number, y: string) => string;
+        'page.booking.text.resource.check-auto-allocation-tip': string;
         'page.booking.text.price-extra': (origin: string, current: string) => string;
         'pisell2.booking.dashboard.groups-on-site-now': string;
         'pisell2.booking.dashboard.groups-on-site-now-tip': string;
@@ -438,6 +498,48 @@ 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;
+        'pisell2.text.booking-list': string;
+        'pisell2.text.edit-booking': string;
+        'pisell2.text.email-error-message': string;
+        'pisell2.text.phone-required-error-message': string;
+        'pisell2.text.email-required-error-message': string;
+        'pisell2.text.send-form-reminder': string;
+        'pisell2.text.send-sms-reminder': string;
+        'pisell2.text.send-email-reminder': string;
+        'pisell2.text.send-form-ok': string;
+        'pisell2.text.send-form-toast': string;
+        'pisell2.text.send-form-reminder-completed': string;
+        'pisell2.text.send-form-reminder-tooltip': string;
+        'pisell2.text.send-form-reminder-refresh': string;
+        'pisell2.text.send-form-reminder-error-message': string;
+        'pisell2.text.goodpass': string;
+        'pisell2.text.goodpass.product-vouchers': string;
+        'pisell2.text.goodpass.view-more': string;
+        'pisell2.text.goodpass.code': string;
+        'pisell2.text.goodpass.enter-code': string;
+        'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.goodpass.code-invalid-cart': string;
+        'pisell2.text.status.valid': string;
+        'pisell2.text.status.expired': string;
+        'pisell2.text.validity.expired': (str: string) => string;
+        'pisell2.text.validity.expiring_soon': (str: string) => string;
+        'pisell2.text.validity.valid_through': (str: string) => string;
+        'pisell2.text.quotation.product.change.title': string;
+        'pisell2.text.quotation.product.change.describe': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -467,6 +569,8 @@ declare const _default: {
         'pisell2.text.leave-empty-for-walk-in': string;
         'pisell2.text.select-customer': string;
         'pisell2.text.create-new-customer': string;
+        'pisell2.text.filled': string;
+        'pisell2.text.not-filled': string;
         'pisell2.text.create-new': string;
         'pisell2.text.add-a-service': string;
         'pisell2.text.add-another-service': string;
@@ -476,6 +580,11 @@ 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;
@@ -493,6 +602,7 @@ 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;
@@ -635,6 +745,7 @@ declare const _default: {
         'page.booking.text.please-choose-an-option-1': string;
         'page.booking.text.please-choose-an-option-2': string;
         'page.booking.text.resource.min-length-error': (x: number, y: string) => string;
+        'page.booking.text.resource.check-auto-allocation-tip': string;
         'page.booking.text.price-extra': (origin: string, current: string) => string;
         'pisell2.booking.dashboard.groups-on-site-now': string;
         'pisell2.booking.dashboard.groups-on-site-now-tip': string;
@@ -658,6 +769,48 @@ 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;
+        'pisell2.text.booking-list': string;
+        'pisell2.text.edit-booking': string;
+        'pisell2.text.email-error-message': string;
+        'pisell2.text.phone-required-error-message': string;
+        'pisell2.text.email-required-error-message': string;
+        'pisell2.text.send-form-reminder': string;
+        'pisell2.text.send-sms-reminder': string;
+        'pisell2.text.send-email-reminder': string;
+        'pisell2.text.send-form-ok': string;
+        'pisell2.text.send-form-toast': string;
+        'pisell2.text.send-form-reminder-completed': string;
+        'pisell2.text.send-form-reminder-tooltip': string;
+        'pisell2.text.send-form-reminder-refresh': string;
+        'pisell2.text.send-form-reminder-error-message': string;
+        'pisell2.text.goodpass': string;
+        'pisell2.text.goodpass.product-vouchers': string;
+        'pisell2.text.goodpass.view-more': string;
+        'pisell2.text.goodpass.code': string;
+        'pisell2.text.goodpass.enter-code': string;
+        'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.goodpass.code-invalid-cart': string;
+        'pisell2.text.status.valid': string;
+        'pisell2.text.status.expired': string;
+        'pisell2.text.validity.expired': (str: string) => string;
+        'pisell2.text.validity.expiring_soon': (str: string) => string;
+        'pisell2.text.validity.valid_through': (str: string) => string;
+        'pisell2.text.quotation.product.change.title': string;
+        'pisell2.text.quotation.product.change.describe': string;
     };
 };
 export default _default;