@pisell/private-materials 3.0.118 → 3.0.120

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

@@ -48,8 +48,8 @@ var import_like = __toESM(require("../like"));
 var import_mock = require("../../../mock");
 var import_utils4 = require("../addService/utils");
 var submitLock = false;
-var Info = () => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+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;
   const [form] = import_antd.Form.useForm();
   const useTotal = import_antd.Form.useWatch("total", form);
   const useLikeStatus = import_antd.Form.useWatch("like_status", form);
@@ -59,13 +59,13 @@ var Info = () => {
   const [resourceLoading, setResourceLoading] = (0, import_react.useState)(false);
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const [selectOpen, setSelectOpen] = (0, import_react.useState)();
-  const getCurrentCacheItem = () => {
+  const getCurrentCacheItem = (_cacheItem) => {
     let values = form.getFieldsValue();
-    let _cacheItem = state.service.cacheItem;
+    let _item = _cacheItem || state.service.cacheItem;
     return {
-      ..._cacheItem,
+      ..._item,
       _extend: {
-        ..._cacheItem == null ? void 0 : _cacheItem._extend,
+        ..._item == null ? void 0 : _item._extend,
         ...values
       }
     };
@@ -118,12 +118,11 @@ var Info = () => {
     }
   }, [useDuration, flexibleOption]);
   const getResources = async (cacheItem) => {
-    var _a2;
     console.log("getResources2");
     try {
       let _list = state.service.resourcesOrigin || [];
-      let autoClose = (_a2 = state.service.cacheItem) == null ? void 0 : _a2.autoClose;
       const _cacheItem = cacheItem || getCurrentCacheItem();
+      let autoClose = _cacheItem == null ? void 0 : _cacheItem.autoClose;
       if (!_cacheItem._extend) {
         return;
       }
@@ -199,6 +198,7 @@ var Info = () => {
   };
   const getDiscount = () => {
     var _a2;
+    console.log("折扣内", state.service.cacheItem);
     let oPrice = Number(((_a2 = state.service.cacheItem) == null ? void 0 : _a2._extend.origin_total) || 0);
     let cPrice = Number(useTotal || 0);
     let discount = "";
@@ -260,21 +260,17 @@ var Info = () => {
         addModal: false,
         value: _list,
         edit: true,
-        cacheItem: null
+        cacheItem: null,
+        changeService: false
       }
     });
   };
-  const setEditData = (0, import_ahooks.useMemoizedFn)(() => {
-    if (state.service.editModal) {
-      let cacheItem = state.service.cacheItem;
-      let values = cacheItem._extend;
-      form.setFieldsValue(values);
-      if (state.renderType !== "eventBooking") {
-        getResources();
-      }
-    } else {
-      setSelectOpen(void 0);
-      form.resetFields();
+  const setEditData = (0, import_ahooks.useMemoizedFn)((_cacheItem) => {
+    let cacheItem = _cacheItem || state.service.cacheItem;
+    let values = cacheItem._extend;
+    form.setFieldsValue(values);
+    if (state.renderType !== "eventBooking") {
+      getResources(_cacheItem);
     }
   });
   const isReason = (0, import_react.useMemo)(() => {
@@ -282,7 +278,7 @@ var Info = () => {
     let oPrice = Number(((_a2 = state.service.cacheItem) == null ? void 0 : _a2._extend.origin_total) || 0);
     let cPrice = Number(useTotal || 0);
     return cPrice !== oPrice;
-  }, [useTotal, state.service.cacheItem]);
+  }, [useTotal, (_e = (_d = state.service.cacheItem) == null ? void 0 : _d._extend) == null ? void 0 : _e.origin_total]);
   const errorList = (0, import_react.useMemo)(() => {
     return (0, import_utils3.getErrorList)(currentResource, getCurrentCacheItem());
   }, [currentResource, useDuration, useStartTime]);
@@ -298,24 +294,23 @@ var Info = () => {
     useDuration,
     state.renderType,
     state.service.resourcesOrigin,
-    (_d = state.service.cacheItem) == null ? void 0 : _d.autoClose
+    (_f = state.service.cacheItem) == null ? void 0 : _f.autoClose
   ]);
   (0, import_react.useEffect)(() => {
-    setEditData();
-  }, [state.service.editModal, setEditData]);
+  }, [state.service.editModal]);
   (0, import_react.useEffect)(() => {
     getErrorMsg();
   }, [useResource, useStartTime, useDuration]);
   (0, import_react.useEffect)(() => {
     getDiscount();
-  }, [useTotal, state.service.cacheItem]);
+  }, [useTotal, (_h = (_g = state.service.cacheItem) == null ? void 0 : _g._extend) == null ? void 0 : _h.origin_total]);
   const isDiscount = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     if (!((_a2 = state.service) == null ? void 0 : _a2.cacheItem)) {
       return false;
     }
     return useTotal != ((_c2 = (_b2 = state.service) == null ? void 0 : _b2.cacheItem) == null ? void 0 : _c2._extend.origin_total);
-  }, [useTotal, (_f = (_e = state.service) == null ? void 0 : _e.cacheItem) == null ? void 0 : _f._extend.origin_total]);
+  }, [useTotal, (_j = (_i = state.service) == null ? void 0 : _i.cacheItem) == null ? void 0 : _j._extend.origin_total]);
   (0, import_react.useEffect)(() => {
     if (useResource === 0) {
       handleLikeResource("common");
@@ -324,7 +319,7 @@ var Info = () => {
   const bundles = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2;
     return ((_d2 = (_c2 = (_b2 = (_a2 = state.service) == null ? void 0 : _a2.cacheItem) == null ? void 0 : _b2._extend) == null ? void 0 : _c2.other) == null ? void 0 : _d2.bundle) || [];
-  }, [(_j = (_i = (_h = (_g = state.service) == null ? void 0 : _g.cacheItem) == null ? void 0 : _h._extend) == null ? void 0 : _i.other) == null ? void 0 : _j.bundle]);
+  }, [(_n = (_m = (_l = (_k = state.service) == null ? void 0 : _k.cacheItem) == null ? void 0 : _l._extend) == null ? void 0 : _m.other) == null ? void 0 : _n.bundle]);
   const getResourcesData = async () => {
     setResourceLoading(true);
     try {
@@ -348,53 +343,103 @@ var Info = () => {
     setResourceLoading(false);
   };
   (0, import_react.useEffect)(() => {
-    getResourcesData();
+    setTimeout(() => {
+      getResourcesData();
+    }, 20);
   }, [state.date.value]);
-  const SelectTime = (_k = window.BaseMaterials) == null ? void 0 : _k.SelectTime;
+  const handleEdit = (e) => {
+    const item = state.service.cacheItem;
+    let values = form.getFieldsValue();
+    state.action({
+      type: "pisell1.handleOpenProductModal",
+      data: {
+        id: item.id,
+        date: state.date.value.format("YYYY-MM-DD"),
+        showConfig: {
+          option: false,
+          session: false,
+          variant: false,
+          package: true
+        },
+        value: item._extend.other
+      },
+      callback: (e2) => {
+        let cacheItem = {
+          ...item,
+          product_id: item.id,
+          _id: item == null ? void 0 : item._id,
+          _key: e2.key,
+          _extend: {
+            ...item._extend,
+            // 将当前表单的值覆盖进去
+            ...values,
+            // 覆盖选择的规格和套餐
+            other: JSON.parse(JSON.stringify(e2))
+          },
+          new: 0
+        };
+        let _total = (0, import_utils3.getProductTotalPrice)(cacheItem);
+        cacheItem._extend.total = _total;
+        cacheItem._extend.origin_total = _total;
+        dispatch({
+          type: "setService",
+          payload: {
+            cacheItem
+          }
+        });
+        form.setFieldsValue({
+          total: _total
+        });
+      }
+    });
+  };
+  const handleChange = (e) => {
+    if (state.channelDisabledEdit) {
+      return;
+    }
+    dispatch({
+      type: "setService",
+      payload: {
+        addModal: true,
+        editModal: true,
+        //用于控制 添加商品 和 编辑服务弹窗的上下层级
+        changeService: true
+      }
+    });
+  };
+  (0, import_react.useImperativeHandle)(ref, () => {
+    return {
+      init: setEditData
+    };
+  });
+  console.log("state.service.value", state.service.value);
+  const SelectTime = (_o = window.BaseMaterials) == null ? void 0 : _o.SelectTime;
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {
-      zIndex: 1e3,
+      zIndex: state.service.changeService ? 999 : 1e3,
       forceRender: true,
-      open: state.service.editModal && !((_l = state.service.cacheItem) == null ? void 0 : _l.autoClose),
+      open: state.service.editModal && !((_p = state.service.cacheItem) == null ? void 0 : _p.autoClose),
       title: import_utils.locales.getText("pisell2.text.edit-service"),
       onClose: () => {
         dispatch({
           type: "setService",
           payload: {
             editModal: false,
-            cacheItem: null
+            cacheItem: null,
+            changeService: false
           }
         });
       }
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body-edit" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { layout: "vertical", form, onFinish }, /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "product_name" }, /* @__PURE__ */ import_react.default.createElement(
-      "div",
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body-edit" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { layout: "vertical", form, onFinish }, /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "product_name" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name" }, ((_s = (_r = (_q = state.service) == null ? void 0 : _q.cacheItem) == null ? void 0 : _r._extend) == null ? void 0 : _s.product_name) || "-"), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleEdit }, import_utils.locales.getText("pisell2.text.edit")), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleChange }, import_utils.locales.getText("pisell2.text.change"))), /* @__PURE__ */ import_react.default.createElement(
+      import_collapsibleList.default,
       {
-        className: "current-service-info",
-        onClick: () => {
-          if (state.channelDisabledEdit) {
-            return;
-          }
-          dispatch({
-            type: "setService",
-            payload: {
-              addModal: true,
-              editModal: false
-            }
-          });
-        }
-      },
-      /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name" }, ((_o = (_n = (_m = state.service) == null ? void 0 : _m.cacheItem) == null ? void 0 : _n._extend) == null ? void 0 : _o.product_name) || "-"),
-      /* @__PURE__ */ import_react.default.createElement(
-        import_collapsibleList.default,
-        {
-          style: { marginTop: bundles.length ? "8px" : 0 },
-          list: bundles,
-          renderItem: (item) => (0, import_utils2.renderBundles)(item, state.amountSymbol)
-        }
-      )
-    ))), /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 12 }, /* @__PURE__ */ import_react.default.createElement(
+        style: { marginTop: bundles.length ? "8px" : 0 },
+        list: bundles,
+        renderItem: (item) => (0, import_utils2.renderBundles)(item, state.amountSymbol)
+      }
+    )))), /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 12 }, /* @__PURE__ */ import_react.default.createElement(
       import_antd.Form.Item,
       {
         label: import_utils.locales.getText("pisell2.text.price"),
@@ -410,8 +455,8 @@ var Info = () => {
           precision: 2,
           style: { width: "100%" },
           min: 0,
-          max: ((_q = (_p = state.service.cacheItem) == null ? void 0 : _p._extend) == null ? void 0 : _q.origin_total) || 0,
-          placeholder: ((_s = (_r = state.service.cacheItem) == null ? void 0 : _r._extend) == null ? void 0 : _s.origin_total) || "0"
+          max: ((_u = (_t = state.service.cacheItem) == null ? void 0 : _t._extend) == null ? void 0 : _u.origin_total) || 0,
+          placeholder: ((_w = (_v = state.service.cacheItem) == null ? void 0 : _v._extend) == null ? void 0 : _w.origin_total) || "0"
         }
       )
     )), /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 12 }, /* @__PURE__ */ import_react.default.createElement(
@@ -451,7 +496,7 @@ var Info = () => {
       SelectTime ? /* @__PURE__ */ import_react.default.createElement(
         SelectTime,
         {
-          slice: (_w = (_v = (_u = (_t = state.bookingConfig) == null ? void 0 : _t.config) == null ? void 0 : _u.basic) == null ? void 0 : _v.service_time) == null ? void 0 : _w.value,
+          slice: (_A = (_z = (_y = (_x = state.bookingConfig) == null ? void 0 : _x.config) == null ? void 0 : _y.basic) == null ? void 0 : _z.service_time) == null ? void 0 : _A.value,
           timePickerProps: {
             style: { width: "100%" }
           },
@@ -551,4 +596,4 @@ var Info = () => {
     )))
   ));
 };
-var editService_default = Info;
+var editService_default = (0, import_react.forwardRef)(Info);

package/lib/components/booking/info/service/editService/index.less

@@ -97,10 +97,19 @@
   overflow: hidden;
   padding: 11px;
 
-  .current-service-info-name {
-    font-size: 16px;
-    color: #101828;
-    font-weight: 650;
+  .current-service-info-name-wrap {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+
+    .current-service-info-name {
+      font-size: 16px;
+      color: #101828;
+      font-weight: 650;
+      flex: 1;
+    }
+
+    .current-service-info-change-btn {}
   }
 
   &:hover {

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

@@ -42,6 +42,7 @@ var import_addTimeModal = __toESM(require("./addTimeModal"));
 var Service = () => {
   var _a, _b;
   const { state } = (0, import_react.useContext)(import_model.Context);
+  const detailRef = (0, import_react.useRef)();
   (0, import_react.useEffect)(() => {
     document.body.id = "body";
   }, []);
@@ -63,6 +64,12 @@ var Service = () => {
     }
     return true;
   }, [state, appointment_card.quick_time]);
-  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_serviceList.default, null), /* @__PURE__ */ import_react.default.createElement(import_addService.default, null)), /* @__PURE__ */ import_react.default.createElement(import_editService.default, null), showAddTimeModal && /* @__PURE__ */ import_react.default.createElement(import_addTimeModal.default, null));
+  const handleEdit = (cacheItem) => {
+    setTimeout(() => {
+      var _a2, _b2;
+      (_b2 = (_a2 = detailRef.current) == null ? void 0 : _a2.init) == null ? void 0 : _b2.call(_a2, cacheItem);
+    }, 100);
+  };
+  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_serviceList.default, { onEdit: handleEdit }), /* @__PURE__ */ import_react.default.createElement(import_addService.default, { onEdit: handleEdit })), /* @__PURE__ */ import_react.default.createElement(import_editService.default, { ref: detailRef }), showAddTimeModal && /* @__PURE__ */ import_react.default.createElement(import_addTimeModal.default, null));
 };
 var service_default = Service;

package/lib/components/booking/info/service/serviceList/index.d.ts

@@ -1,4 +1,6 @@
-import React from "react";
-import "./index.less";
-declare const ServiceList: () => React.JSX.Element;
+import React from 'react';
+import './index.less';
+declare const ServiceList: ({ onEdit }: {
+    onEdit: any;
+}) => React.JSX.Element;
 export default ServiceList;

package/lib/components/booking/info/service/serviceList/index.js

@@ -39,7 +39,7 @@ var import_model = require("../../model");
 var import_mock = require("../../../mock");
 var import_utils2 = require("../../../utils");
 var import_serviceItem = __toESM(require("../serviceItem"));
-var ServiceList = () => {
+var ServiceList = ({ onEdit }) => {
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const errorTypes = {
     product: import_utils.locales.getText("pisell2.text.status.service-error-1"),
@@ -57,6 +57,7 @@ var ServiceList = () => {
         cacheItem: { ...item, new: 0 }
       }
     });
+    onEdit == null ? void 0 : onEdit({ ...item, new: 0 });
   };
   const getResourceItem = (0, import_react.useCallback)(
     (id) => {

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

@@ -55,7 +55,7 @@ var moveItemToFront = (arr, targetId) => {
   return arr;
 };
 var isInterval = (time1, time2, interval = 1e3) => {
-  return time2 - time1 < interval;
+  return Math.abs(time2 - time1) < interval;
 };
 var formatServiceListByTime = (list) => {
   var _a, _b;

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

@@ -172,6 +172,20 @@ declare const _default: {
             list: any[];
         }) => string;
         'page.event.booking.text.duplicate-enrollment-confirm': string;
+        'page.booking.text.unconfirmed-payements': string;
+        'page.booking.text.unconfirmed-payements.msg': string;
+        'page.booking.text.go-to-payments': string;
+        'page.booking.text.cancel-only': string;
+        'page.booking.text.refund': string;
+        'page.booking.text.confirm': string;
+        'page.booking.text.go-back': string;
+        'page.booking.text.cancel-booking': string;
+        'page.booking.text.cancel-booking.msg': string;
+        'page.booking.text.disabled-tickets': string;
+        'page.booking.text.paid.msg': (x: string) => string;
+        'page.booking.text.please-choose-an-option': string;
+        'page.booking.text.please-choose-an-option-1': string;
+        'page.booking.text.please-choose-an-option-2': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -346,6 +360,20 @@ declare const _default: {
             list: any[];
         }) => string;
         'page.event.booking.text.duplicate-enrollment-confirm': string;
+        'page.booking.text.unconfirmed-payements': string;
+        'page.booking.text.unconfirmed-payements.msg': string;
+        'page.booking.text.go-to-payments': string;
+        'page.booking.text.cancel-only': string;
+        'page.booking.text.refund': string;
+        'page.booking.text.confirm': string;
+        'page.booking.text.go-back': string;
+        'page.booking.text.cancel-booking': string;
+        'page.booking.text.cancel-booking.msg': string;
+        'page.booking.text.disabled-tickets': string;
+        'page.booking.text.paid.msg': (x: string) => string;
+        'page.booking.text.please-choose-an-option': string;
+        'page.booking.text.please-choose-an-option-1': string;
+        'page.booking.text.please-choose-an-option-2': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -520,6 +548,20 @@ declare const _default: {
             list: any[];
         }) => string;
         'page.event.booking.text.duplicate-enrollment-confirm': string;
+        'page.booking.text.unconfirmed-payements': string;
+        'page.booking.text.unconfirmed-payements.msg': string;
+        'page.booking.text.go-to-payments': string;
+        'page.booking.text.cancel-only': string;
+        'page.booking.text.refund': string;
+        'page.booking.text.confirm': string;
+        'page.booking.text.go-back': string;
+        'page.booking.text.cancel-booking': string;
+        'page.booking.text.cancel-booking.msg': string;
+        'page.booking.text.disabled-tickets': string;
+        'page.booking.text.paid.msg': (x: string) => string;
+        'page.booking.text.please-choose-an-option': string;
+        'page.booking.text.please-choose-an-option-1': string;
+        'page.booking.text.please-choose-an-option-2': string;
     };
 };
 export default _default;

package/lib/components/booking/locales.js

@@ -92,7 +92,7 @@ var locales_default = {
     "pisell2.text.status.confirmed": "Confirmed",
     "pisell2.text.status.arrived": "Arrived",
     "pisell2.text.status.started": "Started",
-    "pisell2.text.status.cancelled": "Cancelled",
+    "pisell2.text.status.cancelled": "Cancel",
     "pisell2.text.status.no_show": "No show",
     "pisell2.text.status.completed": "Completed",
     "pisell2.text.status.booking_id": "Booking ID",
@@ -226,7 +226,21 @@ var locales_default = {
       });
       return `${customerName || ""} has already enrolled in the ${title} ${listStr.join(",")}, Are you sure you want to enroll again？`;
     },
-    "page.event.booking.text.duplicate-enrollment-confirm": "Confirm"
+    "page.event.booking.text.duplicate-enrollment-confirm": "Confirm",
+    "page.booking.text.unconfirmed-payements": "Unconfirmed payements",
+    "page.booking.text.unconfirmed-payements.msg": "There are unconfirmed payments,  please confirm or void the payments first.",
+    "page.booking.text.go-to-payments": "Go to payments",
+    "page.booking.text.cancel-only": "Cancel only",
+    "page.booking.text.refund": "Refund",
+    "page.booking.text.confirm": "Confirm",
+    "page.booking.text.go-back": "Go back",
+    "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.",
+    "page.booking.text.paid.msg": (x) => `The related order is ${x === "paid" ? "paid" : "partially paid"}.`,
+    "page.booking.text.please-choose-an-option": "Please choose an option:",
+    "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)"
   },
   "zh-CN": {
     "pisell2.text.refunded-amount": "已退金额",
@@ -294,7 +308,7 @@ var locales_default = {
     "pisell2.text.status.confirmed": "已确认",
     "pisell2.text.status.arrived": "已到达",
     "pisell2.text.status.started": "已开始",
-    "pisell2.text.status.cancelled": "已取消",
+    "pisell2.text.status.cancelled": "取消",
     "pisell2.text.status.no_show": "失约",
     "pisell2.text.status.completed": "已完成",
     "pisell2.text.status.booking_id": "预约 ID",
@@ -425,7 +439,21 @@ var locales_default = {
       });
       return `${customerName || ""}已报名${title} ${listStr.join(",")}, 确定要再次报名吗？`;
     },
-    "page.event.booking.text.duplicate-enrollment-confirm": "确认"
+    "page.event.booking.text.duplicate-enrollment-confirm": "确认",
+    "page.booking.text.unconfirmed-payements": "未确认的付款",
+    "page.booking.text.unconfirmed-payements.msg": "存在未确认的付款，请先确认收款或作废。",
+    "page.booking.text.go-to-payments": "前往收款界面",
+    "page.booking.text.cancel-only": "仅取消",
+    "page.booking.text.refund": "退款",
+    "page.booking.text.confirm": "确认",
+    "page.booking.text.go-back": "返回",
+    "page.booking.text.cancel-booking": "取消预约",
+    "page.booking.text.cancel-booking.msg": "该操作不可撤销，请谨慎操作。",
+    "page.booking.text.disabled-tickets": "所有票单将被禁用。",
+    "page.booking.text.paid.msg": (x) => `关联订单${x === "paid" ? "已支付" : "部分支付"}。`,
+    "page.booking.text.please-choose-an-option": "请选择：",
+    "page.booking.text.please-choose-an-option-1": "退款：取消预约，同时处理退款。",
+    "page.booking.text.please-choose-an-option-2": "仅取消：仅取消预约，但不进行退款处理。（您仍然可以在取消后再进行退款操作）"
   },
   "zh-HK": {
     "pisell2.text.refunded-amount": "已退金額",
@@ -491,7 +519,7 @@ var locales_default = {
     "pisell2.text.status.confirmed": "已确認",
     "pisell2.text.status.arrived": "已到達",
     "pisell2.text.status.started": "已開始",
-    "pisell2.text.status.cancelled": "已取消",
+    "pisell2.text.status.cancelled": "取消",
     "pisell2.text.status.no_show": "失約",
     "pisell2.text.status.completed": "已完成",
     "pisell2.text.status.booking_id": "預約 ID",
@@ -624,6 +652,20 @@ var locales_default = {
       });
       return `${customerName || ""}已報名${title} ${listStr.join(",")}, 確定要再次報名嗎？`;
     },
-    "page.event.booking.text.duplicate-enrollment-confirm": "確認"
+    "page.event.booking.text.duplicate-enrollment-confirm": "確認",
+    "page.booking.text.unconfirmed-payements": "未確認的付款",
+    "page.booking.text.unconfirmed-payements.msg": "存在未確認的付款，請先確認收款或作廢。",
+    "page.booking.text.go-to-payments": "前往收款界面",
+    "page.booking.text.cancel-only": "僅取消",
+    "page.booking.text.refund": "退款",
+    "page.booking.text.confirm": "確認",
+    "page.booking.text.go-back": "返回",
+    "page.booking.text.cancel-booking": "取消預約",
+    "page.booking.text.cancel-booking.msg": "該操作不可撤銷，請謹慎操作。",
+    "page.booking.text.disabled-tickets": "所有票單將被禁用。",
+    "page.booking.text.paid.msg": (x) => `關聯訂單${x === "paid" ? "已支付" : "部分支付"}。`,
+    "page.booking.text.please-choose-an-option": "請選擇：",
+    "page.booking.text.please-choose-an-option-1": "退款：取消預約，同時處理退款。",
+    "page.booking.text.please-choose-an-option-2": "僅取消：僅取消預約，但不進行退款處理。（您仍然可以在取消後再進行退款操作）"
   }
 };

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

@@ -40,6 +40,7 @@ export interface FormState {
         cacheItem: any;
         edit: boolean;
         addTimeModal: boolean;
+        changeService: any;
     };
     pet: {
         showModal: boolean;
@@ -73,7 +74,7 @@ export interface FormState {
     bookingId: string | number;
     bookingDetail: any;
     channelDisabledEdit: boolean;
-    renderType?: "eventBooking";
+    renderType?: 'eventBooking';
     modalOpen?: boolean;
     isTerminal?: boolean;
     isFranchisee?: boolean;
@@ -81,7 +82,7 @@ export interface FormState {
     eventOtherParams?: {
         relation_id: number;
         number: number;
-        registration_type: "single" | "all" | "extra_include";
+        registration_type: 'single' | 'all' | 'extra_include';
         start_date: string;
         start_time: string;
         end_date: string;

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

@@ -4,5 +4,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Notes: (props: any) => any;
+declare const Notes: (props: any) => JSX.Element;
 export default Notes;

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/booking/payments/index.d.ts

@@ -5,5 +5,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Payments: (props: any) => any;
+declare const Payments: any;
 export default Payments;

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/schedules/index.d.ts

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: (props: any) => any;
+declare const Schedules: (props: any) => JSX.Element;
 export default Schedules;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,7 +68,7 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.118",
+  "version": "3.0.120",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
-    "@pisell/utils": "1.0.28",
+    "@pisell/icon": "0.0.11",
     "@pisell/materials": "3.0.38",
-    "@pisell/date-picker": "1.0.97",
-    "@pisell/icon": "0.0.11"
+    "@pisell/utils": "1.0.28",
+    "@pisell/date-picker": "1.0.97"
   },
   "peerDependencies": {
     "react": "^18.0.0",