@pisell/private-materials 6.8.23 → 6.8.25

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

@@ -680,9 +680,10 @@ var Footer = function Footer(props) {
             setCheckoutLoading(false);
             setPaymentCallback(function () {
               return function (paymentResult) {
+                var _paymentResult$respon;
                 console.log('Payment result:', paymentResult);
                 setIsPaymentModalOpen(false);
-                if ((paymentResult === null || paymentResult === void 0 ? void 0 : paymentResult.status) === 'success') {
+                if ((paymentResult === null || paymentResult === void 0 ? void 0 : paymentResult.status) === 'success' || (paymentResult === null || paymentResult === void 0 || (_paymentResult$respon = paymentResult.response) === null || _paymentResult$respon === void 0 || (_paymentResult$respon = _paymentResult$respon.data) === null || _paymentResult$respon === void 0 ? void 0 : _paymentResult$respon.payment_status) === 'paid') {
                   var _window5;
                   console.log('Payment completed successfully');
                   (_window5 = window) === null || _window5 === void 0 || (_window5 = _window5.shopApi) === null || _window5 === void 0 || (_window5 = _window5.bookingTicket) === null || _window5 === void 0 || _window5.clearAllCart();

package/es/components/checkout/PaymentModal.js

@@ -2219,17 +2219,6 @@ var PaymentModal = function PaymentModal(_ref18) {
                           autoCloseConfig.maskClosable = false;
                         }
 
-                        // 根据支付状态展示不同的 toast
-                        _context22.next = 32;
-                        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 32:
                         // 当支付状态为 paid 时，关闭 paymentModal
                         if (paymentStatus === 'paid') {
                           handleModalClose();
@@ -2245,6 +2234,17 @@ 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

@@ -500,18 +500,18 @@ var Footer = (props) => {
         setIsPaymentModalOpen(true);
         setCheckoutLoading(false);
         setPaymentCallback(() => (paymentResult) => {
-          var _a3, _b3, _c3, _d2, _e2, _f2;
+          var _a3, _b3, _c3, _d2, _e2, _f2, _g2, _h2;
           console.log("Payment result:", paymentResult);
           setIsPaymentModalOpen(false);
-          if ((paymentResult == null ? void 0 : paymentResult.status) === "success") {
+          if ((paymentResult == null ? void 0 : paymentResult.status) === "success" || ((_b3 = (_a3 = paymentResult == null ? void 0 : paymentResult.response) == null ? void 0 : _a3.data) == null ? void 0 : _b3.payment_status) === "paid") {
             console.log("Payment completed successfully");
-            (_b3 = (_a3 = window == null ? void 0 : window.shopApi) == null ? void 0 : _a3.bookingTicket) == null ? void 0 : _b3.clearAllCart();
+            (_d2 = (_c3 = window == null ? void 0 : window.shopApi) == null ? void 0 : _c3.bookingTicket) == null ? void 0 : _d2.clearAllCart();
             setPaymentModalData(null);
             setPaymentCallback(null);
           } else if ((paymentResult == null ? void 0 : paymentResult.status) === "cancelled") {
             console.log("Payment cancelled");
             if (res == null ? void 0 : res.order_id) {
-              (_d2 = (_c3 = window == null ? void 0 : window.shopApi) == null ? void 0 : _c3.booking) == null ? void 0 : _d2.voidBooking(res.order_id);
+              (_f2 = (_e2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _e2.booking) == null ? void 0 : _f2.voidBooking(res.order_id);
             }
             setPaymentModalData(null);
             setPaymentCallback(null);
@@ -519,7 +519,7 @@ var Footer = (props) => {
             console.log("Payment status:", paymentResult == null ? void 0 : paymentResult.status);
             setPaymentModalData(null);
             setPaymentCallback(null);
-            (_f2 = (_e2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _e2.bookingTicket) == null ? void 0 : _f2.clearAllCart();
+            (_h2 = (_g2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _g2.bookingTicket) == null ? void 0 : _h2.clearAllCart();
           }
         });
       } else {

package/lib/components/checkout/PaymentModal.js

@@ -1566,17 +1566,6 @@ var PaymentModal = ({
                   autoCloseConfig.autoCloseDelay = 0;
                   autoCloseConfig.maskClosable = false;
                 }
-                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
-                );
                 if (paymentStatus === "paid") {
                   handleModalClose();
                 }
@@ -1590,6 +1579,17 @@ 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.23",
+  "version": "6.8.25",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",