@pisell/private-materials 6.11.32 → 6.11.34

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

@@ -948,7 +948,7 @@ var Footer = function Footer(props) {
             });
             isNewOrder = !state.bookingId; // 如果有编辑内容, 则先保存
             if (!isEdit) {
-              _context7.next = 28;
+              _context7.next = 29;
               break;
             }
             if (!isDayBooking(state)) {
@@ -963,7 +963,7 @@ var Footer = function Footer(props) {
             return _context7.abrupt("return");
           case 9:
             if (!state.isBookingTicket2) {
-              _context7.next = 22;
+              _context7.next = 23;
               break;
             }
             _context7.next = 12;
@@ -992,12 +992,14 @@ var Footer = function Footer(props) {
             };
             setPaymentModalData(modalData);
             setIsPaymentModalOpen(true); // 打开 modal
+            window.isPaymentModalPluginOpen = true;
             setCheckoutLoading(false);
             setPaymentCallback(function () {
               return function (paymentResult) {
                 var _paymentResult$respon;
                 console.log('Payment result:', paymentResult);
                 setIsPaymentModalOpen(false);
+                window.isPaymentModalPluginOpen = false;
                 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') {
                   console.log('Payment completed successfully');
                   // logger.addLog({
@@ -1034,24 +1036,24 @@ var Footer = function Footer(props) {
                 }
               };
             });
-            _context7.next = 27;
+            _context7.next = 28;
             break;
-          case 22:
-            _context7.next = 24;
+          case 23:
+            _context7.next = 25;
             return handleSave({
               type: 'checkout',
               messageShow: !(isTerminal !== null && isTerminal !== void 0 && isTerminal())
             });
-          case 24:
+          case 25:
             _res = _context7.sent;
             // goCheckout2(res);
             console.log(_res);
             goCheckout((_res === null || _res === void 0 ? void 0 : _res.order_id) || state.bookingId, isNewOrder);
-          case 27:
-            return _context7.abrupt("return");
           case 28:
-            return _context7.abrupt("return", goCheckout(state.bookingId, isNewOrder));
+            return _context7.abrupt("return");
           case 29:
+            return _context7.abrupt("return", goCheckout(state.bookingId, isNewOrder));
+          case 30:
           case "end":
             return _context7.stop();
         }
@@ -2343,6 +2345,7 @@ var Footer = function Footer(props) {
     onClose: function onClose(reset) {
       console.log('🔄 Footer: Closing PaymentModal', reset);
       setIsPaymentModalOpen(false);
+      window.isPaymentModalPluginOpen = false;
       setPaymentModalData(null);
       setPaymentCallback(null);
       // if (reset) {

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

@@ -722,11 +722,13 @@ var Footer = (props) => {
         };
         setPaymentModalData(modalData);
         setIsPaymentModalOpen(true);
+        window.isPaymentModalPluginOpen = true;
         setCheckoutLoading(false);
         setPaymentCallback(() => (paymentResult) => {
           var _a3, _b3, _c3, _d2;
           console.log("Payment result:", paymentResult);
           setIsPaymentModalOpen(false);
+          window.isPaymentModalPluginOpen = false;
           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");
             setPaymentModalData(null);
@@ -1665,6 +1667,7 @@ var Footer = (props) => {
       onClose: (reset) => {
         console.log("🔄 Footer: Closing PaymentModal", reset);
         setIsPaymentModalOpen(false);
+        window.isPaymentModalPluginOpen = false;
         setPaymentModalData(null);
         setPaymentCallback(null);
         if (reset) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.32",
+  "version": "6.11.34",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -68,8 +68,8 @@
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
     "@pisell/utils": "3.0.2",
-    "@pisell/materials": "6.11.11",
     "@pisell/date-picker": "3.0.8",
+    "@pisell/materials": "6.11.11",
     "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {

package/es/components/ecocup/utils/scanListener.d.ts

@@ -1,20 +0,0 @@
-export declare type TCallback = (result: {
-    type: string;
-    value: string;
-}) => void;
-declare class ScanListener {
-    private isInitialized;
-    private listeners;
-    constructor();
-    /**
-     * 初始化外设扫码结果监听
-     */
-    initPeripheralsListener(interaction: any): void;
-    addListener(interaction: any, key: string, callback: TCallback): void;
-    removeListener(key: string): void;
-    getActiveListener(): string | null;
-    setActiveListener(key: string): void;
-    destroy(): void;
-}
-declare const scanListener: ScanListener;
-export default scanListener;

package/lib/components/ecocup/utils/scanListener.d.ts

@@ -1,20 +0,0 @@
-export declare type TCallback = (result: {
-    type: string;
-    value: string;
-}) => void;
-declare class ScanListener {
-    private isInitialized;
-    private listeners;
-    constructor();
-    /**
-     * 初始化外设扫码结果监听
-     */
-    initPeripheralsListener(interaction: any): void;
-    addListener(interaction: any, key: string, callback: TCallback): void;
-    removeListener(key: string): void;
-    getActiveListener(): string | null;
-    setActiveListener(key: string): void;
-    destroy(): void;
-}
-declare const scanListener: ScanListener;
-export default scanListener;