@pisell/private-materials 6.0.25 → 6.2.1

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

@@ -31,6 +31,7 @@ var utilsByBooking_exports = {};
 __export(utilsByBooking_exports, {
   formatResource: () => formatResource,
   formatTimes: () => formatTimes,
+  getAppointmentTimingPreference: () => getAppointmentTimingPreference,
   getErrorList: () => getErrorList,
   getResourceTimeIsUsable: () => getResourceTimeIsUsable,
   getServiceStartTimeAndEndTime: () => getServiceStartTimeAndEndTime,
@@ -58,7 +59,7 @@ var isConflict = (event, current) => {
   return _isBefore && _isAfter;
 };
 var getResourceTimeIsUsable = (item, cacheItem, resourceItem) => {
-  const startDate = (0, import_dayjs.default)(cacheItem._extend.start_date.format("YYYY-MM-DD") + " " + (0, import_utils2.getServeStartTime)(cacheItem._extend.start_time));
+  const startDate = (0, import_dayjs.default)((0, import_dayjs.default)(cacheItem._extend.start_date).format("YYYY-MM-DD") + " " + (0, import_utils2.getServeStartTime)(cacheItem._extend.start_time));
   const isFlexible = import_utils2.flexibleObj.isFlexible(cacheItem._extend.duration);
   let isMaxLimitRange = false;
   let isDateRange = false;
@@ -68,16 +69,10 @@ var getResourceTimeIsUsable = (item, cacheItem, resourceItem) => {
   let timeEndDate = (0, import_dayjs.default)(time.end_date + " " + time.end_time).add(1, "second");
   let totalCount = getUseableEventCount(time.event_list, resourceItem.capacity);
   const currentCount = getSumCapacity({ cacheItem });
-  const eventList = time.event_list || [];
+  const eventList = (time.event_list || []).filter((event) => event.id !== (cacheItem == null ? void 0 : cacheItem.booking_id));
   let endDate = null;
   let isCalcCount = true;
   if (isFlexible) {
-    if (eventList.length) {
-      timeStartDate = eventList.reduce((max, event) => {
-        const endAt = (0, import_dayjs.default)(event.end_at);
-        return endAt.isAfter(max) ? endAt : max;
-      }, (0, import_dayjs.default)(eventList[0].end_at));
-    }
     isDateRange = startDate.isAfter(timeStartDate) && startDate.isBefore(timeEndDate);
     if (!isDateRange && eventList.length) {
       isCalcCount = false;
@@ -92,7 +87,7 @@ var getResourceTimeIsUsable = (item, cacheItem, resourceItem) => {
     }
   }
   if (isCalcCount) {
-    let conflict = (time.event_list || []).filter((d) => {
+    let conflict = (eventList || []).filter((d) => {
       return isConflict({ start_at: d.start_at, end_at: d.end_at }, { start_at: startDate, end_at: endDate });
     });
     if (resourceItem.resourceType === "single") {
@@ -119,12 +114,13 @@ var getResourceTimeIsUsable = (item, cacheItem, resourceItem) => {
   };
   return time;
 };
-var getSumCapacity = ({ cacheItem }) => {
+var getSumCapacity = ({ cacheItem }, isCalcQuantity = true) => {
+  var _a;
   let sum = 0;
   for (let item of cacheItem._extend.capacity || []) {
     sum += item.value;
   }
-  return sum;
+  return sum * (isCalcQuantity ? ((_a = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a.quantity) || 1 : 1);
 };
 var formatTimes = (resourceItem, cacheItem) => {
   let usableTimes = [];
@@ -184,6 +180,12 @@ var getErrorList = (resource, cacheItem) => {
       }
     }
   }
+  if (resource.unbound) {
+    list.push({
+      label: import_utils.locales.getText("pisell1.text.resource-error-message-unbound"),
+      type: "time"
+    });
+  }
   return list;
 };
 var formatResource = (resourceItem, cacheItem, formatLabel) => {
@@ -198,8 +200,13 @@ var formatResource = (resourceItem, cacheItem, formatLabel) => {
   }
   return _resourceItem;
 };
+var getAppointmentTimingPreference = (state) => {
+  var _a, _b, _c;
+  return ((_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.information_tab) == null ? void 0 : _c.appointment_timing_preference) || "sequential";
+};
 var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
-  var _a;
+  var _a, _b, _c;
+  const appointmentTimingPreference = getAppointmentTimingPreference(state);
   let lastServer = (0, import_utils2.getLastServer)(state.service.value);
   let _extend = {
     // 时长: 当前商品时长 > 第一个时长
@@ -212,10 +219,14 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
   if (lastServer) {
     let lastServerStartDate = lastServer._extend.startDate;
     let lastServerEndDate = lastServer._extend.endDate;
-    if ((0, import_dayjs.default)(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 ((0, import_dayjs.default)(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
+        _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
+      } else {
+        _extend.start_time = lastServerEndDate.format("HH:mm");
+      }
     }
   } else {
     let findNextSliceProps = {
@@ -245,12 +256,22 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
   const { startDate, endDate } = (0, import_utils2.getServiceTimes)({ _extend });
   _extend.startDate = startDate;
   _extend.endDate = endDate;
+  const session = (_c = (_b = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.session;
+  if ((0, import_utils2.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 = (0, import_utils2.getDays)({ _extend }, "minutes");
+  }
   return _extend;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   formatResource,
   formatTimes,
+  getAppointmentTimingPreference,
   getErrorList,
   getResourceTimeIsUsable,
   getServiceStartTimeAndEndTime,

package/lib/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;
@@ -108,6 +110,7 @@ declare const _default: {
         'pisell1.text.resource-error-message-1': (x: string, y: string) => string;
         'pisell1.text.resource-error-message-2': (x: string, y: string, z: string) => string;
         'pisell1.text.resource-error-message-3': (x: string, y: string, z: string) => string;
+        'pisell1.text.resource-error-message-unbound': string;
         'pisell1.text.no-addons': string;
         'pisell1.text.no-resource': string;
         'pisell1.text.no-payments': string;
@@ -201,6 +204,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;
@@ -224,6 +228,9 @@ 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.booking.info.resource.warning-title': string;
+        'pisell2.booking.info.resource.warning-content': string;
+        'pisell2.booking.info.resource.retry': string;
         'pisell2.text.open.items': string;
         'pisell2.text.cart.of': (val: any) => string;
         'pisell2.text.no.selected': string;
@@ -240,6 +247,32 @@ declare const _default: {
         '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;
@@ -269,6 +302,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;
@@ -358,6 +393,7 @@ declare const _default: {
         'pisell1.text.resource-error-message-1': (x: string, y: string) => string;
         'pisell1.text.resource-error-message-2': (x: string, y: string, z: string) => string;
         'pisell1.text.resource-error-message-3': (x: string, y: string, z: string) => string;
+        'pisell1.text.resource-error-message-unbound': string;
         'pisell2.text.flexible': string;
         'pisell2.text.order-discount': string;
         'pisell2.text.no-product-added': string;
@@ -443,6 +479,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;
@@ -466,6 +503,9 @@ 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.booking.info.resource.warning-title': string;
+        'pisell2.booking.info.resource.warning-content': string;
+        'pisell2.booking.info.resource.retry': string;
         'pisell2.text.open.items': string;
         'pisell2.text.cart.of': (val: any) => string;
         'pisell2.text.no.selected': string;
@@ -482,6 +522,32 @@ declare const _default: {
         '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;
@@ -511,6 +577,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;
@@ -600,6 +668,7 @@ declare const _default: {
         'pisell1.text.resource-error-message-1': (x: string, y: string) => string;
         'pisell1.text.resource-error-message-2': (x: string, y: string, z: string) => string;
         'pisell1.text.resource-error-message-3': (x: string, y: string, z: string) => string;
+        'pisell1.text.resource-error-message-unbound': string;
         'pisell2.text.flexible': string;
         'pisell2.text.order-discount': string;
         'pisell2.text.no-product-added': string;
@@ -685,6 +754,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;
@@ -708,6 +778,9 @@ 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.booking.info.resource.warning-title': string;
+        'pisell2.booking.info.resource.warning-content': string;
+        'pisell2.booking.info.resource.retry': string;
         'pisell2.text.open.items': string;
         'pisell2.text.cart.of': (val: any) => string;
         'pisell2.text.no.selected': string;
@@ -724,6 +797,32 @@ declare const _default: {
         '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;

package/lib/components/booking/locales.js

@@ -57,6 +57,8 @@ var locales_default = {
     "pisell2.text.leave-empty-for-walk-in": "Leave empty for walk-in",
     "pisell2.text.select-customer": "Select customer",
     "pisell2.text.create-new-customer": "Create new customer",
+    "pisell2.text.filled": "Filled",
+    "pisell2.text.not-filled": "Not filled",
     "pisell2.text.create-new": "Create new",
     "pisell2.text.add-a-service": "Add a service",
     "pisell2.text.add-another-service": "Add another service",
@@ -152,6 +154,7 @@ var locales_default = {
     "pisell1.text.resource-error-message-1": (x, y) => `${x} doesn't provide ${y}, but your team member can still book appointments.`,
     "pisell1.text.resource-error-message-2": (x, y, z) => `${x} isn't available between ${y} and ${z}, but your team member can still book appointments.`,
     "pisell1.text.resource-error-message-3": (x, y, z) => `${x} is fully booked between ${y} and ${z}, but your team member can still book appointments.`,
+    "pisell1.text.resource-error-message-unbound": "This booking product is not associated with the target resource.",
     "pisell1.text.no-addons": "No addons",
     "pisell1.text.no-resource": "No resource",
     "pisell1.text.no-payments": "No payments",
@@ -257,6 +260,7 @@ var locales_default = {
     "page.booking.text.please-choose-an-option-1": "Refund: Cancel the appointment and process a refund.",
     "page.booking.text.please-choose-an-option-2": "Cancel only: Cancel the appointment without processing a refund. (You can still process a refund after cancellation if needed)",
     "page.booking.text.resource.min-length-error": (x, y) => `Select at least ${x} ${y}`,
+    "page.booking.text.resource.check-auto-allocation-tip": `When checked, content will be automatically filled in without manual selection`,
     "page.booking.text.price-extra": (origin, current) => `Original price of the item:${origin},Current price of the item:${current}`,
     "pisell2.booking.dashboard.groups-on-site-now": "Groups on-site now",
     "pisell2.booking.dashboard.groups-on-site-now-tip": "Tip: Total number of groups who have checked in and are currently on-site",
@@ -280,6 +284,9 @@ var locales_default = {
     "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.booking.info.resource.warning-title": "Resource Loading Failed",
+    "pisell2.booking.info.resource.warning-content": "Failed to load resources due to network issues. You may click 'Retry' to attempt reloading. Otherwise, only normal products can be checkout.",
+    "pisell2.booking.info.resource.retry": "Retry",
     "pisell2.text.open.items": "Open items",
     "pisell2.text.cart.of": (val) => `Cart of ${val}`,
     "pisell2.text.no.selected": "No items selected",
@@ -295,7 +302,39 @@ var locales_default = {
     "pisell2.text.change.pet.confirm": "Keep (Add to open items)",
     "pisell2.text.change.pet.cancel": "Discard (Clear items)",
     "pisell2.text.booking-list": "List",
-    "pisell2.text.edit-booking": "Edit"
+    "pisell2.text.edit-booking": "Edit",
+    "pisell2.text.email-error-message": "Email format error",
+    "pisell2.text.phone-required-error-message": "Please enter a phone number",
+    "pisell2.text.email-required-error-message": "Please enter an email address",
+    "pisell2.text.send-form-reminder": "Send Form Reminder",
+    "pisell2.text.send-sms-reminder": "Send SMS Reminder",
+    "pisell2.text.send-email-reminder": "Send Email Reminder",
+    "pisell2.text.send-form-ok": "Send",
+    "pisell2.text.send-form-toast": "Form reminder sent",
+    "pisell2.text.send-form-reminder-completed": "Requested Forms Completed",
+    "pisell2.text.send-form-reminder-tooltip": "Refresh forms",
+    "pisell2.text.send-form-reminder-refresh": "Forms refreshed successfully",
+    "pisell2.text.send-form-reminder-error-message": "Please select at least one reminder method",
+    "pisell2.text.goodpass": "Promotion",
+    "pisell2.text.goodpass.product-vouchers": "Product Vouchers",
+    "pisell2.text.goodpass.view-more": "View More",
+    "pisell2.text.goodpass.code": "Code",
+    "pisell2.text.goodpass.enter-code": "Enter Code",
+    "pisell2.text.goodpass.code-invalid": "Current code is invalid",
+    "pisell2.text.goodpass.code-invalid-cart": "No eligible items in the cart",
+    "pisell2.text.status.valid": "Valid",
+    "pisell2.text.status.expired": "Expired",
+    "pisell2.text.validity.expired": (str) => {
+      return `Expired on ${str}`;
+    },
+    "pisell2.text.validity.expiring_soon": (str) => {
+      return `Expiring soon: valid through ${str}`;
+    },
+    "pisell2.text.validity.valid_through": (str) => {
+      return `Valid through ${str}`;
+    },
+    "pisell2.text.quotation.product.change.title": "Notification",
+    "pisell2.text.quotation.product.change.describe": "Product updates available: Please refresh the following items to load the latest data."
   },
   "zh-CN": {
     "pisell2.text.refunded-amount": "已退金额",
@@ -325,6 +364,8 @@ var locales_default = {
     "pisell2.text.leave-empty-for-walk-in": "未选择表示 Walk-In",
     "pisell2.text.select-customer": "选择客户",
     "pisell2.text.create-new-customer": "创建新客户",
+    "pisell2.text.filled": "已填写",
+    "pisell2.text.not-filled": "未填写",
     "pisell2.text.create-new": "创建新的",
     "pisell2.text.add-a-service": "添加服务",
     "pisell2.text.add-another-service": "添加其他服务",
@@ -428,6 +469,7 @@ var locales_default = {
     "pisell1.text.resource-error-message-1": (x, y) => `${x} 不提供 ${y}，但您的团队成员仍然可以预约。`,
     "pisell1.text.resource-error-message-2": (x, y, z) => `${x}在${y}到${z}之间不提供服务，但您的团队成员仍然可以预约。`,
     "pisell1.text.resource-error-message-3": (x, y, z) => `${x}在${y}到${z}之间已约满，但您的团队成员仍然可以预约。`,
+    "pisell1.text.resource-error-message-unbound": "该预约商品未关联目标资源。",
     "pisell2.text.flexible": "灵活",
     "pisell2.text.order-discount": "折扣",
     "pisell2.text.no-product-added": "未添加商品",
@@ -525,6 +567,7 @@ var locales_default = {
     "page.booking.text.please-choose-an-option-1": "退款：取消预约，同时处理退款。",
     "page.booking.text.please-choose-an-option-2": "仅取消：仅取消预约，但不进行退款处理。（您仍然可以在取消后再进行退款操作）",
     "page.booking.text.resource.min-length-error": (x, y) => `至少选择${x}项${y}`,
+    "page.booking.text.resource.check-auto-allocation-tip": `勾选后将自动填入内容，无需手动选择`,
     "page.booking.text.price-extra": (origin, current) => `商品原价:${origin},商品现价:${current}`,
     "pisell2.booking.dashboard.groups-on-site-now": "当前在场团体",
     "pisell2.booking.dashboard.groups-on-site-now-tip": "提示：已检票并在场内的团体总数",
@@ -548,6 +591,9 @@ var locales_default = {
     "pisell2.booking.info.text.create-new": "新建",
     "pisell2.booking.info.text.form-agreement-yes": "是",
     "pisell2.booking.info.text.form-agreement-no": "否",
+    "pisell2.booking.info.resource.warning-title": "资源加载失败",
+    "pisell2.booking.info.resource.warning-content": "由于网络原因, 获取资源失败! 您可以点击“重试”尝试重新加载, 否则只可以下单普通商品。",
+    "pisell2.booking.info.resource.retry": "重试",
     "pisell2.text.open.items": "公共购物车",
     "pisell2.text.cart.of": (val) => `${val}的购物车`,
     "pisell2.text.no.selected": "未选择任何项目",
@@ -563,7 +609,39 @@ var locales_default = {
     "pisell2.text.change.pet.confirm": "保留（添加到未分配中）",
     "pisell2.text.change.pet.cancel": "不保留（清空商品）",
     "pisell2.text.booking-list": "列表",
-    "pisell2.text.edit-booking": "编辑"
+    "pisell2.text.edit-booking": "编辑",
+    "pisell2.text.email-error-message": "电子邮件格式错误",
+    "pisell2.text.phone-required-error-message": "请输入手机号码",
+    "pisell2.text.email-required-error-message": "请输入邮箱地址",
+    "pisell2.text.send-form-reminder": "发送表单提醒",
+    "pisell2.text.send-sms-reminder": "发送短信提醒",
+    "pisell2.text.send-email-reminder": "发送邮件提醒",
+    "pisell2.text.send-form-ok": "发送",
+    "pisell2.text.send-form-toast": "表单提醒已发送",
+    "pisell2.text.send-form-reminder-completed": "已完成所需表单",
+    "pisell2.text.send-form-reminder-tooltip": "刷新表单",
+    "pisell2.text.send-form-reminder-refresh": "已刷新表单",
+    "pisell2.text.send-form-reminder-error-message": "请至少选择一种提醒方式",
+    "pisell2.text.goodpass": "促销",
+    "pisell2.text.goodpass.product-vouchers": "商品兑换券",
+    "pisell2.text.goodpass.view-more": "查看更多",
+    "pisell2.text.goodpass.code": "券码",
+    "pisell2.text.goodpass.enter-code": "请输入券码",
+    "pisell2.text.goodpass.code-invalid": "当前券码不可用",
+    "pisell2.text.goodpass.code-invalid-cart": "当前购物车中无可用商品",
+    "pisell2.text.status.valid": "有效",
+    "pisell2.text.status.expired": "已过期",
+    "pisell2.text.validity.expired": (str) => {
+      return `已于 ${str} 过期`;
+    },
+    "pisell2.text.validity.expiring_soon": (str) => {
+      return `即将过期：有效期至 ${str} （含当日）`;
+    },
+    "pisell2.text.validity.valid_through": (str) => {
+      return `有效期至 ${str} （含当日）`;
+    },
+    "pisell2.text.quotation.product.change.title": "提示",
+    "pisell2.text.quotation.product.change.describe": "以下商品信息已更新，请重新编辑相关商品以同步最新数据。"
   },
   "zh-HK": {
     "pisell2.text.refunded-amount": "已退金額",
@@ -593,6 +671,8 @@ var locales_default = {
     "pisell2.text.leave-empty-for-walk-in": "未選擇表示 Walk-In",
     "pisell2.text.select-customer": "選擇客戶",
     "pisell2.text.create-new-customer": "創建新客戶",
+    "pisell2.text.filled": "已填寫",
+    "pisell2.text.not-filled": "未填寫",
     "pisell2.text.create-new": "創建新的",
     "pisell2.text.add-a-service": "添加服務",
     "pisell2.text.add-another-service": "添加其他服務",
@@ -696,6 +776,7 @@ var locales_default = {
     "pisell1.text.resource-error-message-1": (x, y) => `${x} 不提供 ${y}，但您的團隊成員仍然可以預約。`,
     "pisell1.text.resource-error-message-2": (x, y, z) => `${x}在${y}到${z}之間不提供服務，但您的團隊成員仍然可以預約。`,
     "pisell1.text.resource-error-message-3": (x, y, z) => `${x}在${y}到${z}之間已約滿，但您的團隊成員仍然可以預約。`,
+    "pisell1.text.resource-error-message-unbound": "該預約商品未關聯目標資源。",
     "pisell2.text.flexible": "靈活",
     "pisell2.text.order-discount": "折扣",
     "pisell2.text.no-product-added": "未添加商品",
@@ -793,6 +874,7 @@ var locales_default = {
     "page.booking.text.please-choose-an-option-1": "退款：取消預約，同時處理退款。",
     "page.booking.text.please-choose-an-option-2": "僅取消：僅取消預約，但不進行退款處理。（您仍然可以在取消後再進行退款操作）",
     "page.booking.text.resource.min-length-error": (x, y) => `至少選擇${x}項${y}`,
+    "page.booking.text.resource.check-auto-allocation-tip": `勾選後將自動填入內容，無需手動選擇`,
     "page.booking.text.price-extra": (origin, current) => `商品原價:${origin},商品現價:${current}`,
     "pisell2.booking.dashboard.groups-on-site-now": "當前在場團體",
     "pisell2.booking.dashboard.groups-on-site-now-tip": "提示：已檢票並在場內的團體總數",
@@ -816,6 +898,9 @@ var locales_default = {
     "pisell2.booking.info.text.create-new": "新建",
     "pisell2.booking.info.text.form-agreement-yes": "是",
     "pisell2.booking.info.text.form-agreement-no": "否",
+    "pisell2.booking.info.resource.warning-title": "資源載入失敗",
+    "pisell2.booking.info.resource.warning-content": "由於網路問題，無法取得資源！您可以點擊「重試」重新載入，否則僅能訂購一般商品。",
+    "pisell2.booking.info.resource.retry": "重試",
     "pisell2.text.open.items": "公共購物車",
     "pisell2.text.cart.of": (val) => `${val}的購物車`,
     "pisell2.text.no.selected": "未選擇任何項目",
@@ -831,6 +916,38 @@ var locales_default = {
     "pisell2.text.change.pet.confirm": "保留（添加到未分配中）",
     "pisell2.text.change.pet.cancel": "不保留（清空商品）",
     "pisell2.text.booking-list": "列表",
-    "pisell2.text.edit-booking": "編輯"
+    "pisell2.text.edit-booking": "編輯",
+    "pisell2.text.email-error-message": "電子郵件格式錯誤",
+    "pisell2.text.phone-required-error-message": "請輸入手機號碼",
+    "pisell2.text.email-required-error-message": "請輸入電子郵件地址",
+    "pisell2.text.send-form-reminder": "發送表單提醒",
+    "pisell2.text.send-sms-reminder": "發送短信提醒",
+    "pisell2.text.send-email-reminder": "發送郵件提醒",
+    "pisell2.text.send-form-ok": "發送",
+    "pisell2.text.send-form-toast": "表單提醒已發送",
+    "pisell2.text.send-form-reminder-completed": "已完成所需表單",
+    "pisell2.text.send-form-reminder-tooltip": "刷新表單",
+    "pisell2.text.send-form-reminder-refresh": "已刷新表單",
+    "pisell2.text.send-form-reminder-error-message": "請至少選擇一種提醒方式",
+    "pisell2.text.goodpass": "促銷",
+    "pisell2.text.goodpass.product-vouchers": "商品兌換券",
+    "pisell2.text.goodpass.view-more": "查看更多",
+    "pisell2.text.goodpass.code": "券碼",
+    "pisell2.text.goodpass.enter-code": "請輸入券碼",
+    "pisell2.text.goodpass.code-invalid": "當前券碼不可用",
+    "pisell2.text.goodpass.code-invalid-cart": "當前購物車中無可用商品",
+    "pisell2.text.status.valid": "有效",
+    "pisell2.text.status.expired": "已過期",
+    "pisell2.text.validity.expired": (str) => {
+      return `已於 ${str} 過期`;
+    },
+    "pisell2.text.validity.expiring_soon": (str) => {
+      return `即將過期：有效期至 ${str} （含當日）`;
+    },
+    "pisell2.text.validity.valid_through": (str) => {
+      return `有效期至 ${str} （含當日）`;
+    },
+    "pisell2.text.quotation.product.change.title": "提示",
+    "pisell2.text.quotation.product.change.describe": "以下商品信息已更新，请重新编辑相关商品以同步最新数据。"
   }
 };

package/lib/components/booking/materiels/contacts/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare type ContactType = {
     country_calling_code: string;

package/lib/components/booking/materiels/duration/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface DurationProps extends SelectProps {
     locale?: string;

package/lib/components/booking/materiels/holder/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;

package/lib/components/booking/materiels/holder/index.js

@@ -42,11 +42,11 @@ var Holder = (props) => {
   const { state } = (0, import_react.useContext)(import_model.Context);
   const { holderLists } = (0, import_useSelectPet.default)(state);
   const holders = (0, import_react.useMemo)(() => {
-    const lists = holderLists == null ? void 0 : holderLists.filter((d) => (d == null ? void 0 : d.id) > 0);
+    const lists = holderLists == null ? void 0 : holderLists.filter((d) => ((d == null ? void 0 : d.id) || (d == null ? void 0 : d.form_record_id)) > 0);
     if (!(lists == null ? void 0 : lists.length)) return [];
     return lists.map((d) => {
       return {
-        value: d == null ? void 0 : d.id,
+        value: (d == null ? void 0 : d.id) || (d == null ? void 0 : d.form_record_id),
         label: d == null ? void 0 : d.main_field
       };
     });

package/lib/components/booking/materiels/startTime/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from "antd";
 interface StartTimeProps extends SelectProps {
     locale?: string;

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

@@ -38,6 +38,7 @@ export interface FormState {
         services: any[];
         resources: any[];
         resourcesOrigin: any[];
+        reloadResourceModal: false;
         value: any[];
         cacheItem: any;
         edit: boolean;

package/lib/components/booking/notes/NoteBlock/NoteItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     isEdit: boolean;

package/lib/components/booking/notes/NoteBlock/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     title?: string;

package/lib/components/booking/notes/addNote/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const AddNote: ({ value, onChange, wait, title, placeholder }: any) => JSX.Element;
 export default AddNote;

package/lib/components/booking/notes/addNote/index.js

@@ -51,7 +51,7 @@ var AddNote = ({ value, onChange, wait = 200, title, placeholder }) => {
       onChange(debouncedValue);
     }
   }, [debouncedValue]);
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-notes-label" }, title), /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-notes" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-notes-label" }, title), /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: "pisell-lowcode__booking-notes-input",

package/lib/components/booking/notes/addNote/index.less

@@ -1,3 +1,6 @@
+.pisell-lowcode__booking-notes {
+  padding: 20px 0;
+}
 .pisell-lowcode__booking-notes-label {
   font-size: 16px;
   font-weight: 500;