@pisell/private-materials 3.0.119 → 3.0.120

package/lib/components/booking/info/header/index.less

@@ -48,7 +48,7 @@
       display: flex;
       align-items: center;
       gap: 10px;
-      color: var(--Base-White, #FFF);
+      color: var(--Base-White, #FFF) !important;
       font-size: 18px;
       font-style: normal;
       font-weight: 400;
@@ -57,10 +57,119 @@
       padding: 4px 12px;
       border-radius: 24px;
 
+      span {
+        color: var(--Base-White, #FFF) !important;
+      }
 
       .booking-header-right-status-icon {
         font-size: 20px;
       }
     }
   }
+}
+
+.go-payments-modal-wrap {
+  padding: 0;
+}
+
+.go-payments-modal-content {
+  margin: 0 -24px;
+
+  .go-payments-modal-content-title {
+    color: var(--Gray-900, #101828);
+    font-size: 24px;
+    font-style: normal;
+    font-weight: 600;
+    line-height: 32px;
+    padding: 0 24px;
+  }
+
+  .go-payments-modal-content-desc {
+    color: var(--Gray-900, #101828);
+    font-size: 16px;
+    font-style: normal;
+    font-weight: 500;
+    line-height: 24px;
+    padding: 0 24px;
+    margin-top: 4px;
+  }
+
+  .cancelled-modal-content-title {
+    color: var(--Gray-900, #101828);
+    font-size: 24px;
+    font-style: normal;
+    font-weight: 600;
+    line-height: 32px;
+    padding: 0 24px;
+  }
+
+  .cancelled-modal-content-desc {
+    margin-top: 4px;
+    color: #101828;
+    font-size: 16px;
+    font-style: normal;
+    font-weight: 500;
+    line-height: 24px;
+    padding: 0 24px;
+
+    &.cancelled-modal-content-desc-red {
+      color: var(--Error-600, #D92D20);
+    }
+  }
+
+  .cancelled-modal-content-list-wrap {
+    padding: 0 24px;
+
+    .cancelled-modal-content-list-title {
+      color: var(--Gray-900, #101828);
+      font-size: 16px;
+      font-style: normal;
+      font-weight: 500;
+      line-height: 24px;
+      margin-top: 4px;
+    }
+
+    .cancelled-modal-content-ul {
+      margin-top: 4px;
+
+      .cancelled-modal-content-li {
+        color: var(--Gray-900, #101828);
+        font-size: 16px;
+        font-style: normal;
+        font-weight: 500;
+        line-height: 24px;
+      }
+
+    }
+
+  }
+
+  .go-payments-footer {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    border-top: 1px solid var(--Gray-200, #EAECF0);
+    margin-top: 16px;
+    padding: 24px 24px 4px;
+    width: 100%;
+
+    .go-payments-footer-btn {
+      flex: 1;
+      font-size: 16px;
+      font-style: normal;
+      font-weight: 600;
+    }
+
+    &.go-payments-footer-column {
+      flex-direction: column;
+      gap: 12px;
+
+      .go-payments-footer-btn {
+        width: 100%;
+      }
+    }
+
+
+  }
+
 }

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

@@ -251,7 +251,9 @@ var Info = ({ onEdit }) => {
       return;
     }
     if (state.modalOpen && !state.bookingId && state.renderType !== "eventBooking" && ((_g = (_f = state.service) == null ? void 0 : _f.value) == null ? void 0 : _g.length) === 0) {
-      handleSelectService();
+      setTimeout(() => {
+        handleSelectService();
+      }, 10);
     }
   }, [state.modalOpen, state.bookingId, (_b = state.service) == null ? void 0 : _b.value]);
   const showAddButton = (0, import_react.useMemo)(() => {

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

@@ -343,7 +343,9 @@ var Info = (_, ref) => {
     setResourceLoading(false);
   };
   (0, import_react.useEffect)(() => {
-    getResourcesData();
+    setTimeout(() => {
+      getResourcesData();
+    }, 20);
   }, [state.date.value]);
   const handleEdit = (e) => {
     const item = state.service.cacheItem;

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

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

package/package.json

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