@pisell/private-materials 6.7.3 → 6.7.5

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");
@@ -82,8 +81,6 @@ var PaymentContent = (0, import_react.forwardRef)(
     onPaymentComplete,
     onPaymentCancel,
     onStatusChange,
-    dispatch,
-    state,
     showingCashToastRef,
     onToastClose,
     orderNote,
@@ -99,9 +96,15 @@ var PaymentContent = (0, import_react.forwardRef)(
     generateActionButtons,
     paymentResultToastConfig,
     updateOrderInfo,
-    setCurrentEditOrderId
+    setCurrentEditOrderId,
+    paymentResultDisplayMode,
+    shopDiscount,
+    client,
+    currentTotalPrice,
+    onChangeShopDiscount,
+    onChangeOrderNote,
+    onDeleteOrderNote
   }, ref) => {
-    var _a, _b, _c;
     const context = (0, import_useEngineContext.default)();
     const utils = context.appHelper.utils || {};
     const { pisellos, getData, pisellosAllModule, interaction } = utils;
@@ -113,12 +116,18 @@ var PaymentContent = (0, import_react.forwardRef)(
     const [balanceDueAmount, setBalanceDueAmount] = (0, import_react.useState)("");
     const [balanceDueTotalAmount, setBalanceDueTotalAmount] = (0, import_react.useState)("");
     const [recommendAmounts, setRecommendAmounts] = (0, import_react.useState)([]);
+    const [showSplitPaymentKeyboard, setShowSplitPaymentKeyboard] = (0, import_react.useState)(false);
     const paymentMethodsRef = (0, import_react.useRef)(null);
     const [paymentMethods, setPaymentMethods] = (0, import_react.useState)([]);
     const [showCashPayment, setShowCashPayment] = (0, import_react.useState)(false);
     const [paymentOptionsTitle, setPaymentOptionsTitle] = (0, import_react.useState)(
       import_utils.locales.getText("cards.and.digitals") || "Cards & Digitals"
     );
+    const paymentOptionList = (0, import_react.useMemo)(() => {
+      return paymentMethods.filter(
+        (item) => !(item.type === "app" && item.code === "EFTPOS_LINKLY") && (["custom"].includes(item.type) || import_PaymentOptionsModule.SHOW_METHODS_CODE.includes(item.code))
+      );
+    }, [paymentMethods]);
     const clientChangedRef = (0, import_react.useRef)(false);
     const walletPassRef = (0, import_react.useRef)(null);
     const [paymentItems, setPaymentItems] = (0, import_react.useState)([]);
@@ -149,11 +158,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({
@@ -161,7 +170,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: {
@@ -195,7 +204,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;
@@ -216,7 +225,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();
@@ -224,7 +233,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 },
@@ -286,7 +295,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",
@@ -319,7 +328,7 @@ var PaymentContent = (0, import_react.forwardRef)(
       }
     };
     (0, import_react.useEffect)(() => {
-      var _a2;
+      var _a;
       if (checkoutModule && orderInfo && isModalOpen) {
         try {
           const currentAmount = checkoutModule.getStateAmount();
@@ -330,7 +339,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);
             }
           }
@@ -384,21 +393,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"
@@ -420,23 +429,21 @@ var PaymentContent = (0, import_react.forwardRef)(
             );
             const orderSubmitStartUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderSubmitStart,
-              executeIfActive(
-                () => {
-                  var _a2;
-                  setSyncingLock(true);
-                  (_a2 = Toast == null ? void 0 : Toast.loading) == null ? void 0 : _a2.call(Toast, "", 0);
-                }
-              )
+              executeIfActive(() => {
+                var _a;
+                setSyncingLock(true);
+                (_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 {
@@ -450,7 +457,7 @@ var PaymentContent = (0, import_react.forwardRef)(
             const orderPaymentAddedUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderPaymentAdded,
               executeIfActive(async (data) => {
-                var _a2, _b2;
+                var _a, _b;
                 console.log("orderPaymentAddedUnsubscribe>>>>", data);
                 const orderInfo2 = checkoutModule.getCurrentOrderInfo();
                 updateOrderInfo == null ? void 0 : updateOrderInfo(orderInfo2);
@@ -464,9 +471,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);
@@ -475,6 +482,12 @@ var PaymentContent = (0, import_react.forwardRef)(
                     totalAmount2 = totalAmount2.add(serviceChargeTotal);
                   }
                   console.log(totalAmount2, paymentItems2);
+                  const isToastMode = paymentResultDisplayMode !== "modal";
+                  if (!isToastMode) {
+                    autoCloseConfig.autoClose = false;
+                    autoCloseConfig.autoCloseDelay = 0;
+                    autoCloseConfig.maskClosable = false;
+                  }
                   await (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
                     {
                       paymentStatus: "partially_paid",
@@ -503,7 +516,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: {
@@ -567,7 +580,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") {
@@ -585,7 +598,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 = {
@@ -594,7 +607,7 @@ 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
             }
           };
@@ -639,67 +652,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 */
@@ -723,14 +695,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);
@@ -738,7 +703,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":
@@ -747,6 +712,9 @@ var PaymentContent = (0, import_react.forwardRef)(
         case "send-link":
           setPaymentLinkModalOpen(true);
           break;
+        case "split-payment":
+          setShowSplitPaymentKeyboard(true);
+          break;
         case "print-receipt":
           let data;
           const isSynced = await checkoutModule.isCurrentOrderSynced();
@@ -801,7 +769,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;
       }
     };
@@ -809,8 +777,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;
       };
@@ -820,7 +787,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) => {
@@ -861,7 +828,10 @@ var PaymentContent = (0, import_react.forwardRef)(
       return res;
     };
     const handleModalClick = (0, import_react.useCallback)((event) => {
-      (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
+      const isToastMode = paymentResultDisplayMode !== "modal";
+      if (isToastMode) {
+        (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
+      }
     }, []);
     return /* @__PURE__ */ import_react.default.createElement(
       "div",
@@ -895,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,
@@ -907,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,
@@ -915,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,
@@ -933,7 +903,7 @@ var PaymentContent = (0, import_react.forwardRef)(
           {
             style: showCashPayment ? {
               gridColumn: "1",
-              gridRow: "1"
+              gridRow: (paymentOptionList == null ? void 0 : paymentOptionList.length) === 1 ? "span 2" : "1"
             } : {}
           },
           /* @__PURE__ */ import_react.default.createElement(
@@ -949,23 +919,24 @@ var PaymentContent = (0, import_react.forwardRef)(
               customAmount,
               roundingFunction,
               balanceDueAmount,
-              balanceDueTotalAmount
+              balanceDueTotalAmount,
+              shortcutsSize: (paymentOptionList == null ? void 0 : paymentOptionList.length) === 3 || (paymentOptionList == null ? void 0 : paymentOptionList.length) === 1 ? "large" : "default"
             }
           )
         ),
-        moduleConfig.showPaymentOptions && /* @__PURE__ */ import_react.default.createElement(
+        moduleConfig.showPaymentOptions && (paymentOptionList == null ? void 0 : paymentOptionList.length) > 0 && /* @__PURE__ */ import_react.default.createElement(
           "div",
           {
             className: showCashPayment ? "" : "payment-options-module-container",
             style: showCashPayment ? {
               gridColumn: "2",
-              gridRow: "1 / 3"
+              gridRow: (paymentOptionList == null ? void 0 : paymentOptionList.length) > 3 ? "1 / 3" : "1"
             } : {}
           },
           /* @__PURE__ */ import_react.default.createElement(
             import_PaymentOptionsModule.default,
             {
-              amountSymbol: state.amountSymbol,
+              amountSymbol: getData("shop_symbol"),
               orderInfo: orderInfo || void 0,
               onClick: onPaymentOptionClick,
               paymentMethods,
@@ -981,8 +952,8 @@ var PaymentContent = (0, import_react.forwardRef)(
           {
             className: showCashPayment ? "" : "additional-module-container",
             style: showCashPayment ? {
-              gridColumn: "1",
-              gridRow: "2"
+              gridColumn: (paymentOptionList == null ? void 0 : paymentOptionList.length) > 3 ? "1" : (paymentOptionList == null ? void 0 : paymentOptionList.length) <= 1 ? "2" : "span 2",
+              gridRow: (paymentOptionList == null ? void 0 : paymentOptionList.length) === 0 ? "1" : "2"
             } : {}
           },
           /* @__PURE__ */ import_react.default.createElement(
@@ -993,7 +964,9 @@ var PaymentContent = (0, import_react.forwardRef)(
               handleButtonClick,
               hasOrderNote: !!orderNote && orderNote.trim().length > 0,
               disabled: isOrderFree,
-              showCashPayment
+              showCashPayment,
+              isFullWidth: !((paymentOptionList == null ? void 0 : paymentOptionList.length) > 3 || (paymentOptionList == null ? void 0 : paymentOptionList.length) <= 1),
+              showMore: !(showCashPayment && (paymentOptionList == null ? void 0 : paymentOptionList.length) === 0)
             }
           )
         )
@@ -1025,6 +998,7 @@ var PaymentContent = (0, import_react.forwardRef)(
             open: showPriceAdjustModal,
             onCancel: () => setShowPriceAdjustModal(false)
           },
+          tips: import_utils.locales.getText("pisell2.checkout.modal.price-adjustment-tips") || "Changing amount will update order total",
           selectType: "dark",
           originalValue: currentTotalPrice,
           defaultValue: currentTotalPriceAfterDiscount,
@@ -1038,10 +1012,43 @@ var PaymentContent = (0, import_react.forwardRef)(
         import_SavePayLaterHandler.default,
         {
           ref: savePayLaterHandlerRef,
-          amountSymbol: state.amountSymbol,
+          amountSymbol: getData("shop_symbol"),
           walletPassData,
           onSavePayLater: handleSavePayLater
         }
+      ),
+      /* @__PURE__ */ import_react.default.createElement(
+        import_priceKeyboard.PaymentKeyboard,
+        {
+          containerProps: {
+            renderType: "modal",
+            open: showSplitPaymentKeyboard,
+            onCancel: () => setShowSplitPaymentKeyboard(false)
+          },
+          paymentOriginalValue: balanceDueAmount,
+          paymentDefaultValue: String(customAmount || 0),
+          enableExceedMaxAmount: false,
+          payment: {
+            enable: true
+          },
+          surcharge: {
+            enable: false
+          },
+          surchargeDefaultValue: {
+            percent: "0",
+            fixed: "0"
+          },
+          selectType: "light",
+          onChange: (value) => {
+            console.log(value);
+          },
+          doneText: import_utils.locales.getText("confirm") || "确认",
+          onPay: (args) => {
+            console.log(args);
+            setShowSplitPaymentKeyboard(false);
+            handleAmountChange(String(args.amount));
+          }
+        }
       )
     );
   }
@@ -1051,10 +1058,15 @@ var PaymentModal = ({
   data,
   callback,
   onClose,
-  dispatch,
-  state,
   setEditCartMode,
-  editOrderId
+  editOrderId,
+  paymentResultDisplayMode,
+  shopDiscount,
+  client,
+  currentTotalPrice,
+  onChangeShopDiscount,
+  onChangeOrderNote,
+  onDeleteOrderNote
 }) => {
   var _a, _b, _c, _d, _e, _f, _g, _h;
   const context = (0, import_useEngineContext.default)();
@@ -1068,6 +1080,7 @@ 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 [showCreateErrorModal, setShowCreateErrorModal] = (0, import_react.useState)(false);
   const [currentEditOrderId, setCurrentEditOrderId] = (0, import_react.useState)(editOrderId || 0);
   const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
   const Toast = (0, import_materials.useToast)();
@@ -1162,15 +1175,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") {
@@ -1195,15 +1200,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(
@@ -1394,7 +1391,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(
+  )), /* @__PURE__ */ import_react.default.createElement("div", { className: "header__center" }, translation("order.total"), "：", (0, import_PaymentResultToastUtils.formatCurrency)(totalAmount, getData("shop_symbol"))), /* @__PURE__ */ import_react.default.createElement("div", { className: "header__right" }, /* @__PURE__ */ import_react.default.createElement(
     import_antd.Button,
     {
       size: "small",
@@ -1553,6 +1550,12 @@ var PaymentModal = ({
                   }));
                 }
                 const orderInfo3 = checkout.getCurrentOrderInfo();
+                const isToastMode = paymentResultDisplayMode !== "modal";
+                if (!isToastMode) {
+                  autoCloseConfig.autoClose = false;
+                  autoCloseConfig.autoCloseDelay = 0;
+                  autoCloseConfig.maskClosable = false;
+                }
                 await (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
                   {
                     paymentStatus,
@@ -1627,6 +1630,7 @@ var PaymentModal = ({
             error
           }
         });
+        setShowCreateErrorModal(true);
       }
     };
     if (data) {
@@ -1648,10 +1652,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;
@@ -2001,8 +2004,13 @@ var PaymentModal = ({
         orderInfo,
         onPaymentComplete: handlePaymentComplete,
         onPaymentCancel: handlePaymentCancel,
-        dispatch,
-        state,
+        paymentResultDisplayMode,
+        shopDiscount,
+        client,
+        currentTotalPrice,
+        onChangeShopDiscount,
+        onChangeOrderNote,
+        onDeleteOrderNote,
         showingCashToastRef,
         onToastClose: handleToastClose,
         orderNote,
@@ -2059,6 +2067,34 @@ var PaymentModal = ({
       },
       import_utils.locales.getText("retry") || "重试"
     ))
+  ), /* @__PURE__ */ import_react.default.createElement(
+    import_materials.PisellContainer,
+    {
+      renderType: "modal",
+      props: {
+        open: showCreateErrorModal,
+        title: import_utils.locales.getText("pisell2.checkout.tips"),
+        footer: null,
+        keyboard: false,
+        onCancel: () => {
+          setShowCreateErrorModal(false);
+        }
+        // 禁用关闭
+      }
+    },
+    /* @__PURE__ */ import_react.default.createElement("div", { style: { textAlign: "center", padding: "20px" } }, /* @__PURE__ */ import_react.default.createElement("div", { style: { marginBottom: "16px", fontSize: "16px" } }, import_utils.locales.getText("pisell2.checkout.order-create-failed")), /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Button,
+      {
+        type: "primary",
+        size: "large",
+        onClick: () => {
+          setShowCreateErrorModal(false);
+          window.location.reload();
+        },
+        style: { width: "100%", marginTop: "80px" }
+      },
+      import_utils.locales.getText("confirm") || "确认"
+    ))
   ));
 };
 var PaymentModal_default = PaymentModal;