@pisell/private-materials 6.4.42 → 6.5.2

package/lib/components/checkout/PaymentModal.js

@@ -37,9 +37,9 @@ var import_utils = require("@pisell/utils");
 var import_locales = require("../../utils/locales");
 var import_ahooks = require("ahooks");
 var import_react_dom = require("react-dom");
-var import_react_dom2 = __toESM(require("react-dom"));
 var import_locales2 = __toESM(require("./locales"));
 var import_materials = require("@pisell/materials");
+var import_materials2 = require("@pisell/materials");
 var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
 var import_noteModal = __toESM(require("../../plus/noteModal"));
 var import_SendPaymentLinkModal = __toESM(require("./components/SendPaymentLinkModal"));
@@ -55,13 +55,16 @@ var import_PaymentResultToastUtils = require("./utils/PaymentResultToastUtils");
 var import_icon = require("@pisell/icon");
 var import_styles = require("./styles");
 var import_paymentMethods = __toESM(require("../pay/toB/paymentMethods"));
+var import_components = require("../../pro/comprehensiveSearch/components");
 var import_SearchAndClientModule = __toESM(require("./components/SearchAndClientModule"));
+var import_useToast = __toESM(require("../../hooks/useToast"));
 var import_index = require("./index.less");
 var import_constants = require("./constants");
 var import_lodash = require("lodash");
 var import_utils2 = require("./utils");
 var import_usePaymentLogger = __toESM(require("./hooks/usePaymentLogger"));
 var import_antd = require("antd");
+var import_printer = __toESM(require("../../hooks/printer"));
 var CheckoutHooks = {
   OnStateAmountChanged: "checkout:onStateAmountChanged",
   OnBalanceDueAmountChanged: "checkout:onBalanceDueAmountChanged",
@@ -99,7 +102,7 @@ var PaymentContent = (0, import_react.forwardRef)(
     const context = (0, import_useEngineContext.default)();
     const utils = context.appHelper.utils || {};
     const { pisellos, getData, pisellosAllModule, interaction } = utils;
-    const Toast = (0, import_materials.useToast)();
+    const Toast = (0, import_useToast.default)();
     const checkoutRef = (0, import_react.useRef)(null);
     const savePayLaterHandlerRef = (0, import_react.useRef)(null);
     const [customAmount, setCustomAmount] = (0, import_react.useState)("");
@@ -115,6 +118,7 @@ var PaymentContent = (0, import_react.forwardRef)(
     const walletPassRef = (0, import_react.useRef)(null);
     const [paymentItems, setPaymentItems] = (0, import_react.useState)([]);
     const [walletPassData, setWalletPassData] = (0, import_react.useState)({});
+    const { nativePrint } = (0, import_printer.default)();
     const isOrderFree = (0, import_react.useMemo)(() => {
       if (!customAmount) return false;
       const amount = parseFloat(customAmount);
@@ -139,11 +143,10 @@ var PaymentContent = (0, import_react.forwardRef)(
       };
     }, [paymentMethods]);
     const handleAddCashPayment = async (result) => {
-      var _a2, _b2;
       const cashPaymentMethod = paymentMethods.find(
         (method) => {
-          var _a3;
-          return method.code === "CASHMANUAL" || method.type === "CASHMANUAL" || ((_a3 = method.name) == null ? void 0 : _a3.toLowerCase().includes("cash"));
+          var _a2;
+          return method.code === "CASHMANUAL" || method.type === "CASHMANUAL" || ((_a2 = method.name) == null ? void 0 : _a2.toLowerCase().includes("cash"));
         }
       );
       await (checkoutModule == null ? void 0 : checkoutModule.addPaymentItemAsync({
@@ -160,19 +163,6 @@ var PaymentContent = (0, import_react.forwardRef)(
         voucher_id: 0,
         rounding_amount: result.roundingAmount
       }));
-      logger == null ? void 0 : logger.addLog({
-        type: "info",
-        title: "open_till",
-        metadata: {}
-      });
-      (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.postMessageToApp) == null ? void 0 : _b2.call(_a2, {
-        module: "till",
-        key: "open_till",
-        data: {
-          type: "cash"
-          // cash 不需要验证钱箱权限
-        }
-      });
     };
     const processSurcharge = (surcharge) => {
       if (typeof surcharge === "string") {
@@ -411,7 +401,8 @@ var PaymentContent = (0, import_react.forwardRef)(
             );
             const orderPaymentAddedUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderPaymentAdded,
-              async (data) => {
+              (data) => {
+                var _a2, _b2;
                 console.log("orderPaymentAddedUnsubscribe>>>>", data);
                 const balanceDueAmount2 = checkoutModule.getBalanceDueAmount();
                 if (Number(balanceDueAmount2) > 0) {
@@ -420,7 +411,7 @@ var PaymentContent = (0, import_react.forwardRef)(
                     false
                   );
                   const orderInfo2 = checkoutModule.getCurrentOrderInfo();
-                  await (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
+                  (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
                     {
                       paymentStatus: "partially_paid",
                       orderTotalAmount: orderInfo2.totalAmount,
@@ -440,6 +431,19 @@ var PaymentContent = (0, import_react.forwardRef)(
                     }
                   );
                 }
+                const paymentMethodName = data.paymentMethodName || data.name || "";
+                const isCashPayment = data.paymentMethodCode === "CASHMANUAL" || /现金|現金/i.test(paymentMethodName) || /cash/i.test(paymentMethodName);
+                if (isCashPayment) {
+                  logger == null ? void 0 : logger.addLog({
+                    type: "info",
+                    title: "open_till",
+                    metadata: {}
+                  });
+                  (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.postMessageToApp) == null ? void 0 : _b2.call(_a2, {
+                    module: "till",
+                    key: "open_till"
+                  });
+                }
               }
             );
             return () => {
@@ -502,7 +506,7 @@ var PaymentContent = (0, import_react.forwardRef)(
         return;
       }
       const result = await checkoutModule.manualSyncOrderAsync();
-      await (showSuccessToast == null ? void 0 : showSuccessToast(result));
+      showSuccessToast == null ? void 0 : showSuccessToast(result);
       if (result.success) {
         const responseData = (_a2 = result.response) == null ? void 0 : _a2.data;
         console.log("print_order_onOrderSynced>>>>", result);
@@ -513,17 +517,17 @@ var PaymentContent = (0, import_react.forwardRef)(
             data: {
               order_id: responseData.order_id,
               machine_code_print_info: responseData == null ? void 0 : responseData.machine_code_print_info,
-              small_ticket_data: (_b2 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _b2.small_ticket_data
+              small_ticket_data: (_b2 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _b2.small_ticket_data,
+              machine_code_print_info_v2: responseData == null ? void 0 : responseData.machine_code_print_info_v2
             }
           };
           console.log("print_order_onOrderSynced_params>>>>", params);
-          (0, import_utils.webPrint)(params, (res) => {
+          nativePrint(params, (res) => {
             console.log("print_order_onOrderSynced_res>>>>", res);
           });
         } catch (error) {
           console.error("print_order_onOrderSynced_error>>>>", error);
         }
-        onPaymentCancel(true);
       }
     };
     const handleSavePayLater = (0, import_react.useCallback)(
@@ -541,6 +545,7 @@ var PaymentContent = (0, import_react.forwardRef)(
           const res = await checkoutModule.saveForLaterPaymentAsync();
           if (res.success) {
             onPaymentCancel(true);
+            (0, import_PaymentResultToast.closePaymentResultToast)();
           }
         }
       },
@@ -686,7 +691,7 @@ var PaymentContent = (0, import_react.forwardRef)(
               data: { order_id: data.orderId }
             };
             try {
-              (0, import_utils.webPrint)(params, (res) => {
+              nativePrint(params, (res) => {
                 console.log("handleButtonClick_print-receipt_res>>>>", res);
                 if (!(res == null ? void 0 : res.result)) {
                   Toast == null ? void 0 : Toast.error((res == null ? void 0 : res.msg) || "");
@@ -781,49 +786,35 @@ var PaymentContent = (0, import_react.forwardRef)(
       const res = await checkoutModule.roundAmountAsync(amount);
       return res;
     };
-    const handleModalClick = (0, import_react.useCallback)((event) => {
-      (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
-    }, []);
     return /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         ref: checkoutRef,
-        ...{ onClick: handleModalClick },
         style: {
           ...import_styles.checkoutStyles.container,
           maxHeight: dynamicMaxHeight
         }
       },
       /* @__PURE__ */ import_react.default.createElement(
-        "div",
+        import_SearchAndClientModule.default,
         {
-          style: {
-            padding: "12px 16px",
-            border: "1px solid #d0d5dd",
-            borderRadius: 8
-          }
-        },
-        /* @__PURE__ */ import_react.default.createElement(
-          import_SearchAndClientModule.default,
-          {
-            onClientChange: () => {
-              clientChangedRef.current = true;
-            },
-            onSearch: handleSearch,
-            ...searchAndClientProps
-          }
-        ),
-        moduleConfig.showWalletPass && /* @__PURE__ */ import_react.default.createElement(
-          import_WalletPassModule.default,
-          {
-            clientId: (_b = (_a = state == null ? void 0 : state.client) == null ? void 0 : _a.value) == null ? void 0 : _b.id,
-            customAmount,
-            orderInfo: orderInfo || void 0,
-            ref: walletPassRef,
-            paymentItems,
-            onSelectChange: handleSelectWalletChange
-          }
-        )
+          onClientChange: () => {
+            clientChangedRef.current = true;
+          },
+          onSearch: handleSearch,
+          ...searchAndClientProps
+        }
+      ),
+      moduleConfig.showWalletPass && /* @__PURE__ */ import_react.default.createElement(
+        import_WalletPassModule.default,
+        {
+          clientId: (_b = (_a = state == null ? void 0 : state.client) == null ? void 0 : _a.value) == null ? void 0 : _b.id,
+          customAmount,
+          orderInfo: orderInfo || void 0,
+          ref: walletPassRef,
+          paymentItems,
+          onSelectChange: handleSelectWalletChange
+        }
       ),
       /* @__PURE__ */ import_react.default.createElement(
         import_AmountSummary.default,
@@ -839,7 +830,6 @@ var PaymentContent = (0, import_react.forwardRef)(
           clientInfo: (_c = state == null ? void 0 : state.client) == null ? void 0 : _c.value,
           onAmountChange: handleAmountChange,
           onDepositStatusChange: handleDepositStatusChange,
-          onBalanceDueAmountClick: handleButtonClick,
           onConfirm: handleWalletPassConfirmPay,
           totalAmount
         }
@@ -889,8 +879,7 @@ var PaymentContent = (0, import_react.forwardRef)(
               paymentMethods,
               customAmount,
               title: paymentOptionsTitle,
-              disabled: isOrderFree,
-              showCashPayment
+              disabled: isOrderFree
             }
           )
         ),
@@ -956,7 +945,7 @@ var PaymentContent = (0, import_react.forwardRef)(
             ) || "Close price adjustment modal"
           }
         ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-price-adjust-container" }, /* @__PURE__ */ import_react.default.createElement(
-          import_materials.PisellAdjustPrice,
+          import_materials2.PisellAdjustPrice,
           {
             selectType: "dark",
             originValue: currentTotalPrice,
@@ -1004,14 +993,15 @@ var PaymentModal = ({
   const [actualShowCashPayment, setActualShowCashPayment] = (0, import_react.useState)(true);
   const [windowHeight, setWindowHeight] = (0, import_react.useState)(0);
   const [showRetryModal, setShowRetryModal] = (0, import_react.useState)(false);
-  const Toast = (0, import_materials.useToast)();
+  const Toast = (0, import_useToast.default)();
+  const { nativePrint } = (0, import_printer.default)();
   const handleRetry = async () => {
     const checkoutModule = pisellos == null ? void 0 : pisellos.getModule("checkout");
     const res = await (checkoutModule == null ? void 0 : checkoutModule.manualSyncOrderAsync());
     console.log(res);
     if (res.success) {
       setShowRetryModal(false);
-      await (showSuccessToast == null ? void 0 : showSuccessToast(res));
+      showSuccessToast == null ? void 0 : showSuccessToast(res);
     }
   };
   (0, import_react.useEffect)(() => {
@@ -1028,29 +1018,6 @@ var PaymentModal = ({
       window.removeEventListener("orientationchange", updateHeight);
     };
   }, []);
-  (0, import_react.useEffect)(() => {
-    var _a2;
-    const initTillButtonData = async () => {
-      var _a3, _b2;
-      console.log("准备获取tillButton数据");
-      try {
-        const tillButtonData = await ((_b2 = (_a3 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a3.asyncDataManager) == null ? void 0 : _b2.call(_a3, {
-          module: "get",
-          key: "till_button"
-        }));
-        console.log("获取tillButton数据成功", tillButtonData);
-        if (tillButtonData) {
-          (0, import_PaymentResultToast.setTillButton)(tillButtonData);
-          console.log("PaymentModal: tillButton data set successfully", tillButtonData);
-        }
-      } catch (error) {
-        console.error("PaymentModal: Failed to get till_button from asyncDataManager:", error);
-      }
-    };
-    if ((_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.asyncDataManager) {
-      initTillButtonData();
-    }
-  }, [interaction]);
   const dynamicMaxHeight = (0, import_react.useMemo)(() => {
     if (windowHeight === 0) return "600px";
     const bodyTransform = getComputedStyle(document.body).transform;
@@ -1152,112 +1119,8 @@ var PaymentModal = ({
   const currentPaymentResultRef = import_react.default.useRef(null);
   const paymentContentRef = import_react.default.useRef(null);
   const handleOrderNoteClickFromToast = () => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2;
-    const modalContainer = document.createElement("div");
-    document.body.appendChild(modalContainer);
-    const showToast = (type, message) => {
-      if (Toast && Toast[type]) {
-        Toast[type](message);
-      } else {
-        if (type === "success") {
-          console.log("✅ Success:", message);
-        } else {
-          console.error("❌ Error:", message);
-        }
-      }
-    };
-    const handleNoteConfirm2 = async (noteValue) => {
-      var _a3;
-      try {
-        const checkoutModule = pisellos == null ? void 0 : pisellos.getModule("checkout");
-        const orderId = checkoutModule == null ? void 0 : checkoutModule.getCurrentOrderId();
-        if (checkoutModule && orderId) {
-          await ((_a3 = checkoutModule.editOrderNoteByOrderIdAsync) == null ? void 0 : _a3.call(checkoutModule, orderId, noteValue));
-          setOrderNote(noteValue);
-          showToast("success", import_utils.locales.getText("pisell2.checkout.order-note.updated-successfully"));
-        }
-      } catch (error) {
-        console.error("Failed to update order note:", error);
-        showToast("error", import_utils.locales.getText("pisell2.checkout.order-note.update-failed"));
-      }
-      import_react_dom2.default.unmountComponentAtNode(modalContainer);
-      if (document.body.contains(modalContainer)) {
-        document.body.removeChild(modalContainer);
-      }
-    };
-    const handleNoteDelete2 = async () => {
-      var _a3;
-      try {
-        const checkoutModule = pisellos == null ? void 0 : pisellos.getModule("checkout");
-        const orderId = checkoutModule == null ? void 0 : checkoutModule.getCurrentOrderId();
-        if (checkoutModule && orderId) {
-          await ((_a3 = checkoutModule.editOrderNoteByOrderIdAsync) == null ? void 0 : _a3.call(checkoutModule, orderId, ""));
-          setOrderNote("");
-          showToast("success", import_utils.locales.getText("pisell2.checkout.order-note.deleted-successfully"));
-        }
-      } catch (error) {
-        console.error("Failed to delete order note:", error);
-        showToast("error", import_utils.locales.getText("pisell2.checkout.order-note.delete-failed"));
-      }
-      import_react_dom2.default.unmountComponentAtNode(modalContainer);
-      if (document.body.contains(modalContainer)) {
-        document.body.removeChild(modalContainer);
-      }
-    };
-    const handleNoteCancel2 = () => {
-      import_react_dom2.default.unmountComponentAtNode(modalContainer);
-      if (document.body.contains(modalContainer)) {
-        document.body.removeChild(modalContainer);
-      }
-    };
-    const currentLocale = ((_e2 = (_d2 = (_c2 = (_b2 = (_a2 = context.appHelper.utils) == null ? void 0 : _a2.getApp) == null ? void 0 : _b2.call(_a2)) == null ? void 0 : _c2.locales) == null ? void 0 : _d2.getLocale) == null ? void 0 : _e2.call(_d2)) || ((_g2 = (_f2 = context.appHelper.utils) == null ? void 0 : _f2.storage) == null ? void 0 : _g2.get("umi_locale")) || "en";
-    const EngineContextProvider = ({ children }) => {
-      var _a3;
-      const tempEngineContext = {
-        ...context,
-        engine: {
-          ...context.engine,
-          props: {
-            ...(_a3 = context.engine) == null ? void 0 : _a3.props,
-            locale: currentLocale
-          }
-        }
-      };
-      const TempContext = import_react.default.createContext(tempEngineContext);
-      const originalContext = window.__injectedContext;
-      window.__injectedContext = tempEngineContext;
-      import_react.default.useEffect(() => {
-        return () => {
-          window.__injectedContext = originalContext;
-        };
-      }, []);
-      return /* @__PURE__ */ import_react.default.createElement(TempContext.Provider, { value: tempEngineContext }, children);
-    };
-    let orderNote2 = "";
-    try {
-      const checkoutModule = pisellos == null ? void 0 : pisellos.getModule("checkout");
-      orderNote2 = checkoutModule.getOrderNote();
-    } catch (error) {
-      console.warn("Failed to get initial custom amount:", error);
-    }
-    import_react_dom2.default.render(
-      /* @__PURE__ */ import_react.default.createElement(EngineContextProvider, null, /* @__PURE__ */ import_react.default.createElement(import_materials.ConfigProvider, { prefixCls: "pisell-lowcode", theme: {
-        token: {
-          colorPrimary: "#7F56DA"
-        }
-      } }, /* @__PURE__ */ import_react.default.createElement(
-        import_noteModal.default,
-        {
-          open: true,
-          title: import_utils.locales.getText("pisell2.text.add-order-notes"),
-          value: orderNote2,
-          onConfirm: handleNoteConfirm2,
-          onDelete: handleNoteDelete2,
-          onCancel: handleNoteCancel2
-        }
-      ))),
-      modalContainer
-    );
+    setNoteModalSource("payment-result-toast");
+    setNoteModalOpen(true);
   };
   const translation = (key, fallback) => {
     const umiLocale = (0, import_locales.getLocale)();
@@ -1280,14 +1143,11 @@ var PaymentModal = ({
   };
   const handleToastClose = () => {
     console.log(
-      "PaymentModal - Toast closed, executing payment completion callback"
+      "PaymentModal - Toast closed, executing callbacks and closing modal"
     );
     if (currentPaymentResultRef.current) {
       callback == null ? void 0 : callback(currentPaymentResultRef.current);
     }
-  };
-  const handleModalClose = () => {
-    console.log("PaymentModal - Modal closing independently");
     onClose == null ? void 0 : onClose(true);
   };
   const handlePaymentCancel = (reset) => {
@@ -1297,30 +1157,43 @@ var PaymentModal = ({
     checkout.cancelCurrentOrderAsync();
     onClose == null ? void 0 : onClose(reset || false);
   };
-  const CustomHeader = () => /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-modal-custom-header" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "header__left" }, /* @__PURE__ */ import_react.default.createElement(
-    import_antd.Button,
+  const CustomHeader = () => /* @__PURE__ */ import_react.default.createElement(
+    "div",
     {
-      icon: /* @__PURE__ */ import_react.default.createElement(import_materials.Icon, { type: "pisell2-arrow-left", size: 24 }),
-      size: "small",
-      type: "text",
-      onClick: () => {
-        const checkout = pisellos.getModule("checkout");
-        if (checkout.isCurrentOrderSynced()) {
-          handlePaymentCancel(true);
-        } else {
-          handlePaymentCancel(false);
-        }
+      style: {
+        display: "flex",
+        alignItems: "center",
+        width: "100%",
+        position: "relative"
       }
-    }
-  )), /* @__PURE__ */ import_react.default.createElement("div", { className: "header__center" }, translation("order.total"), "：", (0, import_PaymentResultToastUtils.formatCurrency)(totalAmount, state == null ? void 0 : state.amountSymbol)), /* @__PURE__ */ import_react.default.createElement("div", { className: "header__right" }, /* @__PURE__ */ import_react.default.createElement(
-    import_antd.Button,
-    {
-      size: "small",
-      type: "link",
-      onClick: () => handlePaymentCancel(true)
     },
-    import_utils.locales.getText("order.start-new-order")
-  )));
+    /* @__PURE__ */ import_react.default.createElement(
+      "div",
+      {
+        style: {
+          display: "flex",
+          alignItems: "center",
+          gap: "12px",
+          flex: "0 0 auto"
+        }
+      },
+      /* @__PURE__ */ import_react.default.createElement(import_components.DeviceIconGroup, null)
+    ),
+    /* @__PURE__ */ import_react.default.createElement(
+      "div",
+      {
+        style: {
+          position: "absolute",
+          left: "50%",
+          transform: "translateX(-50%)",
+          fontWeight: "500"
+        }
+      },
+      translation("order.total"),
+      "：",
+      (0, import_PaymentResultToastUtils.formatCurrency)(totalAmount, state == null ? void 0 : state.amountSymbol)
+    )
+  );
   (0, import_react.useEffect)(() => {
     var _a2;
     if ((_a2 = data == null ? void 0 : data.order_info) == null ? void 0 : _a2.order_note) {
@@ -1373,8 +1246,8 @@ var PaymentModal = ({
           }
           unsubscribeRef.current = checkout.core.effects.on(
             "checkout:onOrderSynced",
-            async (data2) => {
-              var _a3, _b3, _c2, _d2, _e2;
+            (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;
@@ -1404,7 +1277,8 @@ var PaymentModal = ({
                     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
+                      small_ticket_data: (_c2 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _c2.small_ticket_data,
+                      machine_code_print_info_v2: responseData == null ? void 0 : responseData.machine_code_print_info_v2
                     }
                   };
                   console.log("print_order_onOrderSynced_params>>>>", params);
@@ -1415,7 +1289,7 @@ var PaymentModal = ({
                       params
                     }
                   });
-                  (0, import_utils.webPrint)(params, (res) => {
+                  nativePrint(params, (res) => {
                     console.log("print_order_onOrderSynced_res>>>>", res);
                     logger == null ? void 0 : logger.addLog({
                       type: "info",
@@ -1440,24 +1314,17 @@ var PaymentModal = ({
                   paymentStatus,
                   !!currentChangeGivenAmount
                 );
-                const enabledAutoPrint = await ((_e2 = (_d2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _d2.asyncDataManager) == null ? void 0 : _e2.call(_d2, {
-                  module: "get",
-                  key: "auto_print_receipt"
-                }));
-                await (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
+                (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
                   {
                     paymentStatus,
                     orderTotalAmount,
                     gapAmount: paymentStatus === "partially_paid" ? gapAmount : currentChangeGivenAmount,
                     failureReason,
                     autoCloseConfig,
-                    actionButtons: generateActionButtons(paymentStatus, enabledAutoPrint)
+                    actionButtons: generateActionButtons(paymentStatus)
                   },
                   paymentResultToastConfig
                 );
-                if (paymentStatus === "paid") {
-                  handleModalClose();
-                }
                 const paymentResult = {
                   ...data2,
                   toastInfo: {
@@ -1525,12 +1392,13 @@ var PaymentModal = ({
     state,
     onToastClose: handleToastClose
   };
-  const generateActionButtons = (paymentStatus, enabledAutoPrint) => {
+  const generateActionButtons = (paymentStatus) => {
     const getClassName = (suffix) => `payment-result-toast-${suffix}`;
     const handleDetailsClick = async () => {
       var _a2;
       setTimeout(() => {
         (0, import_PaymentResultToast.closePaymentResultToast)();
+        handleToastClose();
       }, 0);
       const { isTerminal, isWebPos } = (_a2 = context.appHelper) == null ? void 0 : _a2.utils;
       if (isTerminal == null ? void 0 : isTerminal()) {
@@ -1547,9 +1415,6 @@ var PaymentModal = ({
       }
     };
     const handlePrintReceiptClick = async () => {
-      setTimeout(() => {
-        (0, import_PaymentResultToast.closePaymentResultToast)();
-      }, 0);
       const checkoutModule = pisellos == null ? void 0 : pisellos.getModule("checkout");
       if (!checkoutModule) return;
       let data2;
@@ -1568,7 +1433,7 @@ var PaymentModal = ({
           data: { order_id: data2.orderId }
         };
         try {
-          (0, import_utils.webPrint)(params, (res) => {
+          nativePrint(params, (res) => {
             console.log("handleButtonClick_print-receipt_res>>>>", res);
             if (!(res == null ? void 0 : res.result)) {
               Toast == null ? void 0 : Toast.error((res == null ? void 0 : res.msg) || "");
@@ -1598,9 +1463,6 @@ var PaymentModal = ({
       (0, import_PaymentResultToast.closePaymentResultToast)();
     };
     const handleOrderNoteClick = () => {
-      setTimeout(() => {
-        (0, import_PaymentResultToast.closePaymentResultToast)();
-      }, 0);
       console.log(import_utils.locales.getText("payment.result.actions.orderNoteClicked"));
       if (handleOrderNoteClickFromToast) {
         handleOrderNoteClickFromToast();
@@ -1613,7 +1475,7 @@ var PaymentModal = ({
       case "paid":
         return [
           [
-            enabledAutoPrint ? {
+            {
               id: "details",
               buttonProps: {
                 className: getClassName("action-button"),
@@ -1621,7 +1483,8 @@ var PaymentModal = ({
                 icon: /* @__PURE__ */ import_react.default.createElement(import_icon.FileCheck02, { className: getClassName("action-icon") }),
                 children: import_utils.locales.getText("payment.result.details")
               }
-            } : {
+            },
+            {
               id: "print",
               buttonProps: {
                 className: getClassName("action-button"),
@@ -1657,12 +1520,21 @@ var PaymentModal = ({
         return [
           [
             {
-              id: "details",
+              id: "saveAsPartialPaid",
               buttonProps: {
                 className: getClassName("action-button"),
-                onClick: handleDetailsClick,
-                icon: /* @__PURE__ */ import_react.default.createElement(import_icon.FileCheck02, { className: getClassName("action-icon") }),
-                children: import_utils.locales.getText("payment.result.details")
+                onClick: handleSaveAsPartialPaidClick,
+                children: import_utils.locales.getText("payment.result.saveAsPartialPaid")
+              }
+            },
+            {
+              id: "continuePayment",
+              buttonProps: {
+                className: getClassName("action-button"),
+                onClick: () => {
+                  (0, import_PaymentResultToast.closePaymentResultToast)();
+                },
+                children: import_utils.locales.getText("payment.result.continuePayment")
               }
             },
             {
@@ -1806,7 +1678,7 @@ var PaymentModal = ({
     paymentResultToastConfig,
     generateActionButtons
   );
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement(import_PaymentResultToast.PaymentResultToastProvider, null, /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellContainer,
     {
       renderType: "modal",
@@ -1820,9 +1692,10 @@ var PaymentModal = ({
         destroyOnClose: false,
         maskClosable: false,
         footer: null,
-        closeIcon: false,
+        closeIcon: null,
         wrapClassName: `payment-modal-wrapper ${!actualShowCashPayment ? "no-cash-payment" : ""}`,
         size: "large",
+        headerDivider: false,
         style: {
           height: "auto"
         },
@@ -1830,7 +1703,7 @@ var PaymentModal = ({
           maxHeight: "100%",
           // 使用100%基于父元素，而不是视口的90%
           overflowY: "auto",
-          padding: 16,
+          padding: 0,
           display: "flex",
           flexDirection: "column"
         }

package/lib/components/checkout/components/AdditionalModule/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import './index.less';
-import { CurrentOrderInfo } from '../../types';
+import { CurrentOrderInfo } from "../../types";
 interface AdditionalModuleProps {
     orderInfo?: CurrentOrderInfo;
     customAmount?: string;