@pisell/private-materials 6.8.22 → 6.8.24

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();
@@ -1785,7 +1786,7 @@ var Footer = function Footer(props) {
     clearAllScanListenersTaskQueue = _useScanManager2.clearAllScanListenersTaskQueue;
   // 清空所有内容并重置购物车
   var handleClearAllAndReset = function handleClearAllAndReset() {
-    var _shopDiscount$clear;
+    var _shopDiscount$clear, _window9;
     clearAllScanListenersTaskQueue();
 
     // 清空附加服务
@@ -1837,17 +1838,14 @@ var Footer = function Footer(props) {
     // 清空商品券
     shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$clear = shopDiscount.clear) === null || _shopDiscount$clear === void 0 || _shopDiscount$clear.call(shopDiscount);
     setEditOrderId(0);
-    setTimeout(function () {
-      var _window9;
-      (_window9 = window) === null || _window9 === void 0 || (_window9 = _window9.shopApi) === null || _window9 === void 0 || (_window9 = _window9.bookingTicket) === null || _window9 === void 0 || _window9.clearAllCart();
-      // 清空服务项目
-      dispatch({
-        type: 'setService',
-        payload: {
-          value: []
-        }
-      });
-    }, 0);
+    (_window9 = window) === null || _window9 === void 0 || (_window9 = _window9.shopApi) === null || _window9 === void 0 || (_window9 = _window9.bookingTicket) === null || _window9 === void 0 || _window9.clearAllCart();
+    // 清空服务项目
+    dispatch({
+      type: 'setService',
+      payload: {
+        value: []
+      }
+    });
   };
 
   // 购物车进入编辑状态
@@ -2007,9 +2005,7 @@ var Footer = function Footer(props) {
       //   handleClearAllAndReset();
       // }
       if (reset) {
-        setTimeout(function () {
-          handleClearAllAndReset();
-        }, 0);
+        handleClearAllAndReset();
       }
       // setPaymentModalData(null);
       // setPaymentCallback(null);

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 {
@@ -1287,7 +1287,7 @@ var Footer = (props) => {
   const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
   const { clearAllScanListenersTaskQueue } = (0, import_useScanManager.default)();
   const handleClearAllAndReset = () => {
-    var _a2;
+    var _a2, _b2, _c2;
     clearAllScanListenersTaskQueue();
     dispatch({
       type: "setAddons",
@@ -1321,16 +1321,13 @@ var Footer = (props) => {
     });
     (_a2 = shopDiscount == null ? void 0 : shopDiscount.clear) == null ? void 0 : _a2.call(shopDiscount);
     setEditOrderId(0);
-    setTimeout(() => {
-      var _a3, _b2;
-      (_b2 = (_a3 = window == null ? void 0 : window.shopApi) == null ? void 0 : _a3.bookingTicket) == null ? void 0 : _b2.clearAllCart();
-      dispatch({
-        type: "setService",
-        payload: {
-          value: []
-        }
-      });
-    }, 0);
+    (_c2 = (_b2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _b2.bookingTicket) == null ? void 0 : _c2.clearAllCart();
+    dispatch({
+      type: "setService",
+      payload: {
+        value: []
+      }
+    });
   };
   const setEditCartMode = (order_id2, payData, closeModal = false) => {
     setEditOrderId(order_id2);
@@ -1473,9 +1470,7 @@ var Footer = (props) => {
           }
         });
         if (reset) {
-          setTimeout(() => {
-            handleClearAllAndReset();
-          }, 0);
+          handleClearAllAndReset();
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.8.22",
+  "version": "6.8.24",
   "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/date-picker": "3.0.7",
-    "@pisell/utils": "3.0.2",
     "@pisell/icon": "0.0.11",
-    "@pisell/materials": "6.8.6"
+    "@pisell/materials": "6.8.6",
+    "@pisell/utils": "3.0.2"
   },
   "peerDependencies": {
     "react": "^18.0.0",