@pisell/private-materials 3.0.140 → 3.0.141

package/es/components/booking/info/header/index.js

@@ -21,7 +21,7 @@ import useEngineContext from "../../../../hooks/useEngineContext";
 import "./index.less";
 import classNames from 'classnames';
 var header = function header(_ref) {
-  var _context$appHelper, _state$bookingDetail2, _state$service2, _state$bookingDetail4, _state$bookingDetail5, _state$bookingDetail6, _state$bookingDetail7, _state$bookingDetail8;
+  var _context$appHelper, _state$bookingDetail2, _state$service2, _state$bookingDetail4, _state$bookingDetail5, _state$bookingDetail6;
   var state = _ref.state,
     dispatch = _ref.dispatch;
   var context = useEngineContext();
@@ -292,11 +292,22 @@ var header = function header(_ref) {
    * @Author: zhiwei.Wang
    * @Date: 2024-08-22 09:32
    */
-  var isPaymentProcessingPayments = useMemo(function () {
+  var paymentProcessingPayment = function paymentProcessingPayment(type) {
     var _state$bookingDetail3;
-    // 根据订单详情内 待确认支付列表 的长度判断
-    return !!((_state$bookingDetail3 = state.bookingDetail) !== null && _state$bookingDetail3 !== void 0 && _state$bookingDetail3.payment_processing_payment_nums);
-  }, [(_state$bookingDetail4 = state.bookingDetail) === null || _state$bookingDetail4 === void 0 ? void 0 : (_state$bookingDetail5 = _state$bookingDetail4.payment_processing_payments) === null || _state$bookingDetail5 === void 0 ? void 0 : _state$bookingDetail5.length]);
+    var payments = (state === null || state === void 0 ? void 0 : (_state$bookingDetail3 = state.bookingDetail) === null || _state$bookingDetail3 === void 0 ? void 0 : _state$bookingDetail3.payments) || [];
+    var status = ['payment_processing'];
+    var payment_method = ['BANK_DEPOSIT'];
+
+    // 是否有银行转账
+    if (type === 'bank') {
+      return !!(payments !== null && payments !== void 0 && payments.find(function (item) {
+        return status.includes(item === null || item === void 0 ? void 0 : item.status) && payment_method.includes(item === null || item === void 0 ? void 0 : item.payment_method);
+      }));
+    }
+    return !!(payments !== null && payments !== void 0 && payments.find(function (item) {
+      return status.includes(item === null || item === void 0 ? void 0 : item.status);
+    }));
+  };
 
   /**
    * @title: 取消预约
@@ -306,11 +317,16 @@ var header = function header(_ref) {
    * @Date: 2024-08-22 09:33
    */
   var handleCancel = function handleCancel() {
-    // 存在待确认的支付，则弹窗提示
-    if (isPaymentProcessingPayments) {
+    // 如果支付方式是银行转账，则打开未确认弹窗
+    if (paymentProcessingPayment('bank')) {
       return showPaymentModal();
     }
 
+    // 存在待确认的支付，则弹窗提示
+    if (paymentProcessingPayment()) {
+      return showCancelCalendarModal();
+    }
+
     // 取消
     return showCancelledModal();
   };
@@ -398,6 +414,54 @@ var header = function header(_ref) {
     });
   };
 
+  /**
+   * @title: 显示去支付的弹窗
+   * @description:
+   * @return {*}
+   * @Author: zhiwei.Wang
+   * @Date: 2024-08-22 09:33
+   */
+  var showCancelCalendarModal = function showCancelCalendarModal() {
+    setModalContentState({
+      className: 'go-payments-modal-wrap',
+      open: true,
+      width: 480,
+      onCancel: function onCancel() {
+        setModalContentState({
+          open: false
+        });
+      },
+      children: /*#__PURE__*/React.createElement("div", {
+        className: "go-payments-modal-content"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "go-payments-modal-content-title"
+      }, locales.getText('page.booking.text.cancel-booking')), /*#__PURE__*/React.createElement("div", {
+        className: "go-payments-modal-content-desc"
+      }, locales.getText('page.booking.text.cancel.calendar.msg')), /*#__PURE__*/React.createElement("div", {
+        className: "go-payments-footer"
+      }, /*#__PURE__*/React.createElement(Button, {
+        className: "go-payments-footer-btn",
+        size: "large",
+        onClick: function onClick() {
+          setModalContentState({
+            open: false
+          });
+        }
+      }, locales.getText('page.booking.text.go-back')), /*#__PURE__*/React.createElement(Button, {
+        className: "go-payments-footer-btn",
+        type: "primary",
+        size: "large",
+        onClick: function onClick() {
+          setBookingStatus('cancelled');
+          setModalContentState({
+            open: false
+          });
+        }
+      }, locales.getText('page.booking.text.cancel-booking')))),
+      footer: null
+    });
+  };
+
   /**
    * @title: 显示取消预约弹窗
    * @description:
@@ -491,11 +555,11 @@ var header = function header(_ref) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "booking-order-sales-channel"
-  }, orderSalesChannel[(_state$bookingDetail6 = state.bookingDetail) === null || _state$bookingDetail6 === void 0 ? void 0 : _state$bookingDetail6.order_sales_channel] || ''), /*#__PURE__*/React.createElement("div", {
+  }, orderSalesChannel[(_state$bookingDetail4 = state.bookingDetail) === null || _state$bookingDetail4 === void 0 ? void 0 : _state$bookingDetail4.order_sales_channel] || ''), /*#__PURE__*/React.createElement("div", {
     className: "booking-header-line-2"
   }, /*#__PURE__*/React.createElement("div", {
     className: "booking-header-left"
-  }, locales.getText('pisell2.text.status.booking_id'), ":", ' ', ((_state$bookingDetail7 = state.bookingDetail) === null || _state$bookingDetail7 === void 0 ? void 0 : (_state$bookingDetail8 = _state$bookingDetail7.bookings) === null || _state$bookingDetail8 === void 0 ? void 0 : _state$bookingDetail8.booking_id) || '-'), /*#__PURE__*/React.createElement("div", {
+  }, locales.getText('pisell2.text.status.booking_id'), ":", ' ', ((_state$bookingDetail5 = state.bookingDetail) === null || _state$bookingDetail5 === void 0 ? void 0 : (_state$bookingDetail6 = _state$bookingDetail5.bookings) === null || _state$bookingDetail6 === void 0 ? void 0 : _state$bookingDetail6.booking_id) || '-'), /*#__PURE__*/React.createElement("div", {
     className: "booking-header-right"
   }, /*#__PURE__*/React.createElement(Dropdown, {
     menu: {

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

@@ -181,6 +181,7 @@ declare const _default: {
         'page.event.booking.text.duplicate-enrollment-confirm': string;
         'page.booking.text.unconfirmed-payments': string;
         'page.booking.text.unconfirmed-payments.msg': string;
+        'page.booking.text.cancel.calendar.msg': string;
         'page.booking.text.go-to-payments': string;
         'page.booking.text.cancel-only': string;
         'page.booking.text.refund': string;
@@ -376,6 +377,7 @@ declare const _default: {
         'page.event.booking.text.duplicate-enrollment-confirm': string;
         'page.booking.text.unconfirmed-payments': string;
         'page.booking.text.unconfirmed-payments.msg': string;
+        'page.booking.text.cancel.calendar.msg': string;
         'page.booking.text.go-to-payments': string;
         'page.booking.text.cancel-only': string;
         'page.booking.text.refund': string;
@@ -571,6 +573,7 @@ declare const _default: {
         'page.event.booking.text.duplicate-enrollment-confirm': string;
         'page.booking.text.unconfirmed-payments': string;
         'page.booking.text.unconfirmed-payments.msg': string;
+        'page.booking.text.cancel.calendar.msg': string;
         'page.booking.text.go-to-payments': string;
         'page.booking.text.cancel-only': string;
         'page.booking.text.refund': string;

package/es/components/booking/locales.js

@@ -208,6 +208,7 @@ export default {
     'page.event.booking.text.duplicate-enrollment-confirm': 'Confirm',
     'page.booking.text.unconfirmed-payments': 'Unconfirmed payments',
     'page.booking.text.unconfirmed-payments.msg': 'There are unconfirmed payments,  please confirm or void the payments first.',
+    'page.booking.text.cancel.calendar.msg': 'Are you sure you want to cancel the appointment? This appointment will be removed from the calendar.',
     'page.booking.text.go-to-payments': 'Go to payments',
     'page.booking.text.cancel-only': 'Cancel only',
     'page.booking.text.refund': 'Refund',
@@ -436,6 +437,7 @@ export default {
     'page.event.booking.text.duplicate-enrollment-confirm': '确认',
     'page.booking.text.unconfirmed-payments': '未确认的付款',
     'page.booking.text.unconfirmed-payments.msg': '存在未确认的付款，请先确认收款或作废。',
+    'page.booking.text.cancel.calendar.msg': '确定要取消预约吗？此预约将从日历中移除。',
     'page.booking.text.go-to-payments': '前往收款界面',
     'page.booking.text.cancel-only': '仅取消',
     'page.booking.text.refund': '退款',
@@ -664,6 +666,7 @@ export default {
     'page.event.booking.text.duplicate-enrollment-confirm': '確認',
     'page.booking.text.unconfirmed-payments': '未確認的付款',
     'page.booking.text.unconfirmed-payments.msg': '存在未確認的付款，請先確認收款或作廢。',
+    'page.booking.text.cancel.calendar.msg': '確定要取消預約嗎？此預約將從日曆中移除。',
     'page.booking.text.go-to-payments': '前往收款界面',
     'page.booking.text.cancel-only': '僅取消',
     'page.booking.text.refund': '退款',

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

@@ -40,7 +40,7 @@ var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContex
 var import_index = require("./index.less");
 var import_classnames = __toESM(require("classnames"));
 var header = ({ state, dispatch }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f;
   const context = (0, import_useEngineContext.default)();
   const [modalContent, setModalContent] = (0, import_react.useState)({
     open: false,
@@ -169,14 +169,25 @@ var header = ({ state, dispatch }) => {
       )
     );
   }, [(_c = state.service) == null ? void 0 : _c.value]);
-  const isPaymentProcessingPayments = (0, import_react.useMemo)(() => {
+  const paymentProcessingPayment = (type) => {
     var _a2;
-    return !!((_a2 = state.bookingDetail) == null ? void 0 : _a2.payment_processing_payment_nums);
-  }, [(_e = (_d = state.bookingDetail) == null ? void 0 : _d.payment_processing_payments) == null ? void 0 : _e.length]);
+    const payments = ((_a2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _a2.payments) || [];
+    const status = ["payment_processing"];
+    const payment_method = ["BANK_DEPOSIT"];
+    if (type === "bank") {
+      return !!(payments == null ? void 0 : payments.find(
+        (item) => status.includes(item == null ? void 0 : item.status) && payment_method.includes(item == null ? void 0 : item.payment_method)
+      ));
+    }
+    return !!(payments == null ? void 0 : payments.find((item) => status.includes(item == null ? void 0 : item.status)));
+  };
   const handleCancel = () => {
-    if (isPaymentProcessingPayments) {
+    if (paymentProcessingPayment("bank")) {
       return showPaymentModal();
     }
+    if (paymentProcessingPayment()) {
+      return showCancelCalendarModal();
+    }
     return showCancelledModal();
   };
   const handleRefund = () => {
@@ -235,6 +246,40 @@ var header = ({ state, dispatch }) => {
       footer: null
     });
   };
+  const showCancelCalendarModal = () => {
+    setModalContentState({
+      className: "go-payments-modal-wrap",
+      open: true,
+      width: 480,
+      onCancel: () => {
+        setModalContentState({ open: false });
+      },
+      children: /* @__PURE__ */ import_react.default.createElement("div", { className: "go-payments-modal-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "go-payments-modal-content-title" }, import_utils.locales.getText("page.booking.text.cancel-booking")), /* @__PURE__ */ import_react.default.createElement("div", { className: "go-payments-modal-content-desc" }, import_utils.locales.getText("page.booking.text.cancel.calendar.msg")), /* @__PURE__ */ import_react.default.createElement("div", { className: "go-payments-footer" }, /* @__PURE__ */ import_react.default.createElement(
+        import_antd.Button,
+        {
+          className: "go-payments-footer-btn",
+          size: "large",
+          onClick: () => {
+            setModalContentState({ open: false });
+          }
+        },
+        import_utils.locales.getText("page.booking.text.go-back")
+      ), /* @__PURE__ */ import_react.default.createElement(
+        import_antd.Button,
+        {
+          className: "go-payments-footer-btn",
+          type: "primary",
+          size: "large",
+          onClick: () => {
+            setBookingStatus("cancelled");
+            setModalContentState({ open: false });
+          }
+        },
+        import_utils.locales.getText("page.booking.text.cancel-booking")
+      ))),
+      footer: null
+    });
+  };
   const showCancelledModal = () => {
     const cancelBtn = /* @__PURE__ */ import_react.default.createElement(
       import_antd.Button,
@@ -316,8 +361,8 @@ var header = ({ state, dispatch }) => {
       className: "booking-header",
       style: { backgroundColor: currentStatus.color }
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-order-sales-channel" }, orderSalesChannel[(_f = state.bookingDetail) == null ? void 0 : _f.order_sales_channel] || ""),
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-header-line-2" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-header-left" }, import_utils.locales.getText("pisell2.text.status.booking_id"), ":", " ", ((_h = (_g = state.bookingDetail) == null ? void 0 : _g.bookings) == null ? void 0 : _h.booking_id) || "-"), /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-header-right" }, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-order-sales-channel" }, orderSalesChannel[(_d = state.bookingDetail) == null ? void 0 : _d.order_sales_channel] || ""),
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-header-line-2" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-header-left" }, import_utils.locales.getText("pisell2.text.status.booking_id"), ":", " ", ((_f = (_e = state.bookingDetail) == null ? void 0 : _e.bookings) == null ? void 0 : _f.booking_id) || "-"), /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-header-right" }, /* @__PURE__ */ import_react.default.createElement(
       import_antd.Dropdown,
       {
         menu: { items, onClick: onSelect },

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

@@ -181,6 +181,7 @@ declare const _default: {
         'page.event.booking.text.duplicate-enrollment-confirm': string;
         'page.booking.text.unconfirmed-payments': string;
         'page.booking.text.unconfirmed-payments.msg': string;
+        'page.booking.text.cancel.calendar.msg': string;
         'page.booking.text.go-to-payments': string;
         'page.booking.text.cancel-only': string;
         'page.booking.text.refund': string;
@@ -376,6 +377,7 @@ declare const _default: {
         'page.event.booking.text.duplicate-enrollment-confirm': string;
         'page.booking.text.unconfirmed-payments': string;
         'page.booking.text.unconfirmed-payments.msg': string;
+        'page.booking.text.cancel.calendar.msg': string;
         'page.booking.text.go-to-payments': string;
         'page.booking.text.cancel-only': string;
         'page.booking.text.refund': string;
@@ -571,6 +573,7 @@ declare const _default: {
         'page.event.booking.text.duplicate-enrollment-confirm': string;
         'page.booking.text.unconfirmed-payments': string;
         'page.booking.text.unconfirmed-payments.msg': string;
+        'page.booking.text.cancel.calendar.msg': string;
         'page.booking.text.go-to-payments': string;
         'page.booking.text.cancel-only': string;
         'page.booking.text.refund': string;

package/lib/components/booking/locales.js

@@ -237,6 +237,7 @@ var locales_default = {
     "page.event.booking.text.duplicate-enrollment-confirm": "Confirm",
     "page.booking.text.unconfirmed-payments": "Unconfirmed payments",
     "page.booking.text.unconfirmed-payments.msg": "There are unconfirmed payments,  please confirm or void the payments first.",
+    "page.booking.text.cancel.calendar.msg": "Are you sure you want to cancel the appointment? This appointment will be removed from the calendar.",
     "page.booking.text.go-to-payments": "Go to payments",
     "page.booking.text.cancel-only": "Cancel only",
     "page.booking.text.refund": "Refund",
@@ -458,6 +459,7 @@ var locales_default = {
     "page.event.booking.text.duplicate-enrollment-confirm": "确认",
     "page.booking.text.unconfirmed-payments": "未确认的付款",
     "page.booking.text.unconfirmed-payments.msg": "存在未确认的付款，请先确认收款或作废。",
+    "page.booking.text.cancel.calendar.msg": "确定要取消预约吗？此预约将从日历中移除。",
     "page.booking.text.go-to-payments": "前往收款界面",
     "page.booking.text.cancel-only": "仅取消",
     "page.booking.text.refund": "退款",
@@ -679,6 +681,7 @@ var locales_default = {
     "page.event.booking.text.duplicate-enrollment-confirm": "確認",
     "page.booking.text.unconfirmed-payments": "未確認的付款",
     "page.booking.text.unconfirmed-payments.msg": "存在未確認的付款，請先確認收款或作廢。",
+    "page.booking.text.cancel.calendar.msg": "確定要取消預約嗎？此預約將從日曆中移除。",
     "page.booking.text.go-to-payments": "前往收款界面",
     "page.booking.text.cancel-only": "僅取消",
     "page.booking.text.refund": "退款",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.140",
+  "version": "3.0.141",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -60,8 +60,8 @@
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
     "@pisell/utils": "1.0.42",
-    "@pisell/icon": "0.0.11",
     "@pisell/materials": "3.0.47",
+    "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "1.0.100"
   },
   "peerDependencies": {