@pisell/private-materials 6.8.7 → 6.8.9

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

@@ -12,6 +12,7 @@ import { locales } from "@pisell/utils";
 import { getCacheParams, getServeStartTime, getLastServer, flexibleObj, getServiceTimes, findNextDuration, getDays, isSessionProduct } from "../utils";
 import { isNormalProductByDurationSchedule } from "../info/service2/utils";
 import { isOption } from "../../ticketBooking/components/addServiceVariant/utils";
+import { isMultiDayProduct } from "./service/addService/utils";
 
 // 获取当前剩余量
 var getUseableEventCount = function getUseableEventCount(eventList, current) {
@@ -321,7 +322,7 @@ export var getAppointmentTimingPreference = function getAppointmentTimingPrefere
  * @Date: 2024-01-26 14:09
  */
 export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTime(state, cacheItem, timeObj) {
-  var _state$service$value, _cacheItem$duration, _cacheItem$_extend2;
+  var _state$service$value, _cacheItem$_extend2;
   // 自定义商品不需要时间相关处理，直接返回基础扩展参数
   if (cacheItem !== null && cacheItem !== void 0 && cacheItem.isCustomItem) {
     return {
@@ -334,11 +335,18 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
   var lastServer = getLastServer((_state$service$value = state.service.value) === null || _state$service$value === void 0 ? void 0 : _state$service$value.filter(function (item) {
     return !item.isCustomItem && !isNormalProductByDurationSchedule(item);
   }));
+  var getDuration = function getDuration(cacheItem) {
+    var _cacheItem$duration;
+    if (isMultiDayProduct(cacheItem)) {
+      return getDays(cacheItem, 'days');
+    }
+    return findNextDuration(cacheItem.duration, timeObj === null || timeObj === void 0 ? void 0 : timeObj.durationSlicesBasedOnTime, cacheItem === null || cacheItem === void 0 || (_cacheItem$duration = cacheItem.duration) === null || _cacheItem$duration === void 0 ? void 0 : _cacheItem$duration.value);
+  };
 
   // 下一个商品的扩展参数
   var _extend = {
     // 时长: 当前商品时长 > 第一个时长
-    duration: findNextDuration(cacheItem.duration, timeObj === null || timeObj === void 0 ? void 0 : timeObj.durationSlicesBasedOnTime, cacheItem === null || cacheItem === void 0 || (_cacheItem$duration = cacheItem.duration) === null || _cacheItem$duration === void 0 ? void 0 : _cacheItem$duration.value)
+    duration: getDuration(cacheItem)
   };
 
   // 如果有上一个商品, 将上一个商品的某些参数 设置到新商品上
@@ -355,7 +363,8 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
         var _timeObj$timeSlices;
         _extend.start_time = timeObj === null || timeObj === void 0 ? void 0 : timeObj.timeSlices[(timeObj === null || timeObj === void 0 || (_timeObj$timeSlices = timeObj.timeSlices) === null || _timeObj$timeSlices === void 0 ? void 0 : _timeObj$timeSlices.length) - 1].value;
       } else {
-        _extend.start_time = lastServerEndDate.format("HH:mm");
+        var _ref2;
+        _extend.start_time = (_ref2 = lastServerEndDate || dayjs()) === null || _ref2 === void 0 ? void 0 : _ref2.format("HH:mm");
       }
     }
   } else {
@@ -391,9 +400,9 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
   _extend = _objectSpread(_objectSpread({}, _extend), cacheItem._extend);
 
   // 计算服务的开始和结束时间
-  var _getServiceTimes2 = getServiceTimes({
+  var _getServiceTimes2 = getServiceTimes(_objectSpread(_objectSpread({}, cacheItem), {}, {
       _extend: _extend
-    }),
+    })),
     startDate = _getServiceTimes2.startDate,
     endDate = _getServiceTimes2.endDate;
   _extend.startDate = startDate;

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

@@ -44,6 +44,9 @@ declare const _default: {
         'pisell2.text.order-notes': string;
         'pisell2.text.add-order-notes': string;
         'pisell2.text.add-internal-notes': string;
+        'pisell2.text.holder-unassigned': (count: number) => string;
+        'pisell2.text.press-card-assign-holder': string;
+        'pisell2.text.skip-for-now': string;
         'pisell2.text.add-notes': string;
         'pisell2.text.notes': string;
         'pisell2.text.new-appointment': string;
@@ -198,6 +201,7 @@ declare const _default: {
         'page.booking.text.refund': string;
         'page.booking.text.confirm': string;
         'page.booking.text.go-back': string;
+        'page.booking.text.undo': string;
         'page.booking.text.cancel-booking': string;
         'page.booking.text.cancel-booking.msg': string;
         'page.booking.text.disabled-tickets': string;
@@ -207,6 +211,7 @@ declare const _default: {
         '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.holder.length-error': 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;
@@ -228,6 +233,8 @@ declare const _default: {
         'pisell2.booking.info.text.clear': string;
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
+        'pisell2.booking.info.text.add-holder': string;
+        'pisell2.booking.info.text.select-holder-title': string;
         'pisell2.booking.info.text.create-new': string;
         'pisell2.booking.info.text.form-agreement-yes': string;
         'pisell2.booking.info.text.form-agreement-no': string;
@@ -243,6 +250,7 @@ declare const _default: {
         'pisell2.text.missing.reservation.content': string;
         'pisell2.text.confirm': string;
         'pisell2.text.cancel': string;
+        'pisell2.text.close-confirm-message': string;
         'pisell2.action-buttons.clear': string;
         'pisell2.action-buttons.manuel-order': string;
         'pisell2.action-buttons.customise-item': string;
@@ -304,6 +312,8 @@ declare const _default: {
         'pisell2.text.form.link.to.another.record.more': string;
         'pisell2.booking.text.contact-info.title': string;
         'pisell2.booking.text.search-placeholder': string;
+        'pisell-select-holder-please-select': string;
+        'pisell-select-holder-selected': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -355,6 +365,9 @@ declare const _default: {
         'pisell2.text.order-notes': string;
         'pisell2.text.add-order-notes': string;
         'pisell2.text.add-internal-notes': string;
+        'pisell2.text.holder-unassigned': (count: number) => string;
+        'pisell2.text.press-card-assign-holder': string;
+        'pisell2.text.skip-for-now': string;
         'pisell2.text.add-notes': string;
         'pisell2.text.notes': string;
         'pisell2.text.new-appointment': string;
@@ -504,6 +517,7 @@ declare const _default: {
         'page.booking.text.refund': string;
         'page.booking.text.confirm': string;
         'page.booking.text.go-back': string;
+        'page.booking.text.undo': string;
         'page.booking.text.cancel-booking': string;
         'page.booking.text.cancel-booking.msg': string;
         'page.booking.text.disabled-tickets': string;
@@ -513,6 +527,7 @@ declare const _default: {
         '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.holder.length-error': 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;
@@ -534,6 +549,8 @@ declare const _default: {
         'pisell2.booking.info.text.clear': string;
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
+        'pisell2.booking.info.text.add-holder': string;
+        'pisell2.booking.info.text.select-holder-title': string;
         'pisell2.booking.info.text.create-new': string;
         'pisell2.booking.info.text.form-agreement-yes': string;
         'pisell2.booking.info.text.form-agreement-no': string;
@@ -549,6 +566,7 @@ declare const _default: {
         'pisell2.text.missing.reservation.content': string;
         'pisell2.text.confirm': string;
         'pisell2.text.cancel': string;
+        'pisell2.text.close-confirm-message': string;
         'pisell2.action-buttons.clear': string;
         'pisell2.action-buttons.manuel-order': string;
         'pisell2.action-buttons.customise-item': string;
@@ -610,6 +628,8 @@ declare const _default: {
         'pisell2.text.form.link.to.another.record.more': string;
         'pisell2.booking.text.contact-info.title': string;
         'pisell2.booking.text.search-placeholder': string;
+        'pisell-select-holder-please-select': string;
+        'pisell-select-holder-selected': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -661,6 +681,9 @@ declare const _default: {
         'pisell2.text.order-notes': string;
         'pisell2.text.add-order-notes': string;
         'pisell2.text.add-internal-notes': string;
+        'pisell2.text.holder-unassigned': (count: number) => string;
+        'pisell2.text.press-card-assign-holder': string;
+        'pisell2.text.skip-for-now': string;
         'pisell2.text.add-notes': string;
         'pisell2.text.notes': string;
         'pisell2.text.new-appointment': string;
@@ -810,6 +833,7 @@ declare const _default: {
         'page.booking.text.refund': string;
         'page.booking.text.confirm': string;
         'page.booking.text.go-back': string;
+        'page.booking.text.undo': string;
         'page.booking.text.cancel-booking': string;
         'page.booking.text.cancel-booking.msg': string;
         'page.booking.text.disabled-tickets': string;
@@ -819,6 +843,7 @@ declare const _default: {
         '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.holder.length-error': 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;
@@ -840,6 +865,8 @@ declare const _default: {
         'pisell2.booking.info.text.clear': string;
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
+        'pisell2.booking.info.text.add-holder': string;
+        'pisell2.booking.info.text.select-holder-title': string;
         'pisell2.booking.info.text.create-new': string;
         'pisell2.booking.info.text.form-agreement-yes': string;
         'pisell2.booking.info.text.form-agreement-no': string;
@@ -855,6 +882,7 @@ declare const _default: {
         'pisell2.text.missing.reservation.content': string;
         'pisell2.text.confirm': string;
         'pisell2.text.cancel': string;
+        'pisell2.text.close-confirm-message': string;
         'pisell2.action-buttons.clear': string;
         'pisell2.action-buttons.manuel-order': string;
         'pisell2.action-buttons.customise-item': string;
@@ -916,6 +944,8 @@ declare const _default: {
         'pisell2.text.form.link.to.another.record.more': string;
         'pisell2.booking.text.contact-info.title': string;
         'pisell2.booking.text.search-placeholder': string;
+        'pisell-select-holder-please-select': string;
+        'pisell-select-holder-selected': string;
     };
 };
 export default _default;

package/es/components/booking/locales.js

@@ -45,6 +45,11 @@ export default {
     'pisell2.text.order-notes': 'Order notes',
     'pisell2.text.add-order-notes': 'Add Order Note',
     'pisell2.text.add-internal-notes': 'Add Internal note',
+    'pisell2.text.holder-unassigned': function pisell2TextHolderUnassigned(count) {
+      return "".concat(count, " Holder(s) Unassigned");
+    },
+    'pisell2.text.press-card-assign-holder': 'Please Press Each Card to Assign Holder',
+    'pisell2.text.skip-for-now': 'Skip for Now',
     'pisell2.text.add-notes': 'Add Notes',
     'pisell2.text.notes': 'Notes',
     'pisell2.text.new-appointment': 'New appointment',
@@ -229,6 +234,7 @@ export default {
     'page.booking.text.refund': 'Refund',
     'page.booking.text.confirm': 'Confirm',
     'page.booking.text.go-back': 'Go back',
+    'page.booking.text.undo': 'Undo',
     'page.booking.text.cancel-booking': "Cancel Booking",
     'page.booking.text.cancel-booking.msg': "The action is irreversible. Please proceed with caution. ",
     'page.booking.text.disabled-tickets': "All tickets will be disabled.",
@@ -242,6 +248,7 @@ export default {
       return "Select at least ".concat(x, " ").concat(y);
     },
     'page.booking.text.resource.check-auto-allocation-tip': "When checked, content will be automatically filled in without manual selection",
+    'page.booking.text.holder.length-error': 'Please select enough holder(s)',
     'page.booking.text.price-extra': function pageBookingTextPriceExtra(origin, current) {
       return "Original price of the item:".concat(origin, ",Current price of the item:").concat(current);
     },
@@ -265,6 +272,8 @@ export default {
     'pisell2.booking.info.text.clear': "Clear",
     'pisell2.booking.info.text.clear-cart': "Clear cart",
     'pisell2.booking.info.text.clear-all': "Clear all",
+    'pisell2.booking.info.text.add-holder': "Select",
+    'pisell2.booking.info.text.select-holder-title': "Who would you like to book this event for？",
     'pisell2.booking.info.text.create-new': "Create new",
     'pisell2.booking.info.text.form-agreement-yes': "Yes",
     'pisell2.booking.info.text.form-agreement-no': "No",
@@ -282,6 +291,7 @@ export default {
     '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.close-confirm-message': 'Closing will discard all changes. Are you sure you want to close?',
     // Action Buttons
     'pisell2.action-buttons.clear': 'Clear',
     'pisell2.action-buttons.manuel-order': "Manual\nOrder\xA0$",
@@ -357,7 +367,9 @@ export default {
     'pisell2.text.form.link.to.another.record.more': 'View More',
     // 联系信息
     'pisell2.booking.text.contact-info.title': 'Contact info',
-    'pisell2.booking.text.search-placeholder': 'Search Customers / Contacts'
+    'pisell2.booking.text.search-placeholder': 'Search Customers / Contacts',
+    'pisell-select-holder-please-select': 'Please Select',
+    'pisell-select-holder-selected': 'Selected: '
   },
   'zh-CN': {
     'pisell2.text.refunded-amount': '已退金额',
@@ -409,6 +421,11 @@ export default {
     'pisell2.text.order-notes': '订单备注',
     'pisell2.text.add-order-notes': '添加订单备注',
     'pisell2.text.add-internal-notes': '添加内部备注',
+    'pisell2.text.holder-unassigned': function pisell2TextHolderUnassigned(count) {
+      return "".concat(count, " \u4E2A\u9884\u7EA6\u4E3B\u4F53\u672A\u5206\u914D");
+    },
+    'pisell2.text.press-card-assign-holder': '请点击每个卡片来分配预约主体',
+    'pisell2.text.skip-for-now': '稍后处理',
     'pisell2.text.add-notes': '添加备注',
     'pisell2.text.notes': '备注',
     'pisell2.text.new-appointment': '新预约',
@@ -593,6 +610,7 @@ export default {
     'page.booking.text.refund': '退款',
     'page.booking.text.confirm': '确认',
     'page.booking.text.go-back': '返回',
+    'page.booking.text.undo': '撤销',
     'page.booking.text.cancel-booking': "取消预约",
     'page.booking.text.cancel-booking.msg': "该操作不可撤销，请谨慎操作。",
     'page.booking.text.disabled-tickets': "所有票单将被禁用。",
@@ -606,6 +624,7 @@ export default {
       return "\u81F3\u5C11\u9009\u62E9".concat(x, "\u9879").concat(y);
     },
     'page.booking.text.resource.check-auto-allocation-tip': "\u52FE\u9009\u540E\u5C06\u81EA\u52A8\u586B\u5165\u5185\u5BB9\uFF0C\u65E0\u9700\u624B\u52A8\u9009\u62E9",
+    'page.booking.text.holder.length-error': '请选择足够的持有者',
     'page.booking.text.price-extra': function pageBookingTextPriceExtra(origin, current) {
       return "\u5546\u54C1\u539F\u4EF7:".concat(origin, ",\u5546\u54C1\u73B0\u4EF7:").concat(current);
     },
@@ -629,6 +648,8 @@ export default {
     'pisell2.booking.info.text.clear': "清空",
     'pisell2.booking.info.text.clear-cart': "清空购物车",
     'pisell2.booking.info.text.clear-all': "清空",
+    'pisell2.booking.info.text.add-holder': "请选择",
+    'pisell2.booking.info.text.select-holder-title': '您想为谁预订这个活动？',
     'pisell2.booking.info.text.create-new': "新建",
     'pisell2.booking.info.text.form-agreement-yes': "是",
     'pisell2.booking.info.text.form-agreement-no': "否",
@@ -646,6 +667,7 @@ export default {
     'pisell2.text.missing.reservation.content': '您尚未选择预约类型，请在继续操作前选择。',
     'pisell2.text.confirm': '确定',
     'pisell2.text.cancel': '取消',
+    'pisell2.text.close-confirm-message': '关闭后，已填写或操作的内容将不会保存，确定要关闭吗？',
     // Action Buttons
     'pisell2.action-buttons.clear': '清空',
     'pisell2.action-buttons.manuel-order': "\u624B\u52A8\n\u8BA2\u5355\xA0$",
@@ -721,7 +743,9 @@ export default {
     'pisell2.text.form.link.to.another.record.more': '查看更多',
     // 联系信息
     'pisell2.booking.text.contact-info.title': '联系信息',
-    'pisell2.booking.text.search-placeholder': '搜索客户/联系信息'
+    'pisell2.booking.text.search-placeholder': '搜索客户/联系信息',
+    'pisell-select-holder-please-select': '请选择',
+    'pisell-select-holder-selected': '已选择：'
   },
   'zh-HK': {
     'pisell2.text.refunded-amount': '已退金額',
@@ -773,6 +797,11 @@ export default {
     'pisell2.text.order-notes': '訂單備注',
     'pisell2.text.add-order-notes': '添加訂單備注',
     'pisell2.text.add-internal-notes': '添加內部備注',
+    'pisell2.text.holder-unassigned': function pisell2TextHolderUnassigned(count) {
+      return "".concat(count, " \u500B\u9810\u7D04\u4E3B\u9AD4\u672A\u5206\u914D");
+    },
+    'pisell2.text.press-card-assign-holder': '請點擊每個卡片來分配預約主體',
+    'pisell2.text.skip-for-now': '稍後處理',
     'pisell2.text.add-notes': '添加備注',
     'pisell2.text.notes': '備注',
     'pisell2.text.new-appointment': '新預約',
@@ -957,6 +986,7 @@ export default {
     'page.booking.text.refund': '退款',
     'page.booking.text.confirm': '確認',
     'page.booking.text.go-back': '返回',
+    'page.booking.text.undo': '撤销',
     'page.booking.text.cancel-booking': '取消預約',
     'page.booking.text.cancel-booking.msg': '該操作不可撤銷，請謹慎操作。',
     'page.booking.text.disabled-tickets': '所有票單將被禁用。',
@@ -970,6 +1000,7 @@ export default {
       return "\u81F3\u5C11\u9078\u64C7".concat(x, "\u9805").concat(y);
     },
     'page.booking.text.resource.check-auto-allocation-tip': "\u52FE\u9078\u5F8C\u5C07\u81EA\u52D5\u586B\u5165\u5167\u5BB9\uFF0C\u7121\u9700\u624B\u52D5\u9078\u64C7",
+    'page.booking.text.holder.length-error': '請選擇足夠的持有者',
     'page.booking.text.price-extra': function pageBookingTextPriceExtra(origin, current) {
       return "\u5546\u54C1\u539F\u50F9:".concat(origin, ",\u5546\u54C1\u73FE\u50F9:").concat(current);
     },
@@ -993,6 +1024,8 @@ export default {
     'pisell2.booking.info.text.clear': "清空",
     'pisell2.booking.info.text.clear-cart': "清空購物車",
     'pisell2.booking.info.text.clear-all': "清空",
+    'pisell2.booking.info.text.add-holder': "请选择",
+    'pisell2.booking.info.text.select-holder-title': "您想为谁预订这个活动？",
     'pisell2.booking.info.text.create-new': "新建",
     'pisell2.booking.info.text.form-agreement-yes': "是",
     'pisell2.booking.info.text.form-agreement-no': "否",
@@ -1010,6 +1043,7 @@ export default {
     'pisell2.text.missing.reservation.content': '您尚未選擇預約類型，請在繼續操作前選擇。',
     'pisell2.text.confirm': '確定',
     'pisell2.text.cancel': '取消',
+    'pisell2.text.close-confirm-message': '關閉後，已填寫或操作的內容將不會保存，確定要關閉嗎？',
     // Action Buttons
     'pisell2.action-buttons.clear': '清空',
     'pisell2.action-buttons.manuel-order': "\u624B\u52D5\n\u8A02\u55AE\xA0$",
@@ -1085,6 +1119,8 @@ export default {
     'pisell2.text.form.link.to.another.record.more': '查看更多',
     // 联系信息
     'pisell2.booking.text.contact-info.title': '聯繫信息',
-    'pisell2.booking.text.search-placeholder': '搜索客戶/聯系信息'
+    'pisell2.booking.text.search-placeholder': '搜索客戶/聯系信息',
+    'pisell-select-holder-please-select': '請選擇',
+    'pisell-select-holder-selected': '已選擇：'
   }
 };

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -110,11 +109,4 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

@@ -0,0 +1,13 @@
+import React from 'react';
+import './confirmHolderModal.less';
+/**
+ * 确认 Holder 弹窗组件（直接返回 PisellContainer，不使用 createPortal）
+ */
+export declare const ConfirmHolderModal: React.FC;
+/**
+ * 通过 await 调用的确认 Holder 弹窗
+ * @param state 状态对象
+ * @param dispatch dispatch 函数
+ * @returns Promise，resolve 时返回 void（无论点击哪个按钮都会继续执行）
+ */
+export declare function showConfirmHolderModal(state: any, dispatch: any): Promise<void>;