@pisell/private-materials 3.0.65 → 3.0.67

package/es/components/booking/components/footer/index.js

@@ -408,6 +408,16 @@ var Footer = function Footer(props) {
    * @Date: 2024-01-30 16:57
    */
   var handleRefund = function handleRefund() {
+    if (isTerminal !== null && isTerminal !== void 0 && isTerminal()) {
+      var _interaction$utils2, _interaction$utils2$p;
+      return interaction === null || interaction === void 0 ? void 0 : (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 ? void 0 : (_interaction$utils2$p = _interaction$utils2.postMessageToApp) === null || _interaction$utils2$p === void 0 ? void 0 : _interaction$utils2$p.call(_interaction$utils2, {
+        module: "booking",
+        key: "booking_refund",
+        data: {
+          order_id: state.bookingId
+        }
+      });
+    }
     state.action({
       type: "pisell1.handleRefund",
       data: {
@@ -466,9 +476,9 @@ var Footer = function Footer(props) {
               id: res === null || res === void 0 ? void 0 : res.customer_id
             } : state.bookingDetail.customer;
           case 8:
-            if (e.key === 'sendMail') {
+            if (e.key === "sendMail") {
               state.action({
-                type: 'pisell1.sendPayLinkEmail',
+                type: "pisell1.sendPayLinkEmail",
                 data: {
                   id: id,
                   is_deposit: state.bookingDetail.is_deposit || Number((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.deposit_amount),
@@ -479,9 +489,9 @@ var Footer = function Footer(props) {
                 callback: function callback() {}
               });
             }
-            if (e.key === 'copy') {
+            if (e.key === "copy") {
               state.action({
-                type: 'pisell1.genClientPayLink',
+                type: "pisell1.genClientPayLink",
                 data: {
                   id: id
                 },
@@ -500,11 +510,11 @@ var Footer = function Footer(props) {
   }();
   var paymentLinkButton = useMemo(function () {
     var items = [{
-      label: locales.getText('pisell2.text.send-mail'),
-      key: 'sendMail'
+      label: locales.getText("pisell2.text.send-mail"),
+      key: "sendMail"
     }, {
-      label: locales.getText('pisell2.text.copy-to-clipboard'),
-      key: 'copy'
+      label: locales.getText("pisell2.text.copy-to-clipboard"),
+      key: "copy"
     }];
     return /*#__PURE__*/React.createElement(Dropdown, {
       menu: {
@@ -513,7 +523,7 @@ var Footer = function Footer(props) {
       }
     }, /*#__PURE__*/React.createElement(Button, {
       className: "pisell-lowcode__booking-footer-buttons-item"
-    }, /*#__PURE__*/React.createElement(Space, null, locales.getText('pisell2.text.payment-link'), /*#__PURE__*/React.createElement(DownOutlined, null))));
+    }, /*#__PURE__*/React.createElement(Space, null, locales.getText("pisell2.text.payment-link"), /*#__PURE__*/React.createElement(DownOutlined, null))));
   }, [handleMenuClick]);
 
   /**
@@ -667,7 +677,7 @@ var Footer = function Footer(props) {
   var isOnlyDeposit = useMemo(function () {
     var _state$bookingDetail6, _state$bookingDetail7, _state$bookingDetail8, _state$bookingDetail9;
     if (state !== null && state !== void 0 && (_state$bookingDetail6 = state.bookingDetail) !== null && _state$bookingDetail6 !== void 0 && _state$bookingDetail6.deposit_payment_time && state !== null && state !== void 0 && (_state$bookingDetail7 = state.bookingDetail) !== null && _state$bookingDetail7 !== void 0 && (_state$bookingDetail8 = _state$bookingDetail7.payment_types) !== null && _state$bookingDetail8 !== void 0 && (_state$bookingDetail9 = _state$bookingDetail8.every) !== null && _state$bookingDetail9 !== void 0 && _state$bookingDetail9.call(_state$bookingDetail8, function (item) {
-      return item === 'deposit';
+      return item === "deposit";
     })) {
       return true;
     }

package/es/components/booking/info/service/addService/utils.js

@@ -181,8 +181,8 @@ export var checkCacheItemResource = function checkCacheItemResource(_ref5) {
     }
   } else {
     if (cacheItem.new) {
-      if (resources.length === 2) {
-        resourceId = resources[1].form_record_id;
+      if (resources.length <= 2) {
+        resourceId = resources[resources.length - 1].form_record_id;
       }
       if (resources.length > 2) {
         var usableList = resources.filter(function (d) {

package/lib/components/booking/components/footer/index.js

@@ -161,7 +161,10 @@ var Footer = (props) => {
       console.log("state.bookingId && state.addons.edit", err);
     }
   };
-  const handleSave = async ({ type, messageShow = true }) => {
+  const handleSave = async ({
+    type,
+    messageShow = true
+  }) => {
     var _a2;
     let _setLoading = type === "checkout" ? setCheckoutLoading : setLoading;
     _setLoading(true);
@@ -212,6 +215,16 @@ var Footer = (props) => {
     state == null ? void 0 : state.callback({ order_id: state.bookingId });
   };
   const handleRefund = () => {
+    var _a2, _b2;
+    if (isTerminal == null ? void 0 : isTerminal()) {
+      return (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.postMessageToApp) == null ? void 0 : _b2.call(_a2, {
+        module: "booking",
+        key: "booking_refund",
+        data: {
+          order_id: state.bookingId
+        }
+      });
+    }
     state.action({
       type: "pisell1.handleRefund",
       data: {
@@ -276,19 +289,7 @@ var Footer = (props) => {
       { label: import_utils.locales.getText("pisell2.text.send-mail"), key: "sendMail" },
       { label: import_utils.locales.getText("pisell2.text.copy-to-clipboard"), key: "copy" }
     ];
-    return /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Dropdown,
-      {
-        menu: { items, onClick: handleMenuClick }
-      },
-      /* @__PURE__ */ import_react.default.createElement(
-        import_antd2.Button,
-        {
-          className: "pisell-lowcode__booking-footer-buttons-item"
-        },
-        /* @__PURE__ */ import_react.default.createElement(import_antd.Space, null, import_utils.locales.getText("pisell2.text.payment-link"), /* @__PURE__ */ import_react.default.createElement(import_icons.DownOutlined, null))
-      )
-    );
+    return /* @__PURE__ */ import_react.default.createElement(import_antd.Dropdown, { menu: { items, onClick: handleMenuClick } }, /* @__PURE__ */ import_react.default.createElement(import_antd2.Button, { className: "pisell-lowcode__booking-footer-buttons-item" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Space, null, import_utils.locales.getText("pisell2.text.payment-link"), /* @__PURE__ */ import_react.default.createElement(import_icons.DownOutlined, null))));
   }, [handleMenuClick]);
   const saveButton = (0, import_react.useMemo)(() => {
     return /* @__PURE__ */ import_react.default.createElement(
@@ -410,7 +411,10 @@ var Footer = (props) => {
   ]);
   const isOnlyDeposit = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2;
-    if (((_a2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _a2.deposit_payment_time) && ((_d2 = (_c2 = (_b2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _b2.payment_types) == null ? void 0 : _c2.every) == null ? void 0 : _d2.call(_c2, (item) => item === "deposit"))) {
+    if (((_a2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _a2.deposit_payment_time) && ((_d2 = (_c2 = (_b2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _b2.payment_types) == null ? void 0 : _c2.every) == null ? void 0 : _d2.call(
+      _c2,
+      (item) => item === "deposit"
+    ))) {
       return true;
     }
     return false;
@@ -419,9 +423,7 @@ var Footer = (props) => {
     var _a2;
     let str = "";
     if (isOnlyDeposit) {
-      return `${import_utils.locales.getText(
-        "pisell2.text.deposit-paid"
-      )} ${(0, import_utils.formatAmount)(
+      return `${import_utils.locales.getText("pisell2.text.deposit-paid")} ${(0, import_utils.formatAmount)(
         (_a2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _a2.deposit_amount,
         2,
         (state == null ? void 0 : state.amountSymbol) || "$"

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

@@ -163,8 +163,8 @@ var checkCacheItemResource = ({ cacheItem, resources }) => {
     }
   } else {
     if (cacheItem.new) {
-      if (resources.length === 2) {
-        resourceId = resources[1].form_record_id;
+      if (resources.length <= 2) {
+        resourceId = resources[resources.length - 1].form_record_id;
       }
       if (resources.length > 2) {
         const usableList = resources.filter(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.65",
+  "version": "3.0.67",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -58,8 +58,8 @@
     "ahooks": "^3.7.6",
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
-    "@pisell/icon": "0.0.8",
     "@pisell/utils": "1.0.24",
+    "@pisell/icon": "0.0.8",
     "@pisell/date-picker": "1.0.69"
   },
   "peerDependencies": {