@pisell/private-materials 6.4.46 → 6.4.48

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

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

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {

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/info2/service/serviceItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

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

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

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

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

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

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

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

@@ -1,3 +1,4 @@
+/// <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/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 | {
+}) => number | "flexible" | {
     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

@@ -151,6 +151,19 @@ var PaymentContent = (0, import_react.forwardRef)(
           return method.code === "CASHMANUAL" || method.type === "CASHMANUAL" || ((_a3 = method.name) == null ? void 0 : _a3.toLowerCase().includes("cash"));
         }
       );
+      logger == null ? void 0 : logger.addLog({
+        type: "info",
+        title: "open_till",
+        metadata: {}
+      });
+      (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.postMessageToApp) == null ? void 0 : _b2.call(_a2, {
+        module: "till",
+        key: "open_till",
+        data: {
+          type: "cash"
+          // cash 不需要验证钱箱权限
+        }
+      });
       await (checkoutModule == null ? void 0 : checkoutModule.addPaymentItemAsync({
         amount: result.amount,
         /** 支付类型，跟支付列表上对应的支付方式保持一致 */
@@ -165,23 +178,11 @@ var PaymentContent = (0, import_react.forwardRef)(
         voucher_id: 0,
         rounding_amount: result.roundingAmount
       }));
-      logger == null ? void 0 : logger.addLog({
-        type: "info",
-        title: "open_till",
-        metadata: {}
-      });
-      (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.postMessageToApp) == null ? void 0 : _b2.call(_a2, {
-        module: "till",
-        key: "open_till",
-        data: {
-          type: "cash"
-          // cash 不需要验证钱箱权限
-        }
-      });
     };
     const processSurcharge = (surcharge) => {
       if (typeof surcharge === "string") {
-        return surcharge.replace(/^[$¥€£]+/, "");
+        const match = surcharge.match(/\d+(?:\.\d+)?/);
+        return match ? match[0] : void 0;
       }
       if (typeof surcharge === "number") {
         return String(surcharge);
@@ -672,7 +673,7 @@ var PaymentContent = (0, import_react.forwardRef)(
           select.forEach((item) => {
             var _a2, _b2, _c2, _d;
             const mapCode = item.code ? import_constants.WALLET_PASS_CODE_MAP[item.code] : null;
-            if (mapCode) {
+            if (mapCode && walletPassDetail.map[mapCode]) {
               voucherItems.push({
                 /** 支付金额 */
                 amount: item.amount,
@@ -1729,6 +1730,17 @@ var PaymentModal = ({
                     }
                   ),
                   onClick: handleOrderNoteClick
+                },
+                enabledAutoPrint ? {
+                  key: "print",
+                  label: import_utils.locales.getText("payment.result.printReceipt"),
+                  icon: /* @__PURE__ */ import_react.default.createElement(import_icon.Printer, { className: getClassName("action-icon") }),
+                  onClick: handlePrintReceiptClick
+                } : {
+                  key: "details",
+                  label: import_utils.locales.getText("payment.result.details"),
+                  icon: /* @__PURE__ */ import_react.default.createElement(import_icon.FileCheck02, { className: getClassName("action-icon") }),
+                  onClick: handleDetailsClick
                 }
               ],
               buttonProps: {
@@ -1741,7 +1753,7 @@ var PaymentModal = ({
       case "partially_paid":
         return [
           [
-            {
+            enabledAutoPrint ? {
               id: "details",
               buttonProps: {
                 className: getClassName("action-button"),
@@ -1749,6 +1761,14 @@ var PaymentModal = ({
                 icon: /* @__PURE__ */ import_react.default.createElement(import_icon.FileCheck02, { className: getClassName("action-icon") }),
                 children: import_utils.locales.getText("payment.result.details")
               }
+            } : {
+              id: "print",
+              buttonProps: {
+                className: getClassName("action-button"),
+                onClick: handlePrintReceiptClick,
+                icon: /* @__PURE__ */ import_react.default.createElement(import_icon.Printer, { className: getClassName("action-icon") }),
+                children: import_utils.locales.getText("payment.result.printReceipt")
+              }
             },
             {
               id: "more",
@@ -1764,6 +1784,17 @@ var PaymentModal = ({
                     }
                   ),
                   onClick: handleOrderNoteClick
+                },
+                enabledAutoPrint ? {
+                  key: "print",
+                  label: import_utils.locales.getText("payment.result.printReceipt"),
+                  icon: /* @__PURE__ */ import_react.default.createElement(import_icon.Printer, { className: getClassName("action-icon") }),
+                  onClick: handlePrintReceiptClick
+                } : {
+                  key: "details",
+                  label: import_utils.locales.getText("payment.result.details"),
+                  icon: /* @__PURE__ */ import_react.default.createElement(import_icon.FileCheck02, { className: getClassName("action-icon") }),
+                  onClick: handleDetailsClick
                 }
               ],
               buttonProps: {
@@ -1971,10 +2002,9 @@ var PaymentModal = ({
         open: showRetryModal,
         title: import_utils.locales.getText("pisell2.checkout.tips"),
         footer: null,
-        closable: false,
-        maskClosable: false,
         keyboard: false,
         onCancel: () => {
+          setShowRetryModal(false);
         }
         // 禁用关闭
       }

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

@@ -1,5 +1,5 @@
 .additional-module {
-  // padding-bottom: 16px; // 底部间距
+  padding-bottom: 2px; // 底部间距
 
   // 标题样式
   &-title {

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

@@ -229,15 +229,11 @@ function AmountSummary({
     return totalDecimal.toNumber();
   };
   const getKeyboardLimits = () => {
-    const walletTotal = getWalletTotalAmount();
-    const walletTotalDecimal = new import_decimal.default(walletTotal);
     const orderDueDecimal = new import_decimal.default(Number(balanceDueAmount || 0));
     const minDecimal = new import_decimal.default(0.01);
-    const diffDecimal = orderDueDecimal.minus(walletTotalDecimal);
-    const maxAmountDecimal = import_decimal.default.max(minDecimal, diffDecimal);
     return {
       min: minDecimal.toNumber(),
-      max: maxAmountDecimal.toNumber()
+      max: orderDueDecimal.toNumber()
     };
   };
   const _formatInputAmount = (value) => {
@@ -266,9 +262,6 @@ function AmountSummary({
       );
       return;
     }
-    if (!inputStr || numericValue <= 0) {
-      numericValue = getOrderDueAmount();
-    }
     const minDecimal = new import_decimal.default(limits.min);
     const maxDecimal = new import_decimal.default(limits.max);
     const valueDecimal = new import_decimal.default(numericValue);
@@ -463,6 +456,9 @@ function AmountSummary({
       return depositPaidAmount < new import_decimal.default(totalAmount).toNumber();
     }
   }, [paymentItems, paymentType, totalAmount]);
+  const showCancelSplitPayment = (0, import_react.useMemo)(() => {
+    return balanceDueAmount !== customAmount;
+  }, [customAmount, balanceDueAmount]);
   const handleChangeDepositAmount = (value) => {
     console.log("handleChangeDepositAmount", value);
     checkoutModule == null ? void 0 : checkoutModule.setDepositAmountAsync(value);
@@ -511,7 +507,7 @@ 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(
         import_pisellSimplePriceKeyboardPopover.default,
         {
-          value: (orderInfo == null ? void 0 : orderInfo.depositAmount) || "0",
+          value: balanceDueAmount || "0",
           onConfirm: handleChangeDepositAmount,
           showCurrencySymbol: true,
           useThousandsSeparator: true,
@@ -570,7 +566,7 @@ function AmountSummary({
         ))
       )
     ),
-    !shouldShowConfirmMode() && /* @__PURE__ */ import_react2.default.createElement(
+    !shouldShowConfirmMode() && (showCancelSplitPayment ? /* @__PURE__ */ import_react2.default.createElement(import_antd.Button, { className: (0, import_classnames.default)("cancel-split-payment-button"), onClick: () => onAmountChange == null ? void 0 : onAmountChange(balanceDueAmount) }, getText("split.cancel") || "取消部\n分支付") : /* @__PURE__ */ import_react2.default.createElement(
       import_antd.Popover,
       {
         content: /* @__PURE__ */ import_react2.default.createElement("div", { onClick: (e) => e.stopPropagation() }, /* @__PURE__ */ import_react2.default.createElement(
@@ -610,7 +606,7 @@ function AmountSummary({
         destroyTooltipOnHide: true
       },
       /* @__PURE__ */ import_react2.default.createElement(import_antd.Button, { className: (0, import_classnames.default)("split-payment-button") }, getText("split.payment") || "拆分支付")
-    ),
+    )),
     /* @__PURE__ */ import_react2.default.createElement(
       import_materials.PisellModal,
       {

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

@@ -476,6 +476,7 @@
 }
 
 .split-payment-button {
+  width: 80px;
   padding: 0 8px;
   background: #079455;
   color: white;
@@ -485,4 +486,16 @@
   white-space: pre-line; // 让换行符(\n)生效
   text-align: left; // 确保文本居中对齐
   min-width: 68px;
+}
+.cancel-split-payment-button {
+  width: 80px;
+  padding: 0 8px;
+  background: #DF5342;
+  color: white;
+  font-size: 14px;
+  border: 1px solid #C3B2E7;
+  height: 80px;
+  white-space: pre-line; // 让换行符(\n)生效
+  text-align: left; // 确保文本居中对齐
+  min-width: 68px;
 }

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

@@ -97,7 +97,9 @@ function CashPaymentModule({
     }
   };
   const { run: handleCashPay } = (0, import_ahooks.useDebounceFn)(handleCashPayInternal, {
-    wait: 500
+    wait: 500,
+    leading: true,
+    trailing: false
   });
   const handleKeyboardConfirm = async (value) => {
     if (isInputDisabled) {

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

@@ -62,6 +62,7 @@ var PaymentMethodItem = ({
     return baseAmount + surcharge;
   };
   const handleRightButtonClick = (e) => {
+    if (!isEftpos) return;
     e.preventDefault();
     if (disabled || !onClick) {
       return;
@@ -84,14 +85,11 @@ var PaymentMethodItem = ({
     }
   };
   const isEftpos = method.code === "EFTPOS" || method.type === "eftpos";
-  const renderLeftContent = () => /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-payment-method-left") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-icon-container") }, renderPaymentIcon(method)), /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-payment-info") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-payment-info-inner") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-payment-name") }, method.name), /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-payment-info-inner-surcharge") }, !!(method == null ? void 0 : method.is_surcharge) && calculateSurcharge(method) !== 0 && /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-surcharge-text") }, (getText == null ? void 0 : getText("pisell2.payment-options.surcharge-label", "Surcharge")) || "Surcharge", ":", (0, import_utils.formatAmount)(calculateSurcharge(method), 2, amountSymbol)), !isEftpos && /* @__PURE__ */ import_react.default.createElement(
-    "div",
-    {
-      className: (0, import_classnames.default)("payment-options-module-surcharge-text"),
-      style: { cursor: "pointer" }
-    },
-    /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-edit-05", style: { fontSize: "24px", color: disabled ? "#D0D5DD" : "#7F56DA" } })
-  )))));
+  const showKeyboard = () => {
+    if (isEftpos) return;
+    setIsKeyboardVisible(true);
+  };
+  const renderLeftContent = () => /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-payment-method-left") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-icon-container") }, renderPaymentIcon(method)), /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-payment-info") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-payment-info-inner") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-payment-name") }, method.name), /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-payment-info-inner-surcharge") }, !!(method == null ? void 0 : method.is_surcharge) && calculateSurcharge(method) !== 0 && /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-surcharge-text") }, (getText == null ? void 0 : getText("pisell2.payment-options.surcharge-label", "Surcharge")) || "Surcharge", ":", (0, import_utils.formatAmount)(calculateSurcharge(method), 2, amountSymbol)), false))));
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     "button",
     {
@@ -102,57 +100,11 @@ var PaymentMethodItem = ({
           "payment-options-module-disabled": disabled
         }
       ),
+      onClick: showKeyboard,
       type: "button",
       disabled
     },
-    !isEftpos ? /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Popover,
-      {
-        content: /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(
-          import_priceKeyboard.PaymentKeyboard,
-          {
-            paymentOriginalValue: String(customAmount || 0),
-            paymentDefaultValue: String(customAmount || 0),
-            enableExceedMaxAmount: !isEftpos,
-            payment: {
-              enable: true
-            },
-            surcharge: {
-              enable: !!(method == null ? void 0 : method.is_surcharge) && calculateSurcharge(method) !== 0
-            },
-            surchargeDefaultValue: {
-              percent: method.percentage ? String(Number(method.percentage) * 100) : "",
-              fixed: method.fixed ? String(method.fixed) : ""
-            },
-            selectType: "light",
-            onChange: (value) => {
-              console.log(value);
-            },
-            onPay: (args) => {
-              var _a, _b;
-              console.log(args);
-              setIsKeyboardVisible(false);
-              if (onClick) {
-                onClick({
-                  ...method,
-                  fixed: Number(((_a = args.surcharge) == null ? void 0 : _a.fixed) || 0),
-                  percentage: ((_b = args.surcharge) == null ? void 0 : _b.percent) ? Number(args.surcharge.percent) / 100 : 0,
-                  totalAmount: String((0, import_utils.formatAmount)(args.amount, 2))
-                });
-              }
-            }
-          }
-        )),
-        trigger: "click",
-        open: isKeyboardVisible,
-        onOpenChange: setIsKeyboardVisible,
-        placement: "bottom",
-        overlayClassName: "payment-keyboard-popover",
-        arrow: true,
-        destroyTooltipOnHide: true
-      },
-      /* @__PURE__ */ import_react.default.createElement("div", null, renderLeftContent())
-    ) : renderLeftContent(),
+    renderLeftContent(),
     /* @__PURE__ */ import_react.default.createElement(
       "div",
       { className: (0, import_classnames.default)("payment-options-module-payment-method-right"), onClick: handleRightButtonClick },
@@ -167,6 +119,45 @@ var PaymentMethodItem = ({
         /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-a-arrow-circle-right2", style: { fontSize: "30px", color: disabled ? "#D0D5DD" : "#7F56DA" } })
       )
     )
+  ), /* @__PURE__ */ import_react.default.createElement(
+    import_priceKeyboard.PaymentKeyboard,
+    {
+      containerProps: {
+        renderType: "modal",
+        open: isKeyboardVisible,
+        onCancel: () => setIsKeyboardVisible(false)
+      },
+      paymentOriginalValue: String(customAmount || 0),
+      paymentDefaultValue: String(customAmount || 0),
+      enableExceedMaxAmount: !isEftpos,
+      payment: {
+        enable: true
+      },
+      surcharge: {
+        enable: !!(method == null ? void 0 : method.is_surcharge) && calculateSurcharge(method) !== 0
+      },
+      surchargeDefaultValue: {
+        percent: method.percentage ? String(Number(method.percentage) * 100) : "",
+        fixed: method.fixed ? String(method.fixed) : ""
+      },
+      selectType: "dark",
+      onChange: (value) => {
+        console.log(value);
+      },
+      onPay: (args) => {
+        var _a, _b;
+        console.log(args);
+        setIsKeyboardVisible(false);
+        if (onClick) {
+          onClick({
+            ...method,
+            fixed: Number(((_a = args.surcharge) == null ? void 0 : _a.fixed) || 0),
+            percentage: ((_b = args.surcharge) == null ? void 0 : _b.percent) ? Number(args.surcharge.percent) / 100 : 0,
+            totalAmount: String((0, import_utils.formatAmount)(args.amount, 2))
+          });
+        }
+      }
+    }
   ));
 };
 var PaymentMethodItem_default = PaymentMethodItem;

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

@@ -281,9 +281,3 @@
     /* 标题保持正常颜色 */
   }
 }
-
-.payment-keyboard-popover {
-  .pisell-lowcode-popover-inner{
-    padding: 0;
-  }
-}

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

@@ -92,10 +92,13 @@ var PaymentResultToast = (0, import_react.memo)((props) => {
     mask = false,
     maskClosable = false,
     closable = true,
-    zIndex
+    zIndex,
+    clickOutsideToClose = true
   } = props;
   const [isAnimating, setIsAnimating] = (0, import_react.useState)(false);
   const countdownTimeoutRef = (0, import_react.useRef)(null);
+  const modalContentRef = (0, import_react.useRef)(null);
+  const modalRef = (0, import_react.useRef)(null);
   const onCloseRef = (0, import_react.useRef)(onClose);
   const onCountdownCompleteRef = (0, import_react.useRef)(onCountdownComplete);
   onCloseRef.current = onClose;
@@ -133,6 +136,27 @@ var PaymentResultToast = (0, import_react.memo)((props) => {
   (0, import_react.useEffect)(() => {
     return clearCountdown;
   }, [clearCountdown]);
+  (0, import_react.useEffect)(() => {
+    if (!clickOutsideToClose || !visible) {
+      return;
+    }
+    const handleClickOutside = (event) => {
+      var _a;
+      const target = event.target;
+      const modalContent = modalContentRef.current;
+      if (!modalContent) {
+        return;
+      }
+      if (!modalContent.contains(target)) {
+        clearCountdown();
+        (_a = onCloseRef.current) == null ? void 0 : _a.call(onCloseRef);
+      }
+    };
+    document.addEventListener("mousedown", handleClickOutside);
+    return () => {
+      document.removeEventListener("mousedown", handleClickOutside);
+    };
+  }, [clickOutsideToClose, visible, clearCountdown]);
   const handleClose = (0, import_react.useCallback)(() => {
     var _a;
     clearCountdown();
@@ -228,6 +252,7 @@ var PaymentResultToast = (0, import_react.memo)((props) => {
     /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
+        ref: modalContentRef,
         className: getClassName("content", statusClassName),
         style: {
           position: "relative",

package/lib/components/checkout/components/PaymentResultToast/types.d.ts

@@ -54,4 +54,6 @@ export interface PaymentResultToastConfig {
     closable?: boolean;
     /** 弹窗层级 */
     zIndex?: number;
+    /** 是否启用点击外部区域关闭弹窗（使用纯JS实现） */
+    clickOutsideToClose?: boolean;
 }

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 export interface IScanResult {
     status: 'success' | 'failed';

package/lib/components/checkout/components/WalletPassModule/utils.js

@@ -89,14 +89,14 @@ var formatDiscountWalletData = (data, selectId = []) => {
     var _a, _b, _c;
     let name = "";
     let storeName = "";
-    if (item.tag === "product_discount_card") {
+    if (item.tag === "product_discount_card" || item.tag === "discount_card") {
       if (((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.discount_card_type) === "fixed_amount") {
         const amountValue = (item == null ? void 0 : item.savedAmount) ? item == null ? void 0 : item.savedAmount : item.par_value;
         name = /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.checkout.discount.fixed_amount"), " ", /* @__PURE__ */ import_react.default.createElement(Amount, { value: amountValue, showCurrencySymbol: true }));
       } else {
-        name = import_utils.locales.getText("pisell2.checkout.discount.percentage.off")(item.par_value);
+        name = import_utils.locales.getText("pisell2.checkout.discount.percentage.off")(item.par_value || item.discount.percent);
       }
-      storeName = item.product_name;
+      storeName = item.product_name || item.format_title.auto;
     } else if (item.tag === "good_pass") {
       name = item.product_name;
       const left = Number(item.balance) || 0;
@@ -106,7 +106,8 @@ var formatDiscountWalletData = (data, selectId = []) => {
       name = item.product_name;
     }
     if (!name && item.isEditMode) {
-      name = item.name;
+      name = item.amount;
+      storeName = item.format_title.auto;
     }
     return {
       ...item,

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

@@ -539,14 +539,17 @@ var useWalletPass = (props) => {
             import_utils.locales.getText("wallet-pass-module-already-best-combination")
           );
         } else {
-          setWalletSelect(searchIdentificationCodeList);
+          const select = searchIdentificationCodeList.filter((item) => item.unified_available_status);
+          setWalletSelect(select);
           handleFetchUserIdentificationCodes(
-            searchIdentificationCodeList.map((item) => item.id),
-            searchIdentificationCodeList
-          );
-          Toast == null ? void 0 : Toast.success(
-            import_utils.locales.getText("wallet-pass-module-best-combination-selected")
+            select.map((item) => item.id),
+            select
           );
+          if (select.length) {
+            Toast == null ? void 0 : Toast.success(
+              import_utils.locales.getText("wallet-pass-module-best-combination-selected")
+            );
+          }
         }
       }
       return;

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

@@ -25,6 +25,7 @@ declare const _default: {
         'partial.paid': string;
         'deposit.partial.paid': string;
         'split.payment': string;
+        'split.cancel': string;
         cash: string;
         rounding: string;
         'cash.payment': string;
@@ -191,6 +192,7 @@ declare const _default: {
         'partial.paid': string;
         'deposit.partial.paid': string;
         'split.payment': string;
+        'split.cancel': string;
         cash: string;
         rounding: string;
         'cash.payment': string;
@@ -357,6 +359,7 @@ declare const _default: {
         'partial.paid': string;
         'deposit.partial.paid': string;
         'split.payment': string;
+        'split.cancel': string;
         cash: string;
         rounding: string;
         'cash.payment': string;