@pisell/private-materials 6.5.11 → 6.5.13

package/lib/components/appointmentBooking/components/Services/index.js

@@ -95,20 +95,27 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
         delete product.option;
         if (isRetailTemplate) {
           if (data == null ? void 0 : data.isCancel) return;
-          appointmentBooking.storeProduct(product);
+          const res = appointmentBooking.storeProduct(product);
+          if (!res.success && res.errorCode === "not_enough_stock") {
+            return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unuse.stock"));
+          }
           return;
         }
         const session = data == null ? void 0 : data.session;
         if (session) {
           const startDate = (0, import_dayjs.default)(session == null ? void 0 : session.start_at).format("YYYY-MM-DD");
           const endDate = (0, import_dayjs.default)(session == null ? void 0 : session.end_at).format("YYYY-MM-DD");
-          appointmentBooking.addProductToCart({
+          const res = appointmentBooking.addProductToCart({
             product: { ...product },
             date: {
               startTime: `${startDate} ${session == null ? void 0 : session.start_time}`,
               endTime: `${endDate} ${session == null ? void 0 : session.end_time}`
             }
           });
+          if (!res.success && res.errorCode === "not_enough_stock") {
+            return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unuse.stock"));
+          }
+          appointmentBooking.closeProductDetail();
           await appointmentBooking.getAvailableDate({
             startDate,
             endDate
@@ -121,7 +128,10 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
               import_utils.locales.getText("pisell2.appointment.no.available.service")
             );
           }
-          appointmentBooking.storeProduct(product);
+          const res = appointmentBooking.storeProduct(product);
+          if (!res.success && res.errorCode === "not_enough_stock") {
+            return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unuse.stock"));
+          }
           if (type === "duration") {
             await appointmentBooking.getAvailableDate();
           }

package/lib/components/appointmentBooking/hooks.js

@@ -189,6 +189,12 @@ var useAppointmentBookingStep = () => {
       if (!result) {
         return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unuse.date"));
       }
+      const capacityResult = appointmentBooking.checkMaxDurationCapacity();
+      if (!capacityResult.success) {
+        const getMessage = import_utils.locales.getText("pisell2.appointment.unuse.capacity");
+        const message = typeof getMessage === "function" ? getMessage(capacityResult.minAvailableCount) : getMessage;
+        return (0, import_utils2.Toast)(message);
+      }
     }
     if (!isRetailTemplate && (currentKey == null ? void 0 : currentKey.startsWith("select-resource"))) {
       const { hasError, updatedCartList } = (0, import_utils2.checkAndMarkCartRenderError)(currentSelectedResources, appointmentBooking, utils);

package/lib/components/booking/addons/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/components/TabProduct/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

package/lib/components/booking/components/TabProduct/productItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

package/lib/components/booking/components/TabProduct/selectProductItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const SelectProductItem: ({ item, onClick, onChangeQuantity, amountSymbol, style, className, disabled, }: any) => JSX.Element;
 export default SelectProductItem;

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

@@ -1,2 +1 @@
-/// <reference types="react" />
 export declare const renderBundles: (item: any, amountSymbol: string) => JSX.Element;

package/lib/components/booking/components/emptyBooking/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 空状态
  * @description:

package/lib/components/booking/components/footer/FooterMenus/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const FooterMenus: ({ state, menuChange, items }: any) => JSX.Element | null;
 export default FooterMenus;

package/lib/components/booking/components/footer/index.js

@@ -593,7 +593,7 @@ var Footer = (props) => {
     messageShow = true,
     noSubmit = false
   }) => {
-    var _a2;
+    var _a2, _b2, _c2, _d2, _e2;
     (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
     if ((0, import_utils2.isDayBooking)(state)) {
       const isHasDayProducts = handleDaySubmit();
@@ -652,7 +652,20 @@ var Footer = (props) => {
         title: "saveBooking",
         content: [
           { key: "下单前数据", value: JSON.stringify(values) },
-          { key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") }
+          { key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") },
+          {
+            key: "店铺id",
+            value: (_e2 = (_d2 = (_c2 = (_b2 = store == null ? void 0 : store.getState) == null ? void 0 : _b2.call(store)) == null ? void 0 : _c2.global) == null ? void 0 : _d2.globalConfig) == null ? void 0 : _e2.id
+          },
+          {
+            key: "shopApi",
+            value: JSON.stringify(window == null ? void 0 : window.shopApi, (key, value) => {
+              if (typeof value === "function") {
+                return "function";
+              }
+              return value;
+            })
+          }
         ]
       });
       if (addonsEdit) {

package/lib/components/booking/components/formItemChildrenWrap/index.d.ts

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

package/lib/components/booking/editBookingModal/index.js

@@ -113,7 +113,12 @@ var EditBookingModal = (props, ref) => {
               _cloned[_idx] = _targetResource;
             }
           } else {
-            _cloned.push(_targetResource);
+            const _targetIdx = _cloned.findIndex((rs) => {
+              return rs.relation_id == (_targetResource == null ? void 0 : _targetResource.relation_id);
+            });
+            if (_targetIdx === -1) {
+              _cloned.push(_targetResource);
+            }
           }
           _initResourceVal = {
             ..._initResourceVal,

package/lib/components/booking/forms/footer.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface FooterProps {
     state: any;
     reload: () => void;

package/lib/components/booking/forms/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/forms/sendModal/useSendModal.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SendModalValues } from './index';
 declare const useSendModal: (bookingId?: number) => {
     open: boolean;

package/lib/components/booking/forms/single/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 表单选择器

package/lib/components/booking/forms/table/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Table: ({ value, onChange, field, mode, onAdd }: any) => JSX.Element;
 export default Table;

package/lib/components/booking/hooks/useClearCart.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useClearCart: (state: any, dispatch: any) => false | JSX.Element;
 export default useClearCart;

package/lib/components/booking/info/clientVariant/hooks/useClientFn.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;

package/lib/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
 export default useIsLowSpeedNetwork;

package/lib/components/booking/info/date/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export declare const updateServiceDate: (services: any[], date: any, isTime: boolean) => any[];
 declare const DateCom: () => JSX.Element;

package/lib/components/booking/info/dateRange/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 export declare const disabledDate: (current: any, position: any, currentDate: any) => any;
 declare const DateRange: ({ state, dispatch, key }: any) => JSX.Element;

package/lib/components/booking/info/model.d.ts

@@ -1,14 +1,5 @@
-/// <reference types="react" />
-import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/info/service/actions/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Actions: ({ currentService }: {
     currentService: any;

package/lib/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/lib/components/booking/info/service/like/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;

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

@@ -248,4 +248,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => never[] | Promise<any>;
+export declare const updateServicePrice: (state: any) => Promise<any> | never[];

package/lib/components/booking/info2/service/actions/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../../../info/service/actions/index.less';
 declare const Actions: ({ currentService }: {
     currentService: any;

package/lib/components/booking/info2/service/addService/utils.d.ts

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

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

@@ -156,6 +156,8 @@ declare const _default: {
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
         "pisell2.text.stock": string;
+        'pisell2.appointment.unuse.stock': string;
+        'pisell2.appointment.unuse.capacity': (count: number) => string;
         'pisell2.text.payment-link': string;
         'pisell2.text.send-mail': string;
         'pisell2.text.copy-to-clipboard': string;
@@ -458,6 +460,8 @@ declare const _default: {
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
         "pisell2.text.stock": string;
+        'pisell2.appointment.unuse.stock': string;
+        'pisell2.appointment.unuse.capacity': (count: number) => string;
         'pisell2.text.payment-link': string;
         'pisell2.text.send-mail': string;
         'pisell2.text.copy-to-clipboard': string;
@@ -760,6 +764,8 @@ declare const _default: {
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
         "pisell2.text.stock": string;
+        'pisell2.appointment.unuse.stock': string;
+        'pisell2.appointment.unuse.capacity': (count: number) => string;
         'pisell2.text.payment-link': string;
         'pisell2.text.send-mail': string;
         'pisell2.text.copy-to-clipboard': string;

package/lib/components/booking/locales.js

@@ -200,6 +200,8 @@ var locales_default = {
     "pisell2.text.deposit-delete-message": "It cannot be restored after deletion. Please confirm the operation.",
     "pisell2.text.deposit-paid": "Deposit paid",
     "pisell2.text.stock": "Stock",
+    "pisell2.appointment.unuse.stock": "Not enough stock",
+    "pisell2.appointment.unuse.capacity": (count) => `Only ${count} spots available. Please reduce quantity.`,
     "pisell2.text.payment-link": "Payment link",
     "pisell2.text.send-mail": "Send email",
     "pisell2.text.copy-to-clipboard": "Copy to clipboard",
@@ -540,6 +542,8 @@ var locales_default = {
     "pisell2.text.deposit-delete-message": "删除后不可恢复，请确认操作",
     "pisell2.text.deposit-paid": "已付定金",
     "pisell2.text.stock": "库存",
+    "pisell2.appointment.unuse.stock": "库存不足",
+    "pisell2.appointment.unuse.capacity": (count) => `仅可预约 ${count} 个，请减少数量`,
     "pisell2.text.payment-link": "付款链接",
     "pisell2.text.send-mail": "发送邮件",
     "pisell2.text.copy-to-clipboard": "复制到剪切板",
@@ -880,6 +884,8 @@ var locales_default = {
     "pisell2.text.deposit-delete-message": "刪除後不可恢復，請確認操作",
     "pisell2.text.deposit-paid": "已付定金",
     "pisell2.text.stock": "庫存",
+    "pisell2.appointment.unuse.stock": "庫存不足",
+    "pisell2.appointment.unuse.capacity": (count) => `僅可預約 ${count} 個，請減少數量`,
     "pisell2.text.payment-link": "付款鏈接",
     "pisell2.text.send-mail": "發送郵件",
     "pisell2.text.copy-to-clipboard": "複製到剪切板",

package/lib/components/booking/materiels/contacts/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare type ContactType = {
     country_calling_code: string;

package/lib/components/booking/materiels/duration/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface DurationProps extends SelectProps {
     locale?: string;

package/lib/components/booking/materiels/holder/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;

package/lib/components/booking/materiels/startTime/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from "antd";
 interface StartTimeProps extends SelectProps {
     locale?: string;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -106,11 +105,4 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/notes/NoteBlock/NoteItem/index.d.ts

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

package/lib/components/booking/notes/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/payments/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

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

package/lib/components/checkout/PaymentModal.js

@@ -109,6 +109,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)([]);
@@ -321,6 +322,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);
@@ -409,6 +411,7 @@ var PaymentContent = (0, import_react.forwardRef)(
               CheckoutHooks.OnBalanceDueAmountChanged,
               (data) => {
                 setBalanceDueAmount(data.newAmount);
+                setBalanceDueTotalAmount(data.totalAmount || "0");
               }
             );
             const orderSubmitStartUnsubscribe = core.effects.on(
@@ -453,17 +456,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",
@@ -937,7 +942,8 @@ var PaymentContent = (0, import_react.forwardRef)(
               amountButtons: recommendAmounts,
               customAmount,
               roundingFunction,
-              balanceDueAmount
+              balanceDueAmount,
+              balanceDueTotalAmount
             }
           )
         ),

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

@@ -365,8 +365,8 @@ function AmountSummary({
     let balanceAmountValue = parseFormattedAmount(getBalanceDueAmount());
     let balanceDecimal = new import_decimal.default(balanceAmountValue);
     const syncedVoucherAmount = paymentItems == null ? void 0 : paymentItems.reduce((acc, item) => {
-      if (item.voucher_id && item.isSynced && (paymentType === "regular" && item.order_payment_type !== "deposit" || paymentType === "deposit" && item.order_payment_type === "deposit")) {
-        return acc.plus(item.amount).plus(item.rounding_amount);
+      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();
@@ -447,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();
@@ -456,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();

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 handleAmountClick = (clickedAmount) => {
@@ -126,7 +128,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

@@ -90,15 +90,10 @@ function PaymentDetailModal({
   const getTotalPaidAmount = () => {
     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(Math.abs(item.rounding_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 getTotalVoucherAmount = () => {
-    return paymentItems.filter((item) => item.voucher_id).reduce((total, item) => {
-      return new import_decimal.default(total).plus(new import_decimal.default(Math.abs(item.amount))).toNumber();
-    }, 0);
-  };
   const getBalanceDueAmount = () => {
     return new import_decimal.default(orderInfo.totalAmount || 0).sub(new import_decimal.default(getTotalPaidAmount())).toNumber().toFixed(2);
   };
@@ -115,10 +110,10 @@ function PaymentDetailModal({
       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"));
     }
     const depositPaymentSummary = depositPayments.reduce((acc, item) => {
-      return new import_decimal.default(acc).plus(new import_decimal.default(item.amount)).plus(new import_decimal.default(Math.abs(item.rounding_amount || 0))).toNumber();
+      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(Math.abs(item.rounding_amount || 0))).toNumber();
+      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,
@@ -126,7 +121,7 @@ function PaymentDetailModal({
       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(Math.abs(item.rounding_amount))).toNumber(),
+      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,
@@ -148,7 +143,7 @@ function PaymentDetailModal({
       useThousandsSeparator: true,
       showCurrencySymbol: true
     }))), 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(Math.abs(item.rounding_amount))).toNumber(),
+      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,

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

@@ -87,8 +87,10 @@ function PaymentOptionsModule({
       }
     },
     {
-      wait: 500
+      wait: 1e3,
       // 500ms 防抖延迟
+      leading: true,
+      trailing: false
     }
   );
   return /* @__PURE__ */ import_react.default.createElement(