@pisell/private-materials 6.4.49 → 6.4.51

package/lib/components/checkout/PaymentModal.js

@@ -108,6 +108,7 @@ var PaymentContent = (0, import_react.forwardRef)(
     const savePayLaterHandlerRef = (0, import_react.useRef)(null);
     const [customAmount, setCustomAmount] = (0, import_react.useState)("");
     const [balanceDueAmount, setBalanceDueAmount] = (0, import_react.useState)("");
+    const [balanceDueTotalAmount, setBalanceDueTotalAmount] = (0, import_react.useState)("");
     const [recommendAmounts, setRecommendAmounts] = (0, import_react.useState)([]);
     const paymentMethodsRef = (0, import_react.useRef)(null);
     const [paymentMethods, setPaymentMethods] = (0, import_react.useState)([]);
@@ -319,6 +320,7 @@ var PaymentContent = (0, import_react.forwardRef)(
           if (currentAmount) {
             setCustomAmount(currentAmount);
             setBalanceDueAmount(currentAmount);
+            setBalanceDueTotalAmount(orderInfo.totalAmount || "0");
             const currentNote = checkoutModule.getOrderNote();
             if (currentNote) {
               setOrderNote(currentNote);
@@ -407,6 +409,7 @@ var PaymentContent = (0, import_react.forwardRef)(
               CheckoutHooks.OnBalanceDueAmountChanged,
               (data) => {
                 setBalanceDueAmount(data.newAmount);
+                setBalanceDueTotalAmount(data.totalAmount || "0");
               }
             );
             const orderSubmitStartUnsubscribe = core.effects.on(
@@ -451,17 +454,19 @@ var PaymentContent = (0, import_react.forwardRef)(
                   );
                   const paymentItems2 = await checkoutModule.getCurrentOrderPaymentItemsAsync();
                   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)) {
+                  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);
                       const itemAmount = new import_decimal.default(item.amount || 0);
-                      const itemServiceCharge = chargeAmount.add(chargePercentage.mul(itemAmount));
+                      let itemServiceCharge = chargeAmount.add(chargePercentage.mul(itemAmount));
+                      console.log(itemServiceCharge);
                       return acc.add(itemServiceCharge);
                     }, new import_decimal.default(0));
                     totalAmount2 = totalAmount2.add(serviceChargeTotal);
                   }
+                  console.log(totalAmount2, paymentItems2);
                   await (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
                     {
                       paymentStatus: "partially_paid",
@@ -563,9 +568,12 @@ var PaymentContent = (0, import_react.forwardRef)(
       const result = await checkoutModule.manualSyncOrderAsync();
       await (showSuccessToast == null ? void 0 : showSuccessToast(result));
       if (result.success) {
+        checkoutModule.core.effects.emit("checkout:onPaymentStarted", {
+          paymentMethodCode: ""
+        });
         const orderInfo2 = checkoutModule.getCurrentOrderInfo();
         setCurrentEditOrderId == null ? void 0 : setCurrentEditOrderId(result.orderId);
-        if (result.is_deposit && Number(orderInfo2.depositAmount < orderInfo2.totalAmount)) {
+        if (result.is_deposit && Number(orderInfo2.depositAmount) < Number(orderInfo2.totalAmount)) {
           updateOrderInfo == null ? void 0 : updateOrderInfo(orderInfo2);
           return;
         }
@@ -931,7 +939,8 @@ var PaymentContent = (0, import_react.forwardRef)(
               amountButtons: recommendAmounts,
               customAmount,
               roundingFunction,
-              balanceDueAmount
+              balanceDueAmount,
+              balanceDueTotalAmount
             }
           )
         ),
@@ -1044,7 +1053,7 @@ var PaymentModal = ({
     import_locales2.default,
     ((_e = (_d = (_c = (_b = (_a = context.appHelper.utils) == null ? void 0 : _a.getApp) == null ? void 0 : _b.call(_a)) == null ? void 0 : _c.locales) == null ? void 0 : _d.getLocale) == null ? void 0 : _e.call(_d)) || ((_g = (_f = context.appHelper.utils) == null ? void 0 : _f.storage) == null ? void 0 : _g.get("umi_locale")) || "en"
   );
-  const { pisellos, getData, interaction } = ((_h = context == null ? void 0 : context.appHelper) == null ? void 0 : _h.utils) || {};
+  const { pisellos, getData, interaction, isWebPos } = ((_h = context == null ? void 0 : context.appHelper) == null ? void 0 : _h.utils) || {};
   const [orderInfo, setOrderInfo] = (0, import_react.useState)(null);
   const [totalAmount, setTotalAmount] = (0, import_react.useState)(0);
   const [actualShowCashPayment, setActualShowCashPayment] = (0, import_react.useState)(true);
@@ -1422,6 +1431,13 @@ var PaymentModal = ({
               totalInfo: newData.subtotal_info
             });
           } else {
+            logger == null ? void 0 : logger.addLog({
+              type: "info",
+              title: "正常创建 createLocalOrderAsync",
+              metadata: {
+                data
+              }
+            });
             await checkout.createLocalOrderAsync({
               orderData: newData.order_info,
               cartSummary: (_b2 = newData.subtotal_info) == null ? void 0 : _b2.subTotalList,
@@ -1515,10 +1531,15 @@ var PaymentModal = ({
                   paymentStatus,
                   !!currentChangeGivenAmount
                 );
-                const enabledAutoPrint = await ((_e2 = (_d3 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _d3.asyncDataManager) == null ? void 0 : _e2.call(_d3, {
-                  module: "get",
-                  key: "auto_print_receipt"
-                }));
+                let enabledAutoPrint = false;
+                if (isWebPos) {
+                  enabledAutoPrint = false;
+                } else {
+                  enabledAutoPrint = await ((_e2 = (_d3 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _d3.asyncDataManager) == null ? void 0 : _e2.call(_d3, {
+                    module: "get",
+                    key: "auto_print_receipt"
+                  }));
+                }
                 const orderInfo3 = checkout.getCurrentOrderInfo();
                 await (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
                   {
@@ -1564,6 +1585,13 @@ var PaymentModal = ({
               totalInfo: data == null ? void 0 : data.subtotal_info
             });
           } else {
+            logger == null ? void 0 : logger.addLog({
+              type: "info",
+              title: "含有 localOrderCreate, 调用 createLocalOrderAsync",
+              metadata: {
+                data
+              }
+            });
             await checkout.createLocalOrderAsync({
               orderData: data == null ? void 0 : data.order_info,
               cartSummary: (_d2 = data == null ? void 0 : data.subtotal_info) == null ? void 0 : _d2.subTotalList,
@@ -1618,7 +1646,7 @@ var PaymentModal = ({
       setTimeout(() => {
         (0, import_PaymentResultToast.closePaymentResultToast)();
       }, 0);
-      const { isTerminal, isWebPos } = (_a2 = context.appHelper) == null ? void 0 : _a2.utils;
+      const { isTerminal, isWebPos: isWebPos2 } = (_a2 = context.appHelper) == null ? void 0 : _a2.utils;
       if (isTerminal == null ? void 0 : isTerminal()) {
         const checkout = pisellos.getModule("checkout");
         const orderId = await checkout.getCurrentOrderId();

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

@@ -173,7 +173,7 @@ function AmountSummary({
   (0, import_react.useEffect)(() => {
     var _a2;
     const nonWalletPassAmount = ((_a2 = paymentItems == null ? void 0 : paymentItems.reduce((acc, item) => {
-      if (!item.voucher_id) {
+      if (!item.voucher_id || item.voucher_id && item.isSynced) {
         let itemAmount = new import_decimal.default(item.amount || "0");
         if (item.rounding_amount) {
           const roundingAmount = new import_decimal.default(item.rounding_amount);
@@ -364,6 +364,13 @@ function AmountSummary({
   const renderConfirmMode = () => {
     let balanceAmountValue = parseFormattedAmount(getBalanceDueAmount());
     let balanceDecimal = new import_decimal.default(balanceAmountValue);
+    const syncedVoucherAmount = paymentItems == null ? void 0 : paymentItems.reduce((acc, item) => {
+      if (item.isSynced && (paymentType === "regular" && item.order_payment_type !== "deposit" || paymentType === "deposit" && item.order_payment_type === "deposit")) {
+        return acc.plus(item.amount).plus(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0);
+      }
+      return acc;
+    }, new import_decimal.default(0)).toNumber();
+    balanceDecimal = balanceDecimal.minus(syncedVoucherAmount);
     const finalBalanceAmount = (0, import_utils.formatAmountWithOptions)(
       balanceDecimal.toNumber(),
       amountSymbol,
@@ -440,7 +447,7 @@ function AmountSummary({
     if (paymentType === "regular") {
       const depositPaidAmount = paymentItems == null ? void 0 : paymentItems.reduce((acc, item) => {
         if (item.order_payment_type === "deposit") {
-          return acc.plus(item.amount).plus(Math.abs(item.rounding_amount));
+          return acc.plus(item.amount).plus(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0);
         }
         return acc;
       }, new import_decimal.default(0)).toNumber();
@@ -449,7 +456,7 @@ function AmountSummary({
     } else {
       const depositPaidAmount = paymentItems == null ? void 0 : paymentItems.reduce((acc, item) => {
         if (item.order_payment_type === "deposit") {
-          return acc.plus(item.amount);
+          return acc.plus(item.amount).plus(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0);
         }
         return acc;
       }, new import_decimal.default(0)).toNumber();
@@ -457,12 +464,22 @@ function AmountSummary({
     }
   }, [paymentItems, paymentType, totalAmount]);
   const showCancelSplitPayment = (0, import_react.useMemo)(() => {
-    return balanceDueAmount !== customAmount;
+    return balanceDueAmount !== customAmount && Number(balanceDueAmount) > 0 && Number(customAmount) > 0;
   }, [customAmount, balanceDueAmount]);
   const handleChangeDepositAmount = (value) => {
     console.log("handleChangeDepositAmount", value);
     checkoutModule == null ? void 0 : checkoutModule.setDepositAmountAsync(value);
   };
+  const hasDepositPayment = (0, import_react.useMemo)(() => {
+    return paymentItems == null ? void 0 : paymentItems.some((item) => item.order_payment_type === "deposit" && item.status !== "voided");
+  }, [paymentItems]);
+  const showCanNotChangeDepositAmount = () => {
+    Toast == null ? void 0 : Toast.fail(
+      import_utils.locales.getText(
+        "pisell2.checkout.can-not-change-deposit-amount"
+      )
+    );
+  };
   return /* @__PURE__ */ import_react2.default.createElement(
     "div",
     {
@@ -504,7 +521,18 @@ function AmountSummary({
         })
       },
       // 如果应该显示确认模式，直接返回确认界面
-      shouldShowConfirmMode() ? renderConfirmMode() : /* @__PURE__ */ import_react2.default.createElement("div", { className: (0, import_classnames.default)("balance-due-info") }, paymentType === "deposit" ? /* @__PURE__ */ import_react2.default.createElement(
+      shouldShowConfirmMode() ? renderConfirmMode() : /* @__PURE__ */ import_react2.default.createElement("div", { className: (0, import_classnames.default)("balance-due-info") }, paymentType === "deposit" ? hasDepositPayment ? /* @__PURE__ */ import_react2.default.createElement("div", { onClick: () => showCanNotChangeDepositAmount() }, /* @__PURE__ */ import_react2.default.createElement("div", { className: (0, import_classnames.default)("balance-due-label") }, getText("deposit.due") || "Deposit Due"), /* @__PURE__ */ import_react2.default.createElement("div", { className: (0, import_classnames.default)("balance-due-amount") }, (0, import_utils.formatAmountWithOptions)(balanceDueAmount, amountSymbol, {
+        precision: 2,
+        hideDecimalForWholeNumbers: false,
+        useThousandsSeparator: true,
+        showCurrencySymbol: true
+      }), /* @__PURE__ */ import_react2.default.createElement(
+        import_icon.Edit05,
+        {
+          className: (0, import_classnames.default)("edit-icon"),
+          style: { color: "#7F56DA" }
+        }
+      ))) : /* @__PURE__ */ import_react2.default.createElement(
         import_pisellSimplePriceKeyboardPopover.default,
         {
           value: balanceDueAmount || "0",

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

@@ -13,10 +13,12 @@ export interface CashPaymentModuleProps {
         roundingDifference: number;
     }>;
     balanceDueAmount?: string;
+    balanceDueTotalAmount?: string;
     syncingLock?: boolean;
 }
 export declare function CashPaymentModule({ amountSymbol, orderInfo, onPaymentComplete, customAmount, amountButtons, // 按钮列表，默认5个推荐金额
 disabled, // 禁用状态
-roundingFunction, balanceDueAmount, // 剩余支付金额
+roundingFunction, balanceDueAmount, // 当前阶段剩余支付金额（定金或普通支付）
+balanceDueTotalAmount, // 完整订单剩余待付金额
 syncingLock, }: CashPaymentModuleProps): JSX.Element;
 export default CashPaymentModule;

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

@@ -52,7 +52,9 @@ function CashPaymentModule({
   // 禁用状态
   roundingFunction,
   balanceDueAmount = "0",
-  // 剩余支付金额
+  // 当前阶段剩余支付金额（定金或普通支付）
+  balanceDueTotalAmount = "0",
+  // 完整订单剩余待付金额
   syncingLock = false
   // 是否锁定
 }) {
@@ -71,7 +73,7 @@ function CashPaymentModule({
   };
   (0, import_react.useEffect)(() => {
     handleKeyboardConfirm(customAmount || "");
-  }, [customAmount, balanceDueAmount]);
+  }, [customAmount, balanceDueAmount, orderInfo == null ? void 0 : orderInfo.isDeposit]);
   const isAmountButtonsDisabled = disabled || Number(customAmount || 0) === 0;
   const isInputDisabled = disabled || Number(customAmount || 0) === 0;
   const handleCashPayInternal = () => {
@@ -120,7 +122,8 @@ function CashPaymentModule({
     } else {
       const cleanValue = finalValue.replace(/[$\s]/g, "");
       const numValue = parseFloat(cleanValue);
-      const balanceDue = parseFloat(balanceDueAmount);
+      debugger;
+      const balanceDue = parseFloat((orderInfo == null ? void 0 : orderInfo.isDeposit) ? balanceDueTotalAmount || "0" : balanceDueAmount);
       const shouldApplyRounding = Math.abs(numValue - balanceDue) < 0.01;
       let finalAmount = numValue;
       let roundingDiff = 0;

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

@@ -39,6 +39,7 @@ var import_locales = __toESM(require("../../locales"));
 var import_index = require("./index.less");
 var import_classnames = __toESM(require("classnames"));
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
+var import_decimal = __toESM(require("decimal.js"));
 function PaymentDetailModal({
   amountSymbol,
   orderInfo,
@@ -87,15 +88,14 @@ function PaymentDetailModal({
     return (item.code === "cash" || item.type === "custom") && !item.isSynced;
   };
   const getTotalPaidAmount = () => {
-    return paymentItems.filter((item) => !item.voucher_id).reduce((total, item) => total + Math.abs(item.amount) + Math.abs(item.rounding_amount), 0);
-  };
-  const getTotalVoucherAmount = () => {
-    return paymentItems.filter((item) => item.voucher_id).reduce((total, item) => total + Math.abs(item.amount), 0);
+    return paymentItems.filter((item) => !item.voucher_id || item.isSynced).reduce((total, item) => {
+      const amount = new import_decimal.default(Math.abs(item.amount));
+      const roundingAmount = new import_decimal.default(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0);
+      return new import_decimal.default(total).plus(amount).plus(roundingAmount).toNumber();
+    }, 0);
   };
   const getBalanceDueAmount = () => {
-    const baseAmount = customAmount ? parseFloat(customAmount) : 0;
-    const voucherDeductions = getTotalVoucherAmount();
-    return baseAmount + voucherDeductions;
+    return new import_decimal.default(orderInfo.totalAmount || 0).sub(new import_decimal.default(getTotalPaidAmount())).toNumber().toFixed(2);
   };
   const handleVoidPayment = (paymentItem) => {
     console.log("Void payment:", paymentItem);
@@ -104,16 +104,54 @@ function PaymentDetailModal({
     }
   };
   const renderPaymentItems = () => {
-    const regularPayments = paymentItems.filter((item) => !item.voucher_id);
-    if (!paymentItems || paymentItems.length === 0 || regularPayments.length === 0) {
+    const depositPayments = paymentItems.filter((item) => item.order_payment_type === "deposit" && item.isSynced);
+    const regularPayments = paymentItems.filter((item) => item.isSynced && item.order_payment_type !== "deposit");
+    if (!paymentItems || paymentItems.length === 0 || regularPayments.length === 0 && depositPayments.length === 0) {
       return /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("section-content") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("no-payment-text") }, getText("no.payments.recorded") || "No payments recorded"));
     }
-    return /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("section-content") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-record-container") }, regularPayments.map((item) => /* @__PURE__ */ import_react.default.createElement("div", { key: item.uuid, className: (0, import_classnames.default)("payment-item") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-item-content") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-item-text") }, item.name, " - ", (/* @__PURE__ */ new Date()).toLocaleDateString(), " ", getText("pisell2.checkout.payment-detail.by") || "by", " ", getCustomerInfo().nickname), /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-item-actions") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-item-amount") }, "-", (0, import_utils.formatAmountWithOptions)(Math.abs(item.amount) + Math.abs(item.rounding_amount), amountSymbol, {
+    const depositPaymentSummary = depositPayments.reduce((acc, item) => {
+      return new import_decimal.default(acc).plus(new import_decimal.default(item.amount)).plus(new import_decimal.default(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0)).toNumber();
+    }, 0);
+    const regularPaymentSummary = regularPayments.reduce((acc, item) => {
+      return new import_decimal.default(acc).plus(new import_decimal.default(item.amount)).plus(new import_decimal.default(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0)).toNumber();
+    }, 0);
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("section-content") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-record-container") }, depositPayments.length > 0 && /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-item-header") }, /* @__PURE__ */ import_react.default.createElement("div", null, getText("pisell2.subtotal.deposit") || "Deposit"), /* @__PURE__ */ import_react.default.createElement("div", null, (0, import_utils.formatAmountWithOptions)(depositPaymentSummary, amountSymbol, {
+      precision: 2,
+      hideDecimalForWholeNumbers: false,
+      useThousandsSeparator: true,
+      showCurrencySymbol: true
+    }))), depositPayments.map((item) => /* @__PURE__ */ import_react.default.createElement("div", { key: item.uuid, className: (0, import_classnames.default)("payment-item") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-item-bullet") }), /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-item-content") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-item-text") }, item.name, " - ", (/* @__PURE__ */ new Date()).toLocaleDateString(), " ", getText("pisell2.checkout.payment-detail.by") || "by", " ", getCustomerInfo().nickname), /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-item-actions") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-item-amount") }, "-", (0, import_utils.formatAmountWithOptions)(
+      new import_decimal.default(Math.abs(item.amount)).plus(new import_decimal.default(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0)).toNumber(),
+      amountSymbol,
+      {
+        precision: 2,
+        hideDecimalForWholeNumbers: false,
+        useThousandsSeparator: true,
+        showCurrencySymbol: true
+      }
+    )), shouldShowVoidButton(item) && /* @__PURE__ */ import_react.default.createElement(
+      "button",
+      {
+        className: (0, import_classnames.default)("void-button"),
+        onClick: () => handleVoidPayment(item),
+        type: "button"
+      },
+      getText("void") || "Void"
+    ))))), regularPayments.length > 0 && /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-item-header") }, /* @__PURE__ */ import_react.default.createElement("div", null, getText("payment.text") || "Payment"), /* @__PURE__ */ import_react.default.createElement("div", null, (0, import_utils.formatAmountWithOptions)(regularPaymentSummary, amountSymbol, {
       precision: 2,
       hideDecimalForWholeNumbers: false,
       useThousandsSeparator: true,
       showCurrencySymbol: true
-    })), shouldShowVoidButton(item) && /* @__PURE__ */ import_react.default.createElement(
+    }))), regularPayments.map((item) => /* @__PURE__ */ import_react.default.createElement("div", { key: item.uuid, className: (0, import_classnames.default)("payment-item") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-item-bullet") }), /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-item-content") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-item-text") }, item.name, " - ", (/* @__PURE__ */ new Date()).toLocaleDateString(), " ", getText("pisell2.checkout.payment-detail.by") || "by", " ", getCustomerInfo().nickname), /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-item-actions") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-item-amount") }, "-", (0, import_utils.formatAmountWithOptions)(
+      new import_decimal.default(Math.abs(item.amount)).plus(new import_decimal.default(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0)).toNumber(),
+      amountSymbol,
+      {
+        precision: 2,
+        hideDecimalForWholeNumbers: false,
+        useThousandsSeparator: true,
+        showCurrencySymbol: true
+      }
+    )), shouldShowVoidButton(item) && /* @__PURE__ */ import_react.default.createElement(
       "button",
       {
         className: (0, import_classnames.default)("void-button"),

package/lib/components/checkout/components/PaymentDetailModal/index.less

@@ -263,7 +263,7 @@
   flex-direction: column;
   justify-content: flex-start;
   align-items: flex-start;
-  gap: 16px;
+  gap: 8px;
 }
 
 .payment-record-header {
@@ -299,12 +299,33 @@
   line-height: 20px;
   word-wrap: break-word;
 }
+.payment-item-header {
+  width: 100%;
+  color: black;
+  font-size: 14px;
+  font-weight: 500;
+  line-height: 20px;
+  word-wrap: break-word;
+  display: flex;
+  justify-content: space-between;
+}
 
 .payment-item {
   align-self: stretch;
   display: flex;
-  justify-content: space-between;
+  justify-content: flex-start;
   align-items: center;
+  gap: 8px;
+  margin-left: 10px;
+  margin-right: 64px;
+}
+
+.payment-item-bullet {
+  width: 6px;
+  height: 6px;
+  background-color: #475467;
+  border-radius: 50%;
+  flex-shrink: 0;
 }
 
 .payment-item-content {

package/lib/components/checkout/hooks/useWalletPass.d.ts

@@ -17,7 +17,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any;
+    expiredWalletIds: any[];
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: () => void;

package/lib/components/checkout/hooks/useWalletPass.js

@@ -272,6 +272,7 @@ var useWalletPass = (props) => {
     } else {
       setWalletSelect([]);
       notSetWalletSelectRef.current = false;
+      onSelectChange == null ? void 0 : onSelectChange([]);
     }
     const originalDiscountList = shopDiscount.getDiscountList();
     const sortedDiscountList = sortDiscountListWithInitialOrder(originalDiscountList);

package/lib/components/checkout/locales.d.ts

@@ -122,6 +122,7 @@ declare const _default: {
         'pisell2.checkout.manual-discount.no-amount': string;
         'pisell2.checkout.manual-discount.has-payment-items': string;
         'pisell2.checkout.manual-discount.invalid-amount': string;
+        'pisell2.checkout.can-not-change-deposit-amount': string;
         'pisell2.checkout.wallet-balance-confirm.title': string;
         'pisell2.checkout.wallet-balance-confirm.description-before': string;
         'pisell2.checkout.wallet-balance-confirm.description-after': string;
@@ -281,6 +282,7 @@ declare const _default: {
         'pisell2.checkout.manual-discount.no-amount': string;
         'pisell2.checkout.manual-discount.has-payment-items': string;
         'pisell2.checkout.manual-discount.invalid-amount': string;
+        'pisell2.checkout.can-not-change-deposit-amount': string;
         'pisell2.checkout.wallet-balance-confirm.title': string;
         'pisell2.checkout.wallet-balance-confirm.description-before': string;
         'pisell2.checkout.wallet-balance-confirm.description-after': string;
@@ -456,6 +458,7 @@ declare const _default: {
         'pisell2.checkout.manual-discount.no-amount': string;
         'pisell2.checkout.manual-discount.has-payment-items': string;
         'pisell2.checkout.manual-discount.invalid-amount': string;
+        'pisell2.checkout.can-not-change-deposit-amount': string;
         'pisell2.checkout.wallet-balance-confirm.title': string;
         'pisell2.checkout.wallet-balance-confirm.description-before': string;
         'pisell2.checkout.wallet-balance-confirm.description-after': string;

package/lib/components/checkout/locales.js

@@ -166,6 +166,7 @@ var locales_default = {
     "pisell2.checkout.manual-discount.no-amount": "No order amount available for discount",
     "pisell2.checkout.manual-discount.has-payment-items": "Order already contains payment items, cannot manually adjust price",
     "pisell2.checkout.manual-discount.invalid-amount": "Please enter a valid amount greater than 0",
+    "pisell2.checkout.can-not-change-deposit-amount": "Order already contains deposit payment items, cannot change deposit amount",
     // Wallet balance confirmation modal
     "pisell2.checkout.wallet-balance-confirm.title": "Apply wallet balance now",
     "pisell2.checkout.wallet-balance-confirm.description-before": " will be deducted from selected wallet balance, order will be marked as ",
@@ -354,6 +355,7 @@ var locales_default = {
     "pisell2.checkout.manual-discount.no-amount": "无可用的订单金额进行折扣",
     "pisell2.checkout.manual-discount.has-payment-items": "订单已经含有支付项，不可手动改价",
     "pisell2.checkout.manual-discount.invalid-amount": "请输入大于0的有效金额",
+    "pisell2.checkout.can-not-change-deposit-amount": "已经含有定金支付项，不可修改定金金额",
     // Wallet balance confirmation modal
     "pisell2.checkout.wallet-balance-confirm.title": "立即应用钱包余额",
     "pisell2.checkout.wallet-balance-confirm.description-before": " 将从所选钱包余额中扣除，订单将标记为 ",
@@ -574,6 +576,7 @@ var locales_default = {
     "pisell2.checkout.manual-discount.no-amount": "無可用的訂單金額進行折扣",
     "pisell2.checkout.manual-discount.has-payment-items": "訂單已經含有支付項，不可手動改價",
     "pisell2.checkout.manual-discount.invalid-amount": "請輸入大於0的有效金額",
+    "pisell2.checkout.can-not-change-deposit-amount": "已經含有定金支付項，不可修改定金金額",
     // Wallet balance confirmation modal
     "pisell2.checkout.wallet-balance-confirm.title": "立即應用錢包餘額",
     "pisell2.checkout.wallet-balance-confirm.description-before": " 將從所選錢包餘額中扣除，訂單將標記為 ",

package/lib/components/eftpos/deviceList/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const _default: ({ input, ...formItemProps }: any) => JSX.Element;
 export default _default;

package/lib/components/eftpos/form/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 递归循环表单数据
  * @Author: hongbing.wang

package/lib/components/eftpos/group/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { RadioGroupProps } from 'antd';
 export declare const CheckboxGroup: ({ direction, options, ...props }: any) => JSX.Element;
 export declare const RadioGroup: ({ direction, options, ...props }: RadioGroupProps & {

package/lib/components/eftpos/hooks.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos } from './const';
 /**
  * @title: tyro 设备连接

package/lib/components/eftpos/icon/apiKey.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/lib/components/eftpos/icon/device.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/lib/components/eftpos/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos, DeviceStatus } from './const';
 import './index.less';
 interface PosProps {

package/lib/components/eftpos/pos.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { DeviceProp } from "./const";
 interface PosProps {
     eftposName: string;

package/lib/components/eftpos/receipt/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 自定义组件设置
  * @description: 自定义组件设置

package/lib/components/eftpos/surcharge/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.css';
 /**
  * @title: 自定义组件设置

package/lib/components/eftposPay/component/alert/warn.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const _default: () => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/fail/network.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 断网(客户端)提示页

package/lib/components/eftposPay/component/fail/unknow.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 支付状态未知页面

package/lib/components/eftposPay/component/header/titlebar.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './titlebar.less';
 declare enum EPopupTitleBarVariantType {
     BackTitleClose = "back-title-cancel",

package/lib/components/eftposPay/component/manual/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 import './index.less';
 /**

package/lib/components/eftposPay/component/signature/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 取消签名确认页

package/lib/components/eftposPay/component/step/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;

package/lib/components/eftposPay/component/step/step.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: (props: {
     status: string;
     pedding?: string;

package/lib/components/eftposPay/hooks.d.ts

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "stripe" | "payo" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/components/eftposPay/linkly/hooks/normal.js

@@ -63,18 +63,18 @@ var useLinklyPayOrRefund = (handleCheck) => {
       content: [{ key: "response", value: JSON.stringify(res) }]
     });
     const status = (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.status;
-    if (status === 0) {
+    if (status == 0) {
       numRef.current = (_b = res == null ? void 0 : res.data) == null ? void 0 : _b.session_id;
       dispatch((0, import_store.updateState)({ number: numRef.current }));
       dispatch((0, import_store.updateCustom)({ actionStatus: import_const2.LinklyActionStatus.Cancel }));
       setTimeout(() => {
         var _a2;
         (_a2 = resultQueryRef.current) == null ? void 0 : _a2.call(resultQueryRef);
-      });
+      }, 300);
       return;
     }
     dispatch((0, import_store.updateCustom)({ actionStatus: import_const2.LinklyActionStatus.Empty }));
-    if (status === 1) {
+    if (status == 1) {
       (_c = handleLinklySuccessRef.current) == null ? void 0 : _c.call(handleLinklySuccessRef, res);
       return;
     }