@pisell/private-materials 6.4.82 → 6.4.84

package/lib/components/checkout/PaymentModal.js

@@ -50,7 +50,6 @@ var import_WalletPassModule = __toESM(require("./components/WalletPassModule"));
 var import_PaymentOptionsModule = __toESM(require("./components/PaymentOptionsModule"));
 var import_CashPaymentModule = __toESM(require("./components/CashPaymentModule"));
 var import_AdditionalModule = __toESM(require("./components/AdditionalModule"));
-var import_amount = require("../booking/components/footer/amount");
 var import_PaymentResultToast = require("./components/PaymentResultToast");
 var import_PaymentResultToastUtils = require("./utils/PaymentResultToastUtils");
 var import_icon = require("@pisell/icon");
@@ -63,6 +62,7 @@ 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 import_priceKeyboard = require("../../pro/priceKeyboard");
 var import_pisellos = require("../ticketBooking/hooks/pisellos");
 var CheckoutHooks = {
@@ -81,8 +81,6 @@ var PaymentContent = (0, import_react.forwardRef)(
     onPaymentComplete,
     onPaymentCancel,
     onStatusChange,
-    dispatch,
-    state,
     showingCashToastRef,
     onToastClose,
     orderNote,
@@ -98,9 +96,17 @@ var PaymentContent = (0, import_react.forwardRef)(
     generateActionButtons,
     paymentResultToastConfig,
     updateOrderInfo,
-    setCurrentEditOrderId
+    setCurrentEditOrderId,
+    config,
+    paymentResultDisplayMode,
+    shopDiscount,
+    client,
+    currentTotalPrice,
+    onChangeShopDiscount,
+    onChangeOrderNote,
+    onDeleteOrderNote,
+    config: any
   }, ref) => {
-    var _a, _b, _c;
     const context = (0, import_useEngineContext.default)();
     const utils = context.appHelper.utils || {};
     const { pisellos, getData, pisellosAllModule, interaction } = utils;
@@ -128,6 +134,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 [syncingLock, setSyncingLock] = (0, import_react.useState)(false);
     const isOrderFree = (0, import_react.useMemo)(() => {
       if (!customAmount) return false;
@@ -153,11 +160,11 @@ var PaymentContent = (0, import_react.forwardRef)(
       };
     }, [paymentMethods]);
     const handleAddCashPayment = async (result) => {
-      var _a2, _b2;
+      var _a, _b;
       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"));
         }
       );
       logger == null ? void 0 : logger.addLog({
@@ -165,7 +172,7 @@ var PaymentContent = (0, import_react.forwardRef)(
         title: "open_till",
         metadata: {}
       });
-      (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.postMessageToApp) == null ? void 0 : _b2.call(_a2, {
+      (_b = (_a = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a.postMessageToApp) == null ? void 0 : _b.call(_a, {
         module: "till",
         key: "open_till",
         data: {
@@ -178,7 +185,7 @@ var PaymentContent = (0, import_react.forwardRef)(
         /** 支付类型，跟支付列表上对应的支付方式保持一致 */
         code: cashPaymentMethod == null ? void 0 : cashPaymentMethod.code,
         /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-        id: cashPaymentMethod == null ? void 0 : cashPaymentMethod.id,
+        custom_payment_id: cashPaymentMethod == null ? void 0 : cashPaymentMethod.id,
         /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
         name: cashPaymentMethod == null ? void 0 : cashPaymentMethod.name,
         /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
@@ -199,7 +206,7 @@ var PaymentContent = (0, import_react.forwardRef)(
       return surcharge;
     };
     const onPaymentOptionClick = async (method) => {
-      var _a2, _b2, _c2, _d, _e;
+      var _a, _b, _c, _d, _e;
       if (syncingLock) return;
       const { id, code, name, type } = method || {};
       const finalAmount = method.totalAmount ?? customAmount;
@@ -220,7 +227,7 @@ var PaymentContent = (0, import_react.forwardRef)(
         let data;
         const isSynced = await checkoutModule.isCurrentOrderSynced();
         if (!isSynced) {
-          (_a2 = Toast == null ? void 0 : Toast.loading) == null ? void 0 : _a2.call(Toast, "", 0);
+          (_a = Toast == null ? void 0 : Toast.loading) == null ? void 0 : _a.call(Toast, "", 0);
           data = await checkoutModule.manualSyncOrderAsync();
         } else {
           const orderId = await checkoutModule.getCurrentOrderId();
@@ -228,7 +235,7 @@ var PaymentContent = (0, import_react.forwardRef)(
             orderId
           };
         }
-        (_b2 = paymentMethodsRef.current) == null ? void 0 : _b2.onPay(payType, {
+        (_b = paymentMethodsRef.current) == null ? void 0 : _b.onPay(payType, {
           source: "normal",
           data: {
             payMethod: { id, code, name, type },
@@ -248,7 +255,7 @@ var PaymentContent = (0, import_react.forwardRef)(
                 // 支付金额
                 code,
                 // 支付类型code
-                id,
+                custom_payment_id: id,
                 // 支付类型id
                 name,
                 // 支付类型name
@@ -290,7 +297,7 @@ var PaymentContent = (0, import_react.forwardRef)(
             percentage: (method == null ? void 0 : method.percentage) || "0"
           };
         }
-        if (method.type === "custom" && ((_c2 = method.metadata) == null ? void 0 : _c2.order_open_cash_drawer)) {
+        if (method.type === "custom" && ((_c = method.metadata) == null ? void 0 : _c.order_open_cash_drawer)) {
           logger == null ? void 0 : logger.addLog({
             type: "info",
             title: "open_till",
@@ -310,7 +317,7 @@ var PaymentContent = (0, import_react.forwardRef)(
           /** 支付类型，跟支付列表上对应的支付方式保持一致 */
           code: method.code,
           /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-          id: method.id,
+          custom_payment_id: method.id,
           /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
           name: method.name,
           /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
@@ -323,7 +330,7 @@ var PaymentContent = (0, import_react.forwardRef)(
       }
     };
     (0, import_react.useEffect)(() => {
-      var _a2;
+      var _a;
       if (checkoutModule && orderInfo && isModalOpen) {
         try {
           const currentAmount = checkoutModule.getStateAmount();
@@ -334,7 +341,7 @@ var PaymentContent = (0, import_react.forwardRef)(
             const currentNote = checkoutModule.getOrderNote();
             if (currentNote) {
               setOrderNote(currentNote);
-            } else if ((_a2 = cartData == null ? void 0 : cartData.order_info) == null ? void 0 : _a2.order_note) {
+            } else if ((_a = cartData == null ? void 0 : cartData.order_info) == null ? void 0 : _a.order_note) {
               setOrderNote(cartData.order_info.order_note);
             }
           }
@@ -388,21 +395,21 @@ var PaymentContent = (0, import_react.forwardRef)(
             const unsubscribe = core.effects.on(
               CheckoutHooks.OnStateAmountChanged,
               executeIfActive(async (data) => {
-                var _a2, _b2;
+                var _a, _b;
                 console.log(
                   `Amount changed from ${data.oldAmount} to ${data.newAmount}`
                 );
                 if (clientChangedRef.current) {
                   clientChangedRef.current = false;
                   if (data.newAmount !== data.oldAmount) {
-                    (_a2 = Toast == null ? void 0 : Toast.success) == null ? void 0 : _a2.call(
+                    (_a = Toast == null ? void 0 : Toast.success) == null ? void 0 : _a.call(
                       Toast,
                       import_utils.locales.getText(
                         "pisell2.checkout.client-card.tip.wallet-updated"
                       )
                     );
                   } else {
-                    (_b2 = Toast == null ? void 0 : Toast.success) == null ? void 0 : _b2.call(
+                    (_b = Toast == null ? void 0 : Toast.success) == null ? void 0 : _b.call(
                       Toast,
                       import_utils.locales.getText(
                         "pisell2.checkout.client-card.tip.client-changed"
@@ -425,20 +432,20 @@ var PaymentContent = (0, import_react.forwardRef)(
             const orderSubmitStartUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderSubmitStart,
               executeIfActive(() => {
-                var _a2;
+                var _a;
                 setSyncingLock(true);
-                (_a2 = Toast == null ? void 0 : Toast.loading) == null ? void 0 : _a2.call(Toast, "", 0);
+                (_a = Toast == null ? void 0 : Toast.loading) == null ? void 0 : _a.call(Toast, "", 0);
               })
             );
             const orderSubmitEndUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderSubmitEnd,
               executeIfActive((res) => {
-                var _a2, _b2;
+                var _a, _b;
                 setSyncingLock(false);
                 if (res.success) {
-                  (_a2 = Toast == null ? void 0 : Toast.hide) == null ? void 0 : _a2.call(Toast);
+                  (_a = Toast == null ? void 0 : Toast.hide) == null ? void 0 : _a.call(Toast);
                 } else {
-                  (_b2 = Toast == null ? void 0 : Toast.hide) == null ? void 0 : _b2.call(Toast);
+                  (_b = Toast == null ? void 0 : Toast.hide) == null ? void 0 : _b.call(Toast);
                   if (onOrderSyncFailed) {
                     onOrderSyncFailed();
                   } else {
@@ -452,7 +459,7 @@ var PaymentContent = (0, import_react.forwardRef)(
             const orderPaymentAddedUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderPaymentAdded,
               executeIfActive(async (data) => {
-                var _a2, _b2, _c2, _d, _e;
+                var _a, _b;
                 console.log("orderPaymentAddedUnsubscribe>>>>", data);
                 const orderInfo2 = checkoutModule.getCurrentOrderInfo();
                 updateOrderInfo == null ? void 0 : updateOrderInfo(orderInfo2);
@@ -466,9 +473,9 @@ var PaymentContent = (0, import_react.forwardRef)(
                   let totalAmount2 = new import_decimal.default(orderInfo2.isDeposit ? orderInfo2.depositAmount : orderInfo2.totalAmount);
                   if (paymentItems2.length > 0 && paymentItems2.filter((n) => n.isSynced).some((item) => item.service_charge || item.rounding_amount)) {
                     const serviceChargeTotal = paymentItems2.reduce((acc, item) => {
-                      var _a3, _b3;
-                      const chargeAmount = new import_decimal.default(((_a3 = item.service_charge) == null ? void 0 : _a3.amount) || 0);
-                      const chargePercentage = new import_decimal.default(((_b3 = item.service_charge) == null ? void 0 : _b3.percentage) || 0);
+                      var _a2, _b2;
+                      const chargeAmount = new import_decimal.default(((_a2 = item.service_charge) == null ? void 0 : _a2.amount) || 0);
+                      const chargePercentage = new import_decimal.default(((_b2 = item.service_charge) == null ? void 0 : _b2.percentage) || 0);
                       const itemAmount = new import_decimal.default(item.amount || 0);
                       let itemServiceCharge = chargeAmount.add(chargePercentage.mul(itemAmount));
                       console.log(itemServiceCharge);
@@ -477,7 +484,7 @@ var PaymentContent = (0, import_react.forwardRef)(
                     totalAmount2 = totalAmount2.add(serviceChargeTotal);
                   }
                   console.log(totalAmount2, paymentItems2);
-                  const isToastMode = ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.payment_setting) == null ? void 0 : _c2.payment_result_display_mode) !== "modal";
+                  const isToastMode = paymentResultDisplayMode !== "modal";
                   if (!isToastMode) {
                     autoCloseConfig.autoClose = false;
                     autoCloseConfig.autoCloseDelay = 0;
@@ -511,7 +518,7 @@ var PaymentContent = (0, import_react.forwardRef)(
                     title: "open_till",
                     metadata: {}
                   });
-                  (_e = (_d = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _d.postMessageToApp) == null ? void 0 : _e.call(_d, {
+                  (_b = (_a = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a.postMessageToApp) == null ? void 0 : _b.call(_a, {
                     module: "till",
                     key: "open_till",
                     data: {
@@ -575,7 +582,7 @@ var PaymentContent = (0, import_react.forwardRef)(
       [checkoutModule]
     );
     const handleWalletPassConfirmPay = async (action) => {
-      var _a2, _b2;
+      var _a, _b;
       if (action === "save-without-deduct") {
         await checkoutModule.updateVoucherPaymentItemsAsync([]);
       } else if (action === "cancel") {
@@ -593,7 +600,7 @@ var PaymentContent = (0, import_react.forwardRef)(
           updateOrderInfo == null ? void 0 : updateOrderInfo(orderInfo2);
           return;
         }
-        const responseData = (_a2 = result.response) == null ? void 0 : _a2.data;
+        const responseData = (_a = result.response) == null ? void 0 : _a.data;
         console.log("print_order_onOrderSynced>>>>", result);
         try {
           const params = {
@@ -602,11 +609,12 @@ 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: (_b = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _b.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) {
@@ -646,67 +654,26 @@ var PaymentContent = (0, import_react.forwardRef)(
         return walletPassRef.current.handleSearchIdentificationCode(keyword);
       }
     }, []);
-    const getDataFromHost = () => {
-      try {
-        const is_price_include_tax = getData("is_price_include_tax");
-        const tax_rate = getData("tax_rate") || "10";
-        const tax_title = getData("tax_title") || "GST";
-        const surcharge_list = getData("surcharge_list");
-        const schedule_list = getData("schedule_list");
-        let scheduleById = {};
-        if (Array.isArray(schedule_list)) {
-          for (let item of schedule_list) {
-            scheduleById[item.id] = item;
-          }
-        }
-        return {
-          is_price_include_tax,
-          tax_rate,
-          tax_title,
-          surcharge_list,
-          schedule_list,
-          scheduleById
-        };
-      } catch (error) {
-        console.error(error);
-        return {};
-      }
-    };
-    const currentTotalPrice = (0, import_react.useMemo)(() => {
-      if (!showPriceAdjustModal) return 0;
-      const { ScheduleModule } = pisellosAllModule;
-      try {
-        const { productAmount } = (0, import_amount.getSumTotal)(state, {
-          isEdit: true,
-          ScheduleModule,
-          ...getDataFromHost()
-        });
-        return productAmount;
-      } catch (error) {
-        console.error("计算总价失败:", error);
-        return 0;
-      }
-    }, [state, showPriceAdjustModal]);
     const currentTotalPriceAfterDiscount = (0, import_react.useMemo)(() => {
-      return new import_decimal.default(currentTotalPrice).minus(state.shop_discount || 0).toNumber();
-    }, [state.shop_discount, currentTotalPrice]);
+      return new import_decimal.default(currentTotalPrice || 0).minus(shopDiscount || 0).toNumber();
+    }, [shopDiscount, currentTotalPrice]);
     const handleSelectWalletChange = (0, import_ahooks.useMemoizedFn)(
       async (select) => {
         if (walletPassDetail.isShow) {
           const voucherItems = [];
           select.forEach((item) => {
-            var _a2, _b2, _c2, _d;
+            var _a, _b, _c, _d;
             const mapCode = item.code ? import_constants.WALLET_PASS_CODE_MAP[item.code] : null;
             if (mapCode && walletPassDetail.map[mapCode]) {
               voucherItems.push({
                 /** 支付金额 */
                 amount: item.amount,
                 /** 支付类型，跟支付列表上对应的支付方式保持一致 */
-                code: (_a2 = walletPassDetail.map[mapCode]) == null ? void 0 : _a2.code,
+                code: (_a = walletPassDetail.map[mapCode]) == null ? void 0 : _a.code,
                 /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-                id: Number((_b2 = walletPassDetail.map[mapCode]) == null ? void 0 : _b2.id) || 0,
+                id: Number((_b = walletPassDetail.map[mapCode]) == null ? void 0 : _b.id) || 0,
                 /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
-                name: (_c2 = walletPassDetail.map[mapCode]) == null ? void 0 : _c2.name,
+                name: (_c = walletPassDetail.map[mapCode]) == null ? void 0 : _c.name,
                 /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
                 type: (_d = walletPassDetail.map[mapCode]) == null ? void 0 : _d.type,
                 /** 代金券、充值卡、积分卡等wallet pass id */
@@ -730,14 +697,7 @@ var PaymentContent = (0, import_react.forwardRef)(
     const handlePriceAdjustConfirm = async (discountAmount) => {
       try {
         if (checkoutModule && (orderInfo == null ? void 0 : orderInfo.totalAmount)) {
-          if (dispatch) {
-            dispatch({
-              type: "setState",
-              payload: {
-                shop_discount: discountAmount
-              }
-            });
-          }
+          onChangeShopDiscount == null ? void 0 : onChangeShopDiscount(discountAmount);
         }
       } catch (error) {
         console.error("Failed to adjust price:", error);
@@ -745,7 +705,7 @@ var PaymentContent = (0, import_react.forwardRef)(
       setShowPriceAdjustModal(false);
     };
     const handleButtonClick = async (key) => {
-      var _a2;
+      var _a;
       console.log("handleButtonClick", key);
       switch (key) {
         case "order-note":
@@ -775,7 +735,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) || "");
@@ -811,7 +771,7 @@ var PaymentContent = (0, import_react.forwardRef)(
           setShowPriceAdjustModal(true);
           break;
         case "save-pay-later":
-          (_a2 = savePayLaterHandlerRef.current) == null ? void 0 : _a2.handleSavePayLaterClick();
+          (_a = savePayLaterHandlerRef.current) == null ? void 0 : _a.handleSavePayLaterClick();
           break;
       }
     };
@@ -819,8 +779,7 @@ var PaymentContent = (0, import_react.forwardRef)(
       handleButtonClick
     }));
     const getCustomerInfo = () => {
-      var _a2, _b2;
-      const client = (_a2 = state == null ? void 0 : state.client) == null ? void 0 : _a2.value;
+      var _a;
       const getValidName = (value) => {
         return value !== void 0 && value !== null && String(value).trim() !== "" ? String(value).trim() : null;
       };
@@ -830,7 +789,7 @@ var PaymentContent = (0, import_react.forwardRef)(
         id: client == null ? void 0 : client.id,
         nickname: (client == null ? void 0 : client.nickname) || import_utils.locales.getText("pisell2.checkout.customer.default-name"),
         display_name: displayName,
-        email: (client == null ? void 0 : client.email) || ((_b2 = client == null ? void 0 : client.contacts) == null ? void 0 : _b2.email) || ""
+        email: (client == null ? void 0 : client.email) || ((_a = client == null ? void 0 : client.contacts) == null ? void 0 : _a.email) || ""
       };
     };
     const handleSendCustomerPaymentLink = async (data) => {
@@ -859,20 +818,17 @@ var PaymentContent = (0, import_react.forwardRef)(
       }
     };
     const searchAndClientProps = (0, import_react.useMemo)(() => {
-      if ((paymentItems == null ? void 0 : paymentItems.length) > 0) {
-        return {
-          disabledSwitch: true
-        };
-      }
-      return {};
-    }, [paymentItems]);
+      return {
+        disabledSwitch: (config == null ? void 0 : config.disabledSwitchClient) || false
+      };
+    }, [paymentItems, config]);
+    console.log(searchAndClientProps, "searchAndClientProps");
     const roundingFunction = async (amount) => {
       const res = await checkoutModule.roundAmountAsync(amount);
       return res;
     };
     const handleModalClick = (0, import_react.useCallback)((event) => {
-      var _a2, _b2, _c2;
-      const isToastMode = ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.payment_setting) == null ? void 0 : _c2.payment_result_display_mode) !== "modal";
+      const isToastMode = paymentResultDisplayMode !== "modal";
       if (isToastMode) {
         (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
       }
@@ -909,7 +865,7 @@ var PaymentContent = (0, import_react.forwardRef)(
         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,
+            clientId: client == null ? void 0 : client.id,
             customAmount: balanceDueAmount,
             orderInfo: orderInfo || void 0,
             ref: walletPassRef,
@@ -921,7 +877,7 @@ var PaymentContent = (0, import_react.forwardRef)(
       /* @__PURE__ */ import_react.default.createElement(
         import_AmountSummary.default,
         {
-          amountSymbol: state.amountSymbol,
+          amountSymbol: getData("shop_symbol"),
           orderInfo: orderInfo || void 0,
           cartData,
           open_deposit,
@@ -929,7 +885,7 @@ var PaymentContent = (0, import_react.forwardRef)(
           balanceDueAmount,
           paymentItems,
           walletPassData,
-          clientInfo: (_c = state == null ? void 0 : state.client) == null ? void 0 : _c.value,
+          clientInfo: client,
           onAmountChange: handleAmountChange,
           onDepositStatusChange: handleDepositStatusChange,
           onBalanceDueAmountClick: handleButtonClick,
@@ -980,7 +936,7 @@ var PaymentContent = (0, import_react.forwardRef)(
           /* @__PURE__ */ import_react.default.createElement(
             import_PaymentOptionsModule.default,
             {
-              amountSymbol: state.amountSymbol,
+              amountSymbol: getData("shop_symbol"),
               orderInfo: orderInfo || void 0,
               onClick: onPaymentOptionClick,
               paymentMethods,
@@ -1056,7 +1012,7 @@ var PaymentContent = (0, import_react.forwardRef)(
         import_SavePayLaterHandler.default,
         {
           ref: savePayLaterHandlerRef,
-          amountSymbol: state.amountSymbol,
+          amountSymbol: getData("shop_symbol"),
           walletPassData,
           onSavePayLater: handleSavePayLater
         }
@@ -1102,10 +1058,19 @@ var PaymentModal = ({
   data,
   callback,
   onClose,
-  dispatch,
-  state,
   setEditCartMode,
-  editOrderId
+  editOrderId,
+  paymentResultDisplayMode,
+  shopDiscount,
+  client,
+  currentTotalPrice,
+  onChangeShopDiscount,
+  onChangeOrderNote,
+  onDeleteOrderNote,
+  config = {
+    showHeaderCenter: true,
+    showHeaderRightButton: true
+  }
 }) => {
   var _a, _b, _c, _d, _e, _f, _g, _h;
   const context = (0, import_useEngineContext.default)();
@@ -1123,6 +1088,7 @@ var PaymentModal = ({
   const [currentEditOrderId, setCurrentEditOrderId] = (0, import_react.useState)(editOrderId || 0);
   const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
   const Toast = (0, import_materials.useToast)();
+  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());
@@ -1213,15 +1179,7 @@ var PaymentModal = ({
           import_utils.locales.getText("pisell2.checkout.order-note.updated-successfully")
         );
       }
-      if (dispatch) {
-        dispatch({
-          type: "setNotes",
-          payload: {
-            orderNote: noteValue,
-            edit: true
-          }
-        });
-      }
+      onChangeOrderNote == null ? void 0 : onChangeOrderNote(noteValue);
       if (noteModalSource === "payment-result-toast") {
         console.log("Note added from payment result toast");
       } else if (noteModalSource === "payment-content") {
@@ -1246,15 +1204,7 @@ var PaymentModal = ({
           import_utils.locales.getText("pisell2.checkout.order-note.deleted-successfully")
         );
       }
-      if (dispatch) {
-        dispatch({
-          type: "setNotes",
-          payload: {
-            orderNote: "",
-            edit: true
-          }
-        });
-      }
+      onDeleteOrderNote == null ? void 0 : onDeleteOrderNote();
     } catch (error) {
       console.error("Failed to delete order note:", error);
       Toast == null ? void 0 : Toast.error(
@@ -1445,7 +1395,7 @@ var PaymentModal = ({
         }
       }
     }
-  )), /* @__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(
+  )), (config == null ? void 0 : config.showHeaderCenter) && /* @__PURE__ */ import_react.default.createElement("div", { className: "header__center" }, translation("order.total"), "：", (0, import_PaymentResultToastUtils.formatCurrency)(totalAmount, getData("shop_symbol"))), (config == null ? void 0 : config.showHeaderRightButton) && /* @__PURE__ */ import_react.default.createElement("div", { className: "header__right" }, /* @__PURE__ */ import_react.default.createElement(
     import_antd.Button,
     {
       size: "small",
@@ -1484,13 +1434,15 @@ var PaymentModal = ({
             shop_wallet_pass_id
           });
           const newData = (0, import_lodash.cloneDeep)(data);
+          const existPayment = newData.existPayment;
           if (editOrderId || currentEditOrderId) {
             await checkout.updateLocalOrderAsync({
               orderId: editOrderId || currentEditOrderId,
               orderData: newData.order_info,
               cartSummary: (_a2 = newData.subtotal_info) == null ? void 0 : _a2.subTotalList,
               autoPayment: true,
-              totalInfo: newData.subtotal_info
+              totalInfo: newData.subtotal_info,
+              existPayment
             });
           } else {
             logger == null ? void 0 : logger.addLog({
@@ -1525,7 +1477,7 @@ var PaymentModal = ({
           unsubscribeRef.current = checkout.core.effects.on(
             "checkout:onOrderSynced",
             executeIfActive(async (data2) => {
-              var _a3, _b3, _c3, _d3, _e2, _f2, _g2, _h2;
+              var _a3, _b3, _c3, _d3, _e2;
               const currentOrderId = checkout.getCurrentOrderId();
               setCurrentEditOrderId(currentOrderId);
               const responseData = (_a3 = data2.response) == null ? void 0 : _a3.data;
@@ -1557,7 +1509,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: (_c3 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _c3.small_ticket_data
+                      small_ticket_data: (_c3 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _c3.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);
@@ -1568,7 +1521,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",
@@ -1603,7 +1556,7 @@ var PaymentModal = ({
                   }));
                 }
                 const orderInfo3 = checkout.getCurrentOrderInfo();
-                const isToastMode = ((_h2 = (_g2 = (_f2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _f2.config) == null ? void 0 : _g2.payment_setting) == null ? void 0 : _h2.payment_result_display_mode) !== "modal";
+                const isToastMode = paymentResultDisplayMode !== "modal";
                 if (!isToastMode) {
                   autoCloseConfig.autoClose = false;
                   autoCloseConfig.autoCloseDelay = 0;
@@ -1705,10 +1658,9 @@ var PaymentModal = ({
     getData,
     interaction,
     Toast,
-    state,
     onToastClose: handleToastClose
   };
-  const generateActionButtons = (paymentStatus, enabledAutoPrint) => {
+  const generateActionButtons = (paymentStatus, enabledAutoPrint = false) => {
     const getClassName = (suffix) => `payment-result-toast-${suffix}`;
     const handleDetailsClick = async () => {
       var _a2;
@@ -1751,7 +1703,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) || "");
@@ -2058,8 +2010,13 @@ var PaymentModal = ({
         orderInfo,
         onPaymentComplete: handlePaymentComplete,
         onPaymentCancel: handlePaymentCancel,
-        dispatch,
-        state,
+        paymentResultDisplayMode,
+        shopDiscount,
+        client,
+        currentTotalPrice,
+        onChangeShopDiscount,
+        onChangeOrderNote,
+        onDeleteOrderNote,
         showingCashToastRef,
         onToastClose: handleToastClose,
         orderNote,
@@ -2075,7 +2032,8 @@ var PaymentModal = ({
         generateActionButtons,
         paymentResultToastConfig,
         updateOrderInfo: (orderInfo2) => setOrderInfo(orderInfo2),
-        setCurrentEditOrderId: (orderId) => setCurrentEditOrderId(orderId)
+        setCurrentEditOrderId: (orderId) => setCurrentEditOrderId(orderId),
+        config
       }
     )
   ), noteModalOpen && (0, import_react_dom.createPortal)(

package/lib/components/checkout/components/AdditionalModule/index.js

@@ -150,6 +150,8 @@ function AdditionalModule({
                   )
                 );
               }
+            } else if (key === "print-receipt") {
+              handleButtonClick("print-receipt");
             } else if (key === "split-payment") {
               handleButtonClick("split-payment");
             } else if (key === "print-receipt") {