@pisell/private-materials 6.8.25 → 6.8.26

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

@@ -1787,8 +1787,7 @@ var Footer = function Footer(props) {
   // 清空所有内容并重置购物车
   var handleClearAllAndReset = function handleClearAllAndReset() {
     var _shopDiscount$clear, _window9;
-    clearAllScanListenersTaskQueue();
-
+    debugger;
     // 清空附加服务
     dispatch({
       type: 'setAddons',
@@ -1846,6 +1845,7 @@ var Footer = function Footer(props) {
         value: []
       }
     });
+    clearAllScanListenersTaskQueue();
   };
 
   // 购物车进入编辑状态
@@ -1993,7 +1993,12 @@ var Footer = function Footer(props) {
       setIsPaymentModalOpen(false);
       setPaymentModalData(null);
       setPaymentCallback(null);
-      // 清除编辑模式
+      // if (reset) {
+      //   handleClearAllAndReset();
+      // }
+      if (reset) {
+        handleClearAllAndReset();
+      } // 清除编辑模式
       setEditOrderId(0);
       dispatch({
         type: 'setPaymentPaid',
@@ -2001,12 +2006,6 @@ var Footer = function Footer(props) {
           value: {}
         }
       });
-      // if (reset) {
-      //   handleClearAllAndReset();
-      // }
-      if (reset) {
-        handleClearAllAndReset();
-      }
       // setPaymentModalData(null);
       // setPaymentCallback(null);
       // if (reset) {

package/es/components/checkout/PaymentModal.js

@@ -2219,6 +2219,17 @@ var PaymentModal = function PaymentModal(_ref18) {
                           autoCloseConfig.maskClosable = false;
                         }
 
+                        // 根据支付状态展示不同的 toast
+                        displayPaymentResultToast({
+                          paymentStatus: paymentStatus,
+                          orderTotalAmount: _orderInfo3.isDeposit ? _orderInfo3.depositAmount : orderTotalAmount,
+                          gapAmount: paymentStatus === 'partially_paid' ? gapAmount : currentChangeGivenAmount,
+                          failureReason: failureReason,
+                          autoCloseConfig: autoCloseConfig,
+                          actionButtons: generateActionButtons(paymentStatus, enabledAutoPrint)
+                        }, paymentResultToastConfig);
+                        console.log('paymentStatus>>>>', paymentStatus);
+
                         // 当支付状态为 paid 时，关闭 paymentModal
                         if (paymentStatus === 'paid') {
                           handleModalClose();
@@ -2234,17 +2245,6 @@ var PaymentModal = function PaymentModal(_ref18) {
                           }
                         });
                         handlePaymentComplete(paymentResult);
-                        // 根据支付状态展示不同的 toast
-                        _context22.next = 35;
-                        return displayPaymentResultToast({
-                          paymentStatus: paymentStatus,
-                          orderTotalAmount: _orderInfo3.isDeposit ? _orderInfo3.depositAmount : orderTotalAmount,
-                          gapAmount: paymentStatus === 'partially_paid' ? gapAmount : currentChangeGivenAmount,
-                          failureReason: failureReason,
-                          autoCloseConfig: autoCloseConfig,
-                          actionButtons: generateActionButtons(paymentStatus, enabledAutoPrint)
-                        }, paymentResultToastConfig);
-                      case 35:
                         _context22.next = 38;
                         break;
                       case 37:

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

@@ -1288,7 +1288,7 @@ var Footer = (props) => {
   const { clearAllScanListenersTaskQueue } = (0, import_useScanManager.default)();
   const handleClearAllAndReset = () => {
     var _a2, _b2, _c2;
-    clearAllScanListenersTaskQueue();
+    debugger;
     dispatch({
       type: "setAddons",
       payload: {
@@ -1328,6 +1328,7 @@ var Footer = (props) => {
         value: []
       }
     });
+    clearAllScanListenersTaskQueue();
   };
   const setEditCartMode = (order_id2, payData, closeModal = false) => {
     setEditOrderId(order_id2);
@@ -1462,6 +1463,9 @@ var Footer = (props) => {
         setIsPaymentModalOpen(false);
         setPaymentModalData(null);
         setPaymentCallback(null);
+        if (reset) {
+          handleClearAllAndReset();
+        }
         setEditOrderId(0);
         dispatch({
           type: "setPaymentPaid",
@@ -1469,9 +1473,6 @@ var Footer = (props) => {
             value: {}
           }
         });
-        if (reset) {
-          handleClearAllAndReset();
-        }
       }
     }
   ), /* @__PURE__ */ import_react.default.createElement(import_confirmHolderModal.ConfirmHolderModal, null));

package/lib/components/checkout/PaymentModal.js

@@ -1566,6 +1566,18 @@ var PaymentModal = ({
                   autoCloseConfig.autoCloseDelay = 0;
                   autoCloseConfig.maskClosable = false;
                 }
+                (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
+                  {
+                    paymentStatus,
+                    orderTotalAmount: orderInfo3.isDeposit ? orderInfo3.depositAmount : orderTotalAmount,
+                    gapAmount: paymentStatus === "partially_paid" ? gapAmount : currentChangeGivenAmount,
+                    failureReason,
+                    autoCloseConfig,
+                    actionButtons: generateActionButtons(paymentStatus, enabledAutoPrint)
+                  },
+                  paymentResultToastConfig
+                );
+                console.log("paymentStatus>>>>", paymentStatus);
                 if (paymentStatus === "paid") {
                   handleModalClose();
                 }
@@ -1579,17 +1591,6 @@ var PaymentModal = ({
                   }
                 };
                 handlePaymentComplete(paymentResult);
-                await (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
-                  {
-                    paymentStatus,
-                    orderTotalAmount: orderInfo3.isDeposit ? orderInfo3.depositAmount : orderTotalAmount,
-                    gapAmount: paymentStatus === "partially_paid" ? gapAmount : currentChangeGivenAmount,
-                    failureReason,
-                    autoCloseConfig,
-                    actionButtons: generateActionButtons(paymentStatus, enabledAutoPrint)
-                  },
-                  paymentResultToastConfig
-                );
               } else {
                 handlePaymentComplete(data2);
               }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.8.25",
+  "version": "6.8.26",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -77,9 +77,9 @@
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
     "@pisell/icon": "0.0.11",
-    "@pisell/utils": "3.0.2",
     "@pisell/date-picker": "3.0.7",
-    "@pisell/materials": "6.8.6"
+    "@pisell/materials": "6.8.6",
+    "@pisell/utils": "3.0.2"
   },
   "peerDependencies": {
     "react": "^18.0.0",