@pisell/private-materials 6.4.18 → 6.4.19

package/es/components/booking/components/tabPane/index.less

@@ -1,5 +1,5 @@
 .pisell-lowcode__booking-tab-pane-wrap {
-  height: 100vh;
+  height: 100%;
   // padding: 0 32px;
   width: 100%;
   position: relative;

package/es/components/booking/utils.d.ts

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/es/components/checkout/PaymentModal.js

@@ -1603,7 +1603,7 @@ var PaymentModal = function PaymentModal(_ref17) {
               // 获取 checkout 模块并处理订单数据
               checkout = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
               if (!(checkout && data && !isLocalOrderCreated.current)) {
-                _context17.next = 20;
+                _context17.next = 19;
                 break;
               }
               isLocalOrderCreated.current = true;
@@ -1651,130 +1651,27 @@ var PaymentModal = function PaymentModal(_ref17) {
                 unsubscribeRef.current();
                 unsubscribeRef.current = undefined;
               }
-              // 监听订单同步完成，同步完成后显示订单完成 toast，关闭当前弹窗
-              unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', function (data) {
-                var _data$response, _responseData$payment2;
-                // 获取支付状态和相关信息
-                var responseData = (_data$response = data.response) === null || _data$response === void 0 ? void 0 : _data$response.data;
-                // 获取支付状态
-                var paymentStatus = responseData === null || responseData === void 0 ? void 0 : responseData.payment_status;
-                if (data.isManual) return;
-                handlePaymentComplete(data);
-                // 如果正在显示现金支付 toast，跳过自动关闭逻辑
-                if (showingCashToastRef.current) {
-                  return;
-                }
-
-                // 获取订单总金额
-                var orderTotalAmount = Number((responseData === null || responseData === void 0 ? void 0 : responseData.total_amount) || 0);
-                var gapAmount = Number((responseData === null || responseData === void 0 ? void 0 : responseData.amount_gap) || 0);
-                var currentChangeGivenAmount = Number((responseData === null || responseData === void 0 || (_responseData$payment2 = responseData.payment_info) === null || _responseData$payment2 === void 0 ? void 0 : _responseData$payment2.current_change_given_amount) || 0);
-                // const changeDue = Number(responseData?.amount_gap || 0);
-                // 获取失败原因
-                var failureReason = responseData === null || responseData === void 0 ? void 0 : responseData.failure_reason;
-
-                // 根据支付状态弹出对应的支付结果toast
-                if (paymentStatus) {
-                  // 打印订单完整信息
-                  console.log('print_order_onOrderSynced>>>>', responseData);
-                  logger === null || logger === void 0 || logger.addLog({
-                    type: 'info',
-                    title: 'print_order_onOrderSynced',
-                    metadata: {
-                      responseData: responseData
-                    }
-                  });
-                  try {
-                    var _responseData$payment3;
-                    var params = {
-                      type: '99',
-                      // 打印订单全部信息
-                      data: {
-                        order_id: responseData.order_id,
-                        machine_code_print_info: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info,
-                        small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment3 = responseData.payment_info) === null || _responseData$payment3 === void 0 ? void 0 : _responseData$payment3.small_ticket_data
-                      }
-                    };
-                    console.log('print_order_onOrderSynced_params>>>>', params);
-                    logger === null || logger === void 0 || logger.addLog({
-                      type: 'info',
-                      title: 'print_order_onOrderSynced_params',
-                      metadata: {
-                        params: params
-                      }
-                    });
-                    webPrint(params, function (res) {
-                      console.log('print_order_onOrderSynced_res>>>>', res);
-                      logger === null || logger === void 0 || logger.addLog({
-                        type: 'info',
-                        title: 'print_order_onOrderSynced_res',
-                        metadata: {
-                          res: res
-                        }
-                      });
-                    });
-                  } catch (error) {
-                    console.error('print_order_onOrderSynced_error>>>>', error);
-                    logger === null || logger === void 0 || logger.addLog({
-                      type: 'info',
-                      title: 'print_order_onOrderSynced_error',
-                      metadata: {
-                        error: error
-                      }
-                    });
-                  }
-
-                  // 确定支付状态
-                  var statusClassName = calculateStatusClassName(paymentStatus);
-                  var autoCloseConfig = calculateAutoCloseConfig(paymentStatus, !!currentChangeGivenAmount);
-
-                  // 根据支付状态展示不同的 toast
-                  displayPaymentResultToast({
-                    paymentStatus: paymentStatus,
-                    orderTotalAmount: orderTotalAmount,
-                    gapAmount: paymentStatus === 'partially_paid' ? gapAmount : currentChangeGivenAmount,
-                    failureReason: failureReason,
-                    autoCloseConfig: autoCloseConfig,
-                    actionButtons: generateActionButtons(paymentStatus)
-                  }, paymentResultToastConfig);
-
-                  // 将支付结果信息传递给回调处理
-                  var paymentResult = _objectSpread(_objectSpread({}, data), {}, {
-                    toastInfo: {
-                      status: paymentStatus,
-                      amount: orderTotalAmount,
-                      gapAmount: currentChangeGivenAmount,
-                      failureReason: failureReason
-                    }
-                  });
-                  handlePaymentComplete(paymentResult);
-                } else {
-                  handlePaymentComplete(data);
-                }
-                // 可以在这里执行同步完成后的业务逻辑
-                // 比如：通知其他系统、更新UI状态等
-              });
-              _context17.next = 31;
+              _context17.next = 30;
               break;
-            case 20:
+            case 19:
               if (!isLocalOrderCreated.current) {
-                _context17.next = 31;
+                _context17.next = 30;
                 break;
               }
               // // 如果本地订单已创建，这时候还更新了 data，则需要销毁当前的订单数据，然后更新新的订单数据了
               console.log('🔄 PaymentModal: data changed, updating checkout data...');
               isLocalOrderCreated.current = false;
-              _context17.next = 25;
+              _context17.next = 24;
               return checkout.cancelCurrentOrderAsync();
-            case 25:
-              _context17.next = 27;
+            case 24:
+              _context17.next = 26;
               return checkout.createLocalOrderAsync({
                 orderData: data === null || data === void 0 ? void 0 : data.order_info,
                 cartSummary: data === null || data === void 0 || (_data$subtotal_info = data.subtotal_info) === null || _data$subtotal_info === void 0 ? void 0 : _data$subtotal_info.subTotalList,
                 autoPayment: true,
                 totalInfo: data === null || data === void 0 ? void 0 : data.subtotal_info
               });
-            case 27:
+            case 26:
               // 获取订单总金额
               _orderInfo3 = checkout.getCurrentOrderInfo();
               if (_orderInfo3 && _orderInfo3.totalAmount) {
@@ -1782,11 +1679,11 @@ var PaymentModal = function PaymentModal(_ref17) {
               }
               setOrderInfo(_orderInfo3);
               isLocalOrderCreated.current = true;
-            case 31:
-              _context17.next = 37;
+            case 30:
+              _context17.next = 36;
               break;
-            case 33:
-              _context17.prev = 33;
+            case 32:
+              _context17.prev = 32;
               _context17.t0 = _context17["catch"](0);
               console.error('Failed to initialize checkout data:', _context17.t0);
               logger === null || logger === void 0 || logger.addLog({
@@ -1796,11 +1693,11 @@ var PaymentModal = function PaymentModal(_ref17) {
                   error: _context17.t0
                 }
               });
-            case 37:
+            case 36:
             case "end":
               return _context17.stop();
           }
-        }, _callee17, null, [[0, 33]]);
+        }, _callee17, null, [[0, 32]]);
       }));
       return function initCheckoutData() {
         return _ref22.apply(this, arguments);
@@ -1811,6 +1708,110 @@ var PaymentModal = function PaymentModal(_ref17) {
     }
   }, [data]);
   useEffect(function () {
+    var checkout = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
+    // 监听订单同步完成，同步完成后显示订单完成 toast，关闭当前弹窗
+    unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', function (data) {
+      var _data$response, _responseData$payment2;
+      // 获取支付状态和相关信息
+      var responseData = (_data$response = data.response) === null || _data$response === void 0 ? void 0 : _data$response.data;
+      // 获取支付状态
+      var paymentStatus = responseData === null || responseData === void 0 ? void 0 : responseData.payment_status;
+      if (data.isManual) return;
+      handlePaymentComplete(data);
+      // 如果正在显示现金支付 toast，跳过自动关闭逻辑
+      if (showingCashToastRef.current) {
+        return;
+      }
+
+      // 获取订单总金额
+      var orderTotalAmount = Number((responseData === null || responseData === void 0 ? void 0 : responseData.total_amount) || 0);
+      var gapAmount = Number((responseData === null || responseData === void 0 ? void 0 : responseData.amount_gap) || 0);
+      var currentChangeGivenAmount = Number((responseData === null || responseData === void 0 || (_responseData$payment2 = responseData.payment_info) === null || _responseData$payment2 === void 0 ? void 0 : _responseData$payment2.current_change_given_amount) || 0);
+      // const changeDue = Number(responseData?.amount_gap || 0);
+      // 获取失败原因
+      var failureReason = responseData === null || responseData === void 0 ? void 0 : responseData.failure_reason;
+
+      // 根据支付状态弹出对应的支付结果toast
+      if (paymentStatus) {
+        // 打印订单完整信息
+        console.log('print_order_onOrderSynced>>>>', responseData);
+        logger === null || logger === void 0 || logger.addLog({
+          type: 'info',
+          title: 'print_order_onOrderSynced',
+          metadata: {
+            responseData: responseData
+          }
+        });
+        try {
+          var _responseData$payment3;
+          var params = {
+            type: '99',
+            // 打印订单全部信息
+            data: {
+              order_id: responseData.order_id,
+              machine_code_print_info: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info,
+              small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment3 = responseData.payment_info) === null || _responseData$payment3 === void 0 ? void 0 : _responseData$payment3.small_ticket_data
+            }
+          };
+          console.log('print_order_onOrderSynced_params>>>>', params);
+          logger === null || logger === void 0 || logger.addLog({
+            type: 'info',
+            title: 'print_order_onOrderSynced_params',
+            metadata: {
+              params: params
+            }
+          });
+          webPrint(params, function (res) {
+            console.log('print_order_onOrderSynced_res>>>>', res);
+            logger === null || logger === void 0 || logger.addLog({
+              type: 'info',
+              title: 'print_order_onOrderSynced_res',
+              metadata: {
+                res: res
+              }
+            });
+          });
+        } catch (error) {
+          console.error('print_order_onOrderSynced_error>>>>', error);
+          logger === null || logger === void 0 || logger.addLog({
+            type: 'info',
+            title: 'print_order_onOrderSynced_error',
+            metadata: {
+              error: error
+            }
+          });
+        }
+
+        // 确定支付状态
+        var statusClassName = calculateStatusClassName(paymentStatus);
+        var autoCloseConfig = calculateAutoCloseConfig(paymentStatus, !!currentChangeGivenAmount);
+
+        // 根据支付状态展示不同的 toast
+        displayPaymentResultToast({
+          paymentStatus: paymentStatus,
+          orderTotalAmount: orderTotalAmount,
+          gapAmount: paymentStatus === 'partially_paid' ? gapAmount : currentChangeGivenAmount,
+          failureReason: failureReason,
+          autoCloseConfig: autoCloseConfig,
+          actionButtons: generateActionButtons(paymentStatus)
+        }, paymentResultToastConfig);
+
+        // 将支付结果信息传递给回调处理
+        var paymentResult = _objectSpread(_objectSpread({}, data), {}, {
+          toastInfo: {
+            status: paymentStatus,
+            amount: orderTotalAmount,
+            gapAmount: currentChangeGivenAmount,
+            failureReason: failureReason
+          }
+        });
+        handlePaymentComplete(paymentResult);
+      } else {
+        handlePaymentComplete(data);
+      }
+      // 可以在这里执行同步完成后的业务逻辑
+      // 比如：通知其他系统、更新UI状态等
+    });
     return function () {
       if (typeof unsubscribeRef.current === 'function') {
         var _unsubscribeRef$curre;

package/es/components/checkout/components/WalletPassModule/components/DiscountWallet/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface DiscountWalletProps {
     isCardMode: boolean;

package/lib/components/booking/components/tabPane/index.less

@@ -1,5 +1,5 @@
 .pisell-lowcode__booking-tab-pane-wrap {
-  height: 100vh;
+  height: 100%;
   // padding: 0 32px;
   width: 100%;
   position: relative;

package/lib/components/booking/utils.d.ts

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/lib/components/checkout/PaymentModal.js

@@ -1234,98 +1234,6 @@ var PaymentModal = ({
             unsubscribeRef.current();
             unsubscribeRef.current = void 0;
           }
-          unsubscribeRef.current = checkout.core.effects.on("checkout:onOrderSynced", (data2) => {
-            var _a3, _b3, _c2;
-            const responseData = (_a3 = data2.response) == null ? void 0 : _a3.data;
-            const paymentStatus = responseData == null ? void 0 : responseData.payment_status;
-            if (data2.isManual) return;
-            handlePaymentComplete(data2);
-            if (showingCashToastRef.current) {
-              return;
-            }
-            const orderTotalAmount = Number((responseData == null ? void 0 : responseData.total_amount) || 0);
-            const gapAmount = Number((responseData == null ? void 0 : responseData.amount_gap) || 0);
-            const currentChangeGivenAmount = Number(
-              ((_b3 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _b3.current_change_given_amount) || 0
-            );
-            const failureReason = responseData == null ? void 0 : responseData.failure_reason;
-            if (paymentStatus) {
-              console.log("print_order_onOrderSynced>>>>", responseData);
-              logger == null ? void 0 : logger.addLog({
-                type: "info",
-                title: "print_order_onOrderSynced",
-                metadata: {
-                  responseData
-                }
-              });
-              try {
-                const params = {
-                  type: "99",
-                  // 打印订单全部信息
-                  data: {
-                    order_id: responseData.order_id,
-                    machine_code_print_info: responseData == null ? void 0 : responseData.machine_code_print_info,
-                    small_ticket_data: (_c2 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _c2.small_ticket_data
-                  }
-                };
-                console.log("print_order_onOrderSynced_params>>>>", params);
-                logger == null ? void 0 : logger.addLog({
-                  type: "info",
-                  title: "print_order_onOrderSynced_params",
-                  metadata: {
-                    params
-                  }
-                });
-                (0, import_utils.webPrint)(params, (res) => {
-                  console.log("print_order_onOrderSynced_res>>>>", res);
-                  logger == null ? void 0 : logger.addLog({
-                    type: "info",
-                    title: "print_order_onOrderSynced_res",
-                    metadata: {
-                      res
-                    }
-                  });
-                });
-              } catch (error) {
-                console.error("print_order_onOrderSynced_error>>>>", error);
-                logger == null ? void 0 : logger.addLog({
-                  type: "info",
-                  title: "print_order_onOrderSynced_error",
-                  metadata: {
-                    error
-                  }
-                });
-              }
-              const statusClassName = (0, import_PaymentResultToastUtils.calculateStatusClassName)(paymentStatus);
-              const autoCloseConfig = (0, import_PaymentResultToastUtils.calculateAutoCloseConfig)(
-                paymentStatus,
-                !!currentChangeGivenAmount
-              );
-              (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
-                {
-                  paymentStatus,
-                  orderTotalAmount,
-                  gapAmount: paymentStatus === "partially_paid" ? gapAmount : currentChangeGivenAmount,
-                  failureReason,
-                  autoCloseConfig,
-                  actionButtons: generateActionButtons(paymentStatus)
-                },
-                paymentResultToastConfig
-              );
-              const paymentResult = {
-                ...data2,
-                toastInfo: {
-                  status: paymentStatus,
-                  amount: orderTotalAmount,
-                  gapAmount: currentChangeGivenAmount,
-                  failureReason
-                }
-              };
-              handlePaymentComplete(paymentResult);
-            } else {
-              handlePaymentComplete(data2);
-            }
-          });
         } else if (isLocalOrderCreated.current) {
           console.log(
             "🔄 PaymentModal: data changed, updating checkout data..."
@@ -1361,6 +1269,102 @@ var PaymentModal = ({
     }
   }, [data]);
   (0, import_react.useEffect)(() => {
+    const checkout = pisellos == null ? void 0 : pisellos.getModule("checkout");
+    unsubscribeRef.current = checkout.core.effects.on(
+      "checkout:onOrderSynced",
+      (data2) => {
+        var _a2, _b2, _c2;
+        const responseData = (_a2 = data2.response) == null ? void 0 : _a2.data;
+        const paymentStatus = responseData == null ? void 0 : responseData.payment_status;
+        if (data2.isManual) return;
+        handlePaymentComplete(data2);
+        if (showingCashToastRef.current) {
+          return;
+        }
+        const orderTotalAmount = Number((responseData == null ? void 0 : responseData.total_amount) || 0);
+        const gapAmount = Number((responseData == null ? void 0 : responseData.amount_gap) || 0);
+        const currentChangeGivenAmount = Number(
+          ((_b2 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _b2.current_change_given_amount) || 0
+        );
+        const failureReason = responseData == null ? void 0 : responseData.failure_reason;
+        if (paymentStatus) {
+          console.log("print_order_onOrderSynced>>>>", responseData);
+          logger == null ? void 0 : logger.addLog({
+            type: "info",
+            title: "print_order_onOrderSynced",
+            metadata: {
+              responseData
+            }
+          });
+          try {
+            const params = {
+              type: "99",
+              // 打印订单全部信息
+              data: {
+                order_id: responseData.order_id,
+                machine_code_print_info: responseData == null ? void 0 : responseData.machine_code_print_info,
+                small_ticket_data: (_c2 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _c2.small_ticket_data
+              }
+            };
+            console.log("print_order_onOrderSynced_params>>>>", params);
+            logger == null ? void 0 : logger.addLog({
+              type: "info",
+              title: "print_order_onOrderSynced_params",
+              metadata: {
+                params
+              }
+            });
+            (0, import_utils.webPrint)(params, (res) => {
+              console.log("print_order_onOrderSynced_res>>>>", res);
+              logger == null ? void 0 : logger.addLog({
+                type: "info",
+                title: "print_order_onOrderSynced_res",
+                metadata: {
+                  res
+                }
+              });
+            });
+          } catch (error) {
+            console.error("print_order_onOrderSynced_error>>>>", error);
+            logger == null ? void 0 : logger.addLog({
+              type: "info",
+              title: "print_order_onOrderSynced_error",
+              metadata: {
+                error
+              }
+            });
+          }
+          const statusClassName = (0, import_PaymentResultToastUtils.calculateStatusClassName)(paymentStatus);
+          const autoCloseConfig = (0, import_PaymentResultToastUtils.calculateAutoCloseConfig)(
+            paymentStatus,
+            !!currentChangeGivenAmount
+          );
+          (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
+            {
+              paymentStatus,
+              orderTotalAmount,
+              gapAmount: paymentStatus === "partially_paid" ? gapAmount : currentChangeGivenAmount,
+              failureReason,
+              autoCloseConfig,
+              actionButtons: generateActionButtons(paymentStatus)
+            },
+            paymentResultToastConfig
+          );
+          const paymentResult = {
+            ...data2,
+            toastInfo: {
+              status: paymentStatus,
+              amount: orderTotalAmount,
+              gapAmount: currentChangeGivenAmount,
+              failureReason
+            }
+          };
+          handlePaymentComplete(paymentResult);
+        } else {
+          handlePaymentComplete(data2);
+        }
+      }
+    );
     return () => {
       var _a2;
       if (typeof unsubscribeRef.current === "function") {

package/lib/components/checkout/components/WalletPassModule/components/DiscountWallet/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface DiscountWalletProps {
     isCardMode: boolean;

package/package.json

@@ -1,6 +1,12 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.4.18",
+  "version": "6.4.19",
+  "scripts": {
+    "dev": "father dev",
+    "build": "father build",
+    "lowcode:dev": "build-scripts start --config ./build.lowcode.js",
+    "lowcode:build": " build-scripts build --config ./build.lowcode.js"
+  },
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -50,6 +56,10 @@
     "@dnd-kit/modifiers": "^6.0.1",
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
+    "@pisell/date-picker": "workspace:*",
+    "@pisell/icon": "workspace:*",
+    "@pisell/materials": "workspace:*",
+    "@pisell/utils": "workspace:*",
     "ahooks": "^3.7.6",
     "antd": "^5.6.3",
     "classnames": "^2.3.2",
@@ -58,11 +68,7 @@
     "rc-virtual-list": "^3.11.3",
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
-    "styled-components": "^6.0.0-rc.3",
-    "@pisell/date-picker": "3.0.7",
-    "@pisell/icon": "0.0.11",
-    "@pisell/utils": "3.0.2",
-    "@pisell/materials": "6.4.3"
+    "styled-components": "^6.0.0-rc.3"
   },
   "peerDependencies": {
     "react": "^18.0.0",
@@ -70,11 +76,5 @@
   },
   "componentConfig": {
     "materialSchema": "https://unpkg.com/@pisell/materials@1.0.1/build/lowcode/assets-prod.json"
-  },
-  "scripts": {
-    "dev": "father dev",
-    "build": "father build",
-    "lowcode:dev": "build-scripts start --config ./build.lowcode.js",
-    "lowcode:build": " build-scripts build --config ./build.lowcode.js"
   }
 }