@pisell/private-materials 6.1.7 → 6.1.8

package/lib/components/booking/info2/service/editService/index.js

@@ -54,7 +54,7 @@ var import_utilsByBooking = require("../../utilsByBooking");
 var import_utils7 = require("../addService/utils");
 var submitLock = false;
 var Info = (_, ref) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H;
   const [form] = import_antd.Form.useForm();
   const useTotal = import_antd.Form.useWatch("total", form);
   const useResource = import_antd.Form.useWatch("resource", form);
@@ -630,20 +630,14 @@ var Info = (_, ref) => {
       {
         type: "primary",
         className: "pisell-lowcode__booking-service-body-edit-footer-apple",
-        disabled: !((_a2 = state.service.resourcesOrigin) == null ? void 0 : _a2.length),
+        disabled: !isNormalProduct && !((_a2 = state.service.resourcesOrigin) == null ? void 0 : _a2.length),
         onClick: () => {
           form.submit();
         }
       },
       import_utils.locales.getText("pisell2.text.apply")
     ));
-  }, [(_G = state.service.resourcesOrigin) == null ? void 0 : _G.length]);
-  console.log("render edit");
-  console.log(
-    state.service.editModal && !((_H = state.service.cacheItem) == null ? void 0 : _H.autoClose),
-    performance.now() - window.pp1,
-    "打开商品1"
-  );
+  }, [(_G = state.service.resourcesOrigin) == null ? void 0 : _G.length, isNormalProduct]);
   const [val, setVal] = (0, import_react.useState)(false);
   (0, import_react.useEffect)(() => {
     if (isShowTimeAndResource) {
@@ -654,6 +648,7 @@ var Info = (_, ref) => {
       setVal(false);
     }
   }, [isShowTimeAndResource]);
+  const isNoSpecAndPackage = (0, import_utilsByBooking.getIsNoSpecAndPackage)(state.service.cacheItem);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {
@@ -661,7 +656,7 @@ var Info = (_, ref) => {
       zIndex: state.service.changeService ? 999 : 1e3,
       forceRender: true,
       mask: state.drawerMask,
-      open: open && !((_I = state.service.cacheItem) == null ? void 0 : _I.autoClose),
+      open: !isNoSpecAndPackage && state.service.editModal && !((_H = state.service.cacheItem) == null ? void 0 : _H.autoClose),
       title: import_utils.locales.getText("pisell2.text.edit-service"),
       onClose: () => {
         closeBookingEditModal();

package/lib/components/booking/info2/service/index.js

@@ -40,8 +40,8 @@ var import_service = require("../../info/service/index.less");
 var import_addTimeModal = __toESM(require("./addTimeModal"));
 var import_useInfoHolder = __toESM(require("../../info/hooks/useInfoHolder"));
 var import_Lists = __toESM(require("../../info/service/Lists"));
-var import_useClearCart = __toESM(require("../../hooks/useClearCart"));
 var import_useQuotation = __toESM(require("../../hooks/useQuotation"));
+var import_editNormalService = __toESM(require("./editNormalService"));
 var Service = () => {
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const {
@@ -49,16 +49,16 @@ var Service = () => {
     handleEdit,
     handleAction,
     dispatchService,
-    showAddTimeModal
+    showAddTimeModal,
+    editNormalServiceRef
   } = (0, import_useInfoHolder.default)(state, dispatch);
   (0, import_react.useEffect)(() => {
     document.body.id = "body";
   }, []);
-  const clearCart = (0, import_useClearCart.default)(state, dispatch);
   const { dom } = (0, import_useQuotation.default)(state, dispatch);
   const renderMemo = (0, import_react.useMemo)(() => {
     console.log("render info22222");
-    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-wrap" }, clearCart, /* @__PURE__ */ import_react.default.createElement(
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-wrap" }, /* @__PURE__ */ import_react.default.createElement(
       import_Lists.default,
       {
         isParallelResource: true,
@@ -66,8 +66,8 @@ var Service = () => {
         onAction: handleAction,
         onChange: (e, type) => dispatchService(type || "setService", e)
       }
-    ), !state.isBookingCreatePage ? /* @__PURE__ */ import_react.default.createElement(import_addService.default, { onEdit: handleEdit }) : null), /* @__PURE__ */ import_react.default.createElement(import_editService.default, { ref: detailRef }), showAddTimeModal && /* @__PURE__ */ import_react.default.createElement(import_addTimeModal.default, null), dom);
-  }, [clearCart, dom, showAddTimeModal, clearCart]);
+    ), !state.isBookingCreatePage ? /* @__PURE__ */ import_react.default.createElement(import_addService.default, { onEdit: handleEdit }) : null), /* @__PURE__ */ import_react.default.createElement(import_editService.default, { ref: detailRef }), showAddTimeModal && /* @__PURE__ */ import_react.default.createElement(import_addTimeModal.default, null), /* @__PURE__ */ import_react.default.createElement(import_editNormalService.default, { ref: editNormalServiceRef }), dom);
+  }, [dom, showAddTimeModal]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, renderMemo);
 };
 var service_default = import_react.default.memo(Service);

package/lib/components/booking/info2/service/serviceItem/index.js

@@ -158,7 +158,7 @@ var ServiceItem = ({
       },
       /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "text", icon: /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-trash-01" }) })
     ),
-    d.id ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-title" }, d.title) : null,
+    d.id || d.isCustomItem ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-title" }, d.title) : null,
     d._extend && state.renderType !== "eventBooking" ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-date" }, (0, import_utils.getServiceTime)(d, state.date.value)), renderResources) : null,
     (((_d = (_c = d._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.bundle) || []).length ? /* @__PURE__ */ import_react.default.createElement(
       import_collapsibleList.default,
@@ -168,7 +168,7 @@ var ServiceItem = ({
         renderItem: (item) => (0, import_utils3.renderBundles)(item, state.amountSymbol)
       }
     ) : null,
-    d.id ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-price-wrap" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-service-item-price" }, (0, import_utils2.formatAmount)((_g = d._extend) == null ? void 0 : _g.total, 2, state.amountSymbol)), isDiscount ? /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-service-item-original-price" }, (0, import_utils2.formatAmount)(d._extend.origin_total, 2, state.amountSymbol)) : null)) : null,
+    d.id || d.isCustomItem ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-price-wrap" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-service-item-price" }, (0, import_utils2.formatAmount)((_g = d._extend) == null ? void 0 : _g.total, 2, state.amountSymbol)), isDiscount ? /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-service-item-original-price" }, (0, import_utils2.formatAmount)(d._extend.origin_total, 2, state.amountSymbol)) : null)) : null,
     isDiscount && ((_h = d._extend) == null ? void 0 : _h.discount_reason) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-discount-reason" }, /* @__PURE__ */ import_react.default.createElement("span", null, import_utils2.locales.getText("pisell2.text.discount-reason"), ":"), " ", (_i = d._extend) == null ? void 0 : _i.discount_reason) : null,
     renderUser,
     ((_j = d._extend.relation_details) == null ? void 0 : _j.length) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-relation-details" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-title" }, import_utils2.locales.getText("page.booking.text.sales")), d._extend.relation_details.map((item, index) => {

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

@@ -30,21 +30,6 @@ var getFormatResourceListAndMap = (data, bookingId = []) => {
     return prev;
   }, {});
   const getCapacity = (item) => {
-    var _a, _b, _c, _d;
-    if (((_a = item.combined_resource) == null ? void 0 : _a.status) === 1 && ((_c = (_b = item.combined_resource) == null ? void 0 : _b.resource_ids) == null ? void 0 : _c.length)) {
-      return (_d = item.combined_resource) == null ? void 0 : _d.resource_ids.reduce((pre, cur) => {
-        var _a2;
-        let pax = 0;
-        (((_a2 = map[cur]) == null ? void 0 : _a2.times) || []).forEach((time) => {
-          time.event_list.forEach((event) => {
-            if (!bookingId.includes(event.id)) {
-              pax += (event == null ? void 0 : event.pax) || 0;
-            }
-          });
-        });
-        return pre - pax;
-      }, item.capacity);
-    }
     return item.capacity;
   };
   resourceList = resourceList.map((item) => {

package/lib/components/booking/info2/utilsByBooking.d.ts

@@ -33,3 +33,4 @@ export declare const getAppointmentTimingPreference: (state: any) => any;
  * @Date: 2024-01-26 14:09
  */
 export declare const getServiceStartTimeAndEndTime: (state: any, cacheItem: any, timeObj: any) => any;
+export declare const getIsNoSpecAndPackage: (product: any) => boolean;

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

@@ -33,6 +33,7 @@ __export(utilsByBooking_exports, {
   formatTimes: () => formatTimes,
   getAppointmentTimingPreference: () => getAppointmentTimingPreference,
   getErrorList: () => getErrorList,
+  getIsNoSpecAndPackage: () => getIsNoSpecAndPackage,
   getResourceTimeIsUsable: () => getResourceTimeIsUsable,
   getServiceStartTimeAndEndTime: () => getServiceStartTimeAndEndTime,
   getSumCapacity: () => getSumCapacity
@@ -41,6 +42,7 @@ module.exports = __toCommonJS(utilsByBooking_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("@pisell/utils");
 var import_utils2 = require("../utils");
+var import_utils3 = require("../info/service2/utils");
 var getUseableEventCount = (eventList, current) => {
   return (eventList || []).reduce((pre, event) => {
     return pre - event.pax;
@@ -59,7 +61,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;
@@ -69,7 +71,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 || []).filter((event) => event.id !== (cacheItem == null ? void 0 : cacheItem.booking_id));
+  let eventList = time.event_list || [];
+  if (cacheItem == null ? void 0 : cacheItem.booking_id) {
+    eventList = eventList.filter((event) => event.id !== (cacheItem == null ? void 0 : cacheItem.booking_id));
+  }
   let endDate = null;
   let isCalcCount = true;
   if (isFlexible) {
@@ -205,15 +210,21 @@ var getAppointmentTimingPreference = (state) => {
   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, _b, _c;
+  var _a, _b, _c, _d;
+  if (cacheItem == null ? void 0 : cacheItem.isCustomItem) {
+    return {
+      duration: null
+      // 自定义商品没有时长概念
+    };
+  }
   const appointmentTimingPreference = getAppointmentTimingPreference(state);
-  let lastServer = (0, import_utils2.getLastServer)(state.service.value);
+  let lastServer = (0, import_utils2.getLastServer)((_a = state.service.value) == null ? void 0 : _a.filter((item) => !item.isCustomItem));
   let _extend = {
     // 时长: 当前商品时长 > 第一个时长
     duration: (0, import_utils2.findNextDuration)(
       cacheItem.duration,
       timeObj.durationSlicesBasedOnTime,
-      (_a = cacheItem == null ? void 0 : cacheItem.duration) == null ? void 0 : _a.value
+      (_b = cacheItem == null ? void 0 : cacheItem.duration) == null ? void 0 : _b.value
     )
   };
   if (lastServer) {
@@ -256,7 +267,7 @@ 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;
+  const session = (_d = (_c = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.session;
   if ((0, import_utils2.isSessionProduct)(cacheItem) && session) {
     _extend.start_date = session.start_at;
     _extend.startDate = session.start_at;
@@ -267,12 +278,23 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
   }
   return _extend;
 };
+var getIsNoSpecAndPackage = (product) => {
+  var _a, _b, _c, _d;
+  if (!(0, import_utils3.isNormalProductByDurationSchedule)(product)) {
+    return false;
+  }
+  if (product == null ? void 0 : product.isEditBooking) {
+    return ((_a = product == null ? void 0 : product.product_bundle) == null ? void 0 : _a.length) === 0 && (product == null ? void 0 : product.product_variant_id) === 0 && (((_c = (_b = product == null ? void 0 : product.product_sku) == null ? void 0 : _b.option) == null ? void 0 : _c.length) || 0) === 0;
+  }
+  return (product == null ? void 0 : product.is_bundle) === 0 && (((_d = product == null ? void 0 : product.variant) == null ? void 0 : _d.length) || 0) === 0 && ((product == null ? void 0 : product.option_group_count) || 0) === 0;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   formatResource,
   formatTimes,
   getAppointmentTimingPreference,
   getErrorList,
+  getIsNoSpecAndPackage,
   getResourceTimeIsUsable,
   getServiceStartTimeAndEndTime,
   getSumCapacity

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

@@ -223,11 +223,15 @@ declare const _default: {
         'pisell2.booking.dashboard.departed-visitors': string;
         'pisell2.booking.dashboard.departed-visitors-tip': string;
         'pisell2.booking.dashboard.default': string;
+        'pisell2.booking.info.text.clear': string;
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
         '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;
@@ -237,6 +241,29 @@ declare const _default: {
         'pisell2.text.missing.reservation.content': string;
         'pisell2.text.confirm': string;
         'pisell2.text.cancel': string;
+        'pisell2.action-buttons.clear': string;
+        'pisell2.action-buttons.manuel-order': string;
+        'pisell2.action-buttons.customise-item': string;
+        'pisell2.action-buttons.no-items-to-adjust': string;
+        'pisell2.action-buttons.adjust-order-price': string;
+        'pisell2.action-buttons.price-adjusted-success': string;
+        'pisell2.action-buttons.clear-success': string;
+        'pisell2.text.manual-price-adjustment': string;
+        'pisell2.customise-item.modal-title': string;
+        'pisell2.customise-item.product-name': string;
+        'pisell2.customise-item.default-product-name': string;
+        'pisell2.customise-item.vouchers-applicable': string;
+        'pisell2.customise-item.sell-price': string;
+        'pisell2.customise-item.manual-deduction-price': string;
+        'pisell2.customise-item.amount-placeholder': string;
+        'pisell2.customise-item.save': string;
+        'pisell2.customise-item.save-success': string;
+        'pisell2.customise-item.price-required-error': (priceType: string) => string;
+        'pisell2.subtotal.total': string;
+        'pisell2.clear-cart-modal.title': string;
+        'pisell2.clear-cart-modal.clear-items-only': string;
+        'pisell2.clear-cart-modal.clear-all-reset': string;
+        'pisell2.clear-cart-modal.empty-cart-tip': string;
         'pisell2.text.change.pet.title': string;
         'pisell2.text.change.pet.content': string;
         'pisell2.text.change.pet.content1': string;
@@ -270,6 +297,7 @@ declare const _default: {
         'pisell2.text.validity.valid_through': (str: string) => string;
         'pisell2.text.quotation.product.change.title': string;
         'pisell2.text.quotation.product.change.describe': string;
+        'pisell2.booking.notes.placeholder': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -495,11 +523,15 @@ declare const _default: {
         'pisell2.booking.dashboard.departed-visitors': string;
         'pisell2.booking.dashboard.departed-visitors-tip': string;
         'pisell2.booking.dashboard.default': string;
+        'pisell2.booking.info.text.clear': string;
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
         '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;
@@ -509,6 +541,29 @@ declare const _default: {
         'pisell2.text.missing.reservation.content': string;
         'pisell2.text.confirm': string;
         'pisell2.text.cancel': string;
+        'pisell2.action-buttons.clear': string;
+        'pisell2.action-buttons.manuel-order': string;
+        'pisell2.action-buttons.customise-item': string;
+        'pisell2.action-buttons.no-items-to-adjust': string;
+        'pisell2.action-buttons.adjust-order-price': string;
+        'pisell2.action-buttons.price-adjusted-success': string;
+        'pisell2.action-buttons.clear-success': string;
+        'pisell2.text.manual-price-adjustment': string;
+        'pisell2.customise-item.modal-title': string;
+        'pisell2.customise-item.product-name': string;
+        'pisell2.customise-item.default-product-name': string;
+        'pisell2.customise-item.vouchers-applicable': string;
+        'pisell2.customise-item.sell-price': string;
+        'pisell2.customise-item.manual-deduction-price': string;
+        'pisell2.customise-item.amount-placeholder': string;
+        'pisell2.customise-item.save': string;
+        'pisell2.customise-item.save-success': string;
+        'pisell2.customise-item.price-required-error': (priceType: string) => string;
+        'pisell2.subtotal.total': string;
+        'pisell2.clear-cart-modal.title': string;
+        'pisell2.clear-cart-modal.clear-items-only': string;
+        'pisell2.clear-cart-modal.clear-all-reset': string;
+        'pisell2.clear-cart-modal.empty-cart-tip': string;
         'pisell2.text.change.pet.title': string;
         'pisell2.text.change.pet.content': string;
         'pisell2.text.change.pet.content1': string;
@@ -542,6 +597,7 @@ declare const _default: {
         'pisell2.text.validity.valid_through': (str: string) => string;
         'pisell2.text.quotation.product.change.title': string;
         'pisell2.text.quotation.product.change.describe': string;
+        'pisell2.booking.notes.placeholder': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -767,11 +823,15 @@ declare const _default: {
         'pisell2.booking.dashboard.departed-visitors': string;
         'pisell2.booking.dashboard.departed-visitors-tip': string;
         'pisell2.booking.dashboard.default': string;
+        'pisell2.booking.info.text.clear': string;
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
         '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;
@@ -781,6 +841,29 @@ declare const _default: {
         'pisell2.text.missing.reservation.content': string;
         'pisell2.text.confirm': string;
         'pisell2.text.cancel': string;
+        'pisell2.action-buttons.clear': string;
+        'pisell2.action-buttons.manuel-order': string;
+        'pisell2.action-buttons.customise-item': string;
+        'pisell2.action-buttons.no-items-to-adjust': string;
+        'pisell2.action-buttons.adjust-order-price': string;
+        'pisell2.action-buttons.price-adjusted-success': string;
+        'pisell2.action-buttons.clear-success': string;
+        'pisell2.text.manual-price-adjustment': string;
+        'pisell2.customise-item.modal-title': string;
+        'pisell2.customise-item.product-name': string;
+        'pisell2.customise-item.default-product-name': string;
+        'pisell2.customise-item.vouchers-applicable': string;
+        'pisell2.customise-item.sell-price': string;
+        'pisell2.customise-item.manual-deduction-price': string;
+        'pisell2.customise-item.amount-placeholder': string;
+        'pisell2.customise-item.save': string;
+        'pisell2.customise-item.save-success': string;
+        'pisell2.customise-item.price-required-error': (priceType: string) => string;
+        'pisell2.subtotal.total': string;
+        'pisell2.clear-cart-modal.title': string;
+        'pisell2.clear-cart-modal.clear-items-only': string;
+        'pisell2.clear-cart-modal.clear-all-reset': string;
+        'pisell2.clear-cart-modal.empty-cart-tip': string;
         'pisell2.text.change.pet.title': string;
         'pisell2.text.change.pet.content': string;
         'pisell2.text.change.pet.content1': string;
@@ -814,6 +897,7 @@ declare const _default: {
         'pisell2.text.validity.valid_through': (str: string) => string;
         'pisell2.text.quotation.product.change.title': string;
         'pisell2.text.quotation.product.change.describe': string;
+        'pisell2.booking.notes.placeholder': string;
     };
 };
 export default _default;

package/lib/components/booking/locales.js

@@ -279,11 +279,15 @@ var locales_default = {
     "pisell2.booking.dashboard.departed-visitors": "Departed visitors",
     "pisell2.booking.dashboard.departed-visitors-tip": "Tip: Total number of visitors who checked in and have left the venue today",
     "pisell2.booking.dashboard.default": "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.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",
@@ -293,6 +297,33 @@ var locales_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",
+    // Action Buttons
+    "pisell2.action-buttons.clear": "Clear",
+    "pisell2.action-buttons.manuel-order": "Manual\nOrder $",
+    "pisell2.action-buttons.customise-item": "Customise Item",
+    "pisell2.action-buttons.no-items-to-adjust": "No items in cart to adjust price.",
+    "pisell2.action-buttons.adjust-order-price": "Adjust Order Price",
+    "pisell2.action-buttons.price-adjusted-success": "Order price adjusted successfully.",
+    "pisell2.action-buttons.clear-success": "Clear Success",
+    "pisell2.text.manual-price-adjustment": "Discount",
+    // Customise Item Modal
+    "pisell2.customise-item.modal-title": "Create and Add Customise (Once-off) Item",
+    "pisell2.customise-item.product-name": "Product Name",
+    "pisell2.customise-item.default-product-name": "One-Off Item",
+    "pisell2.customise-item.vouchers-applicable": "Vouchers/Discounts Applicable",
+    "pisell2.customise-item.sell-price": "Sell Price",
+    "pisell2.customise-item.manual-deduction-price": "Manual Deduction Price",
+    "pisell2.customise-item.amount-placeholder": "Amount",
+    "pisell2.customise-item.save": "Save",
+    "pisell2.customise-item.save-success": "Custom item added successfully.",
+    "pisell2.customise-item.price-required-error": (priceType) => `Please complete the input for ${priceType}.`,
+    // SubTotal
+    "pisell2.subtotal.total": "Total",
+    // Clear Cart Modal
+    "pisell2.clear-cart-modal.title": "Are you sure to clear cart?",
+    "pisell2.clear-cart-modal.clear-items-only": "Clear Items Only",
+    "pisell2.clear-cart-modal.clear-all-reset": "Clear All &\nReset Cart",
+    "pisell2.clear-cart-modal.empty-cart-tip": "Cart is empty",
     "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.",
@@ -331,7 +362,9 @@ var locales_default = {
       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."
+    "pisell2.text.quotation.product.change.describe": "Product updates available: Please refresh the following items to load the latest data.",
+    // Notes
+    "pisell2.booking.notes.placeholder": "Enter a note..."
   },
   "zh-CN": {
     "pisell2.text.refunded-amount": "已退金额",
@@ -583,11 +616,15 @@ var locales_default = {
     "pisell2.booking.dashboard.departed-visitors": "已离场的游客",
     "pisell2.booking.dashboard.departed-visitors-tip": "提示：今日已检票并离场的游客总人数",
     "pisell2.booking.dashboard.default": "默认",
+    "pisell2.booking.info.text.clear": "清空",
     "pisell2.booking.info.text.clear-cart": "清空购物车",
     "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.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": "未选择任何项目",
@@ -597,6 +634,33 @@ var locales_default = {
     "pisell2.text.missing.reservation.content": "您尚未选择预约类型，请在继续操作前选择。",
     "pisell2.text.confirm": "确定",
     "pisell2.text.cancel": "取消",
+    // Action Buttons
+    "pisell2.action-buttons.clear": "清空",
+    "pisell2.action-buttons.manuel-order": "手动\n订单 $",
+    "pisell2.action-buttons.customise-item": "自定义商品",
+    "pisell2.action-buttons.no-items-to-adjust": "购物车中没有商品可调整价格。",
+    "pisell2.action-buttons.adjust-order-price": "调整订单价格",
+    "pisell2.action-buttons.price-adjusted-success": "订单价格调整成功。",
+    "pisell2.action-buttons.clear-success": "清空成功",
+    "pisell2.text.manual-price-adjustment": "折扣",
+    // Customise Item Modal
+    "pisell2.customise-item.modal-title": "创建并添加一次性商品",
+    "pisell2.customise-item.product-name": "商品名称",
+    "pisell2.customise-item.default-product-name": "一次性商品",
+    "pisell2.customise-item.vouchers-applicable": "应用所有优惠 / 折扣",
+    "pisell2.customise-item.sell-price": "售价",
+    "pisell2.customise-item.manual-deduction-price": "手动减价金额",
+    "pisell2.customise-item.amount-placeholder": "金额",
+    "pisell2.customise-item.save": "保存",
+    "pisell2.customise-item.save-success": "自定义商品添加成功。",
+    "pisell2.customise-item.price-required-error": (priceType) => `请完成${priceType}的输入。`,
+    // SubTotal
+    "pisell2.subtotal.total": "总价",
+    // Clear Cart Modal
+    "pisell2.clear-cart-modal.title": "确定要清空购物车吗？",
+    "pisell2.clear-cart-modal.clear-items-only": "仅清空商品",
+    "pisell2.clear-cart-modal.clear-all-reset": "清空所有内容\n并重置购物车",
+    "pisell2.clear-cart-modal.empty-cart-tip": "当前购物车为空",
     "pisell2.text.change.pet.title": "您已变更持有人信息，是否保留该持有人名下的商品？",
     "pisell2.text.change.pet.content": "选择“保留”将商品添加到未分配商品（公共购物车）中；选择“不保留”将清空该持有人名下的所有商品。",
     "pisell2.text.change.pet.content1": "预约类商品无法添加到公共购物车，将会被删除。",
@@ -635,7 +699,9 @@ var locales_default = {
       return `有效期至 ${str} （含当日）`;
     },
     "pisell2.text.quotation.product.change.title": "提示",
-    "pisell2.text.quotation.product.change.describe": "以下商品信息已更新，请重新编辑相关商品以同步最新数据。"
+    "pisell2.text.quotation.product.change.describe": "以下商品信息已更新，请重新编辑相关商品以同步最新数据。",
+    // Notes
+    "pisell2.booking.notes.placeholder": "输入备注..."
   },
   "zh-HK": {
     "pisell2.text.refunded-amount": "已退金額",
@@ -887,11 +953,15 @@ var locales_default = {
     "pisell2.booking.dashboard.departed-visitors": "已離場的遊客",
     "pisell2.booking.dashboard.departed-visitors-tip": "提示：今日已檢票並離場的遊客總人數",
     "pisell2.booking.dashboard.default": "默认",
+    "pisell2.booking.info.text.clear": "清空",
     "pisell2.booking.info.text.clear-cart": "清空購物車",
     "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.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": "未選擇任何項目",
@@ -901,6 +971,33 @@ var locales_default = {
     "pisell2.text.missing.reservation.content": "您尚未選擇預約類型，請在繼續操作前選擇。",
     "pisell2.text.confirm": "確定",
     "pisell2.text.cancel": "取消",
+    // Action Buttons
+    "pisell2.action-buttons.clear": "清空",
+    "pisell2.action-buttons.manuel-order": "手動\n訂單 $",
+    "pisell2.action-buttons.customise-item": "自定義商品",
+    "pisell2.action-buttons.no-items-to-adjust": "購物車中沒有商品可調整價格。",
+    "pisell2.action-buttons.adjust-order-price": "調整訂單價格",
+    "pisell2.action-buttons.price-adjusted-success": "訂單價格調整成功。",
+    "pisell2.action-buttons.clear-success": "清空成功",
+    "pisell2.text.manual-price-adjustment": "折扣",
+    // Customise Item Modal
+    "pisell2.customise-item.modal-title": "創建並添加一次性商品",
+    "pisell2.customise-item.product-name": "商品名稱",
+    "pisell2.customise-item.default-product-name": "一次性商品",
+    "pisell2.customise-item.vouchers-applicable": "應用所有優惠 / 折扣",
+    "pisell2.customise-item.sell-price": "售價",
+    "pisell2.customise-item.manual-deduction-price": "手動減價金額",
+    "pisell2.customise-item.amount-placeholder": "金額",
+    "pisell2.customise-item.save": "保存",
+    "pisell2.customise-item.save-success": "自定義商品添加成功。",
+    "pisell2.customise-item.price-required-error": (priceType) => `請完成${priceType}的輸入。`,
+    // SubTotal
+    "pisell2.subtotal.total": "總價",
+    // Clear Cart Modal
+    "pisell2.clear-cart-modal.title": "確定要清空購物車嗎？",
+    "pisell2.clear-cart-modal.clear-items-only": "僅清空商品",
+    "pisell2.clear-cart-modal.clear-all-reset": "清空所有內容\n並重置購物車",
+    "pisell2.clear-cart-modal.empty-cart-tip": "當前購物車為空",
     "pisell2.text.change.pet.title": "您已變更持有人信息，是否保留該持有人名下的商品？",
     "pisell2.text.change.pet.content": "選擇“保留”將商品添加到未分配商品（公共購物車）中；選擇“不保留”將清空該持有人名下的所有商品。",
     "pisell2.text.change.pet.content1": "預約類商品無法添加到公共購物車，將會被刪除。",
@@ -939,6 +1036,8 @@ var locales_default = {
       return `有效期至 ${str} （含當日）`;
     },
     "pisell2.text.quotation.product.change.title": "提示",
-    "pisell2.text.quotation.product.change.describe": "以下商品信息已更新，请重新编辑相关商品以同步最新数据。"
+    "pisell2.text.quotation.product.change.describe": "以下商品信息已更新，请重新编辑相关商品以同步最新数据。",
+    // Notes
+    "pisell2.booking.notes.placeholder": "輸入備註..."
   }
 };

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

@@ -0,0 +1,13 @@
+import { SelectProps } from 'antd';
+interface DurationProps extends SelectProps {
+    locale?: string;
+    slice?: number;
+    selectProps?: SelectProps;
+    timeObjChange?: any;
+    duration?: any;
+    usableTime?: any;
+    startDate?: any;
+    timeObj?: any;
+}
+declare const Duration: (props: DurationProps) => JSX.Element;
+export default Duration;

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/addNote/index.d.ts

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