@pisell/private-materials 6.5.10 → 6.5.12

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

@@ -88,10 +88,11 @@ function PaymentDetailModal({
     return (item.code === "cash" || item.type === "custom") && !item.isSynced;
   };
   const getTotalPaidAmount = () => {
-    return paymentItems.filter((item) => !item.voucher_id || item.isSynced).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 = () => {
     return new import_decimal.default(orderInfo.totalAmount || 0).sub(new import_decimal.default(getTotalPaidAmount())).toNumber().toFixed(2);
@@ -103,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"),
@@ -125,12 +164,6 @@ function PaymentDetailModal({
   const renderVoucherItems = () => {
     var _a;
     const items = [];
-    const voucherPayments = paymentItems.filter((item) => item.voucher_id && item.isSynced);
-    voucherPayments.forEach((item) => {
-      items.push(
-        /* @__PURE__ */ import_react.default.createElement("div", { key: `payment-${item.uuid}`, className: (0, import_classnames.default)("balance-item-row") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("balance-item-text") }, item.name, " - ", item.voucher_id), /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("balance-item-amount") }, "-$", Math.abs(item.amount).toFixed(2)))
-      );
-    });
     if ((_a = walletPassData == null ? void 0 : walletPassData.selectedWallet) == null ? void 0 : _a.length) {
       walletPassData.selectedWallet.forEach((wallet) => {
         items.push(

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/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(

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/eftposPay/amount.d.ts

@@ -8,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, containerStyle, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -15,7 +15,7 @@ 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<"success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;

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;
     }

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

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/components/eftposPay/linkly/hooks/useTimeQuery.ts
@@ -24,15 +34,16 @@ __export(useTimeQuery_exports, {
 module.exports = __toCommonJS(useTimeQuery_exports);
 var import_react = require("react");
 var import_utils = require("@pisell/utils");
+var import_dayjs = __toESM(require("dayjs"));
 var import_store = require("../../store");
 var import_hooks = require("../../hooks");
 var import_const = require("../../const");
 var import_const2 = require("../const");
-var GlobalTimeout = 1e3 * 60;
+var GlobalTimeout = 1e3 * 60 * 2;
 var RequestTimeout = 1e3 * 5;
 var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
   const dispatch = (0, import_store.useDispatch)();
-  const { numRef, modeRef, deviceRef } = (0, import_hooks.useStoreRef)();
+  const { numRef, modeRef, deviceRef, orderIdRef } = (0, import_hooks.useStoreRef)();
   const fail = (0, import_hooks.useFail)(0);
   const failRef = (0, import_react.useRef)(fail);
   const isPay = modeRef.current === import_const.ModeEnum.Pay || modeRef.current === import_const.ModeEnum.FullPay;
@@ -80,30 +91,44 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
         console.log("Success: 全局超时或不需要处理结果，终止查询");
         return;
       }
-      _log("Success" /* Success */, result);
       isQueryFinishedRef.current = true;
       const data = (result == null ? void 0 : result.data) || {};
-      if (data.status === 1) {
+      if (data.status == 1) {
         console.log("交易成功，终止查询");
+        (0, import_utils.sendWarningLog)({
+          title: `Linkly-${isPay ? "Pay" : "Refund"}-交易成功`,
+          content: [{ key: "response", value: JSON.stringify(result) }]
+        });
         reset();
         handleLinklySuccess(result);
         return;
       }
-      if (data.status !== void 0 && (data == null ? void 0 : data.status) === 0) {
+      if ((data == null ? void 0 : data.status) == 0 && (data == null ? void 0 : data.signature_flag) != 1) {
         console.log("交易状态为0需要继续查询");
+        _log("Querying" /* Querying */, result);
         isQueryFinishedRef.current = false;
-        _resultQuery();
+        setTimeout(() => {
+          _resultQuery();
+        }, 1500);
         return;
       }
       if (data.status < 0) {
         console.log("交易失败，终止查询");
+        (0, import_utils.sendWarningLog)({
+          title: `Linkly-${isPay ? "Pay" : "Refund"}-交易失败`,
+          content: [{ key: "response", value: JSON.stringify(result) }]
+        });
         reset();
         result.code = import_const.PayStatus.Unknown;
         (_a2 = failRef.current) == null ? void 0 : _a2.call(failRef, result, false);
         return;
       }
-      if (data.signature_flag === 1) {
+      if (data.signature_flag == 1) {
         console.log("交易需要签名，终止查询");
+        (0, import_utils.sendWarningLog)({
+          title: `Linkly-${isPay ? "Pay" : "Refund"}-交易需要签名`,
+          content: [{ key: "response", value: JSON.stringify(result) }]
+        });
         reset();
         gotoSignature();
         return;
@@ -120,7 +145,18 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
         _log("AbortError" /* AbortError */);
         console.log("Error: 请求被取消，将继续查询");
         isQueryFinishedRef.current = false;
-        _resultQuery();
+        setTimeout(() => {
+          _resultQuery();
+        }, 1500);
+        return;
+      }
+      if (!(error == null ? void 0 : error.code) || `${error.code}` === import_const.PayStatus.Timeout) {
+        _log("NetworkError" /* NetworkError */);
+        console.log("Error: 网关类报错，将继续查询");
+        isQueryFinishedRef.current = false;
+        setTimeout(() => {
+          _resultQuery();
+        }, 1500);
         return;
       }
       _log("Error" /* Error */, error);
@@ -185,23 +221,29 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
       session_id: numRef.current
     };
     const content = [
-      { key: "queryId", value: JSON.stringify(queryIdRef.current) },
+      {
+        key: "description",
+        value: JSON.stringify({
+          queryId: queryIdRef.current,
+          orderId: orderIdRef.current,
+          type,
+          date: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
+        })
+      },
       { key: "params", value: JSON.stringify(params) }
     ];
-    if (type === "Success" /* Success */) {
-      content.push({ key: "response", value: JSON.stringify(res) });
-    } else if (type === "Error" /* Error */) {
+    if (type === "Error" /* Error */) {
       content.push({ key: "error", value: JSON.stringify(res) });
+    } else {
+      content.push({ key: "response", value: JSON.stringify(res) });
     }
     (0, import_utils.sendWarningLog)({
-      title: `Linkly-${isPay ? "Pay" : "Refund"}-结果查询--${type}`,
+      title: `Linkly-${isPay ? "Pay" : "Refund"}-交易结果轮询`,
       content
     });
   };
   const run = () => {
     reset();
-    console.log("开始查询linkly结果---->>>>>>>");
-    _log("Start" /* Start */);
     globalTimeoutIdRef.current = setTimeout(() => {
       var _a;
       console.log("全局超时，终止所有重试");
@@ -212,6 +254,8 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
     startTimeRef.current = Date.now();
     isQueryFinishedRef.current = false;
     queryIdRef.current = (0, import_utils.getUniqueId)();
+    console.log("开始查询linkly结果---->>>>>>>");
+    _log("Start" /* Start */);
     return _resultQuery();
   };
   return { run, stop: reset };

package/lib/components/eftposPay/payo/config.js

@@ -148,15 +148,15 @@ var POS = ({
     const resultPromise = modeRef.current === import_const.ModeEnum.Pay || modeRef.current === import_const.ModeEnum.FullPay ? api.pay(
       {
         ...(custom == null ? void 0 : custom.platform) ? {
-          "operator_id": custom.operator_id,
-          "operator_type": custom.operator_type,
-          "platform": custom.platform,
-          "custom_payment_id": custom.custom_payment_id,
-          "service_charge": {
-            "amount": payRef.current.surMoney,
-            "percentage": payRef.current.surPercentRate
+          operator_id: custom.operator_id,
+          operator_type: custom.operator_type,
+          platform: custom.platform,
+          custom_payment_id: custom.custom_payment_id,
+          service_charge: {
+            amount: payRef.current.surMoney,
+            percentage: payRef.current.surPercentRate
           },
-          "original_amount": payRef.current.amount
+          original_amount: payRef.current.amount
         } : {},
         order_id: orderIdRef.current,
         amount: payRef.current.total,
@@ -215,7 +215,7 @@ var POS = ({
       if (unloadRef.current || !netRef.current) {
         return;
       }
-      if (err && `${err.code}` === import_const.PayStatus.Timeout) {
+      if (!(err == null ? void 0 : err.code) || `${err.code}` === import_const.PayStatus.Timeout) {
         checkApi();
         return;
       }

package/lib/components/eftposPay/serve.js

@@ -52,7 +52,7 @@ var payData = async (params, config) => import_utils.request.getRequest().post("
 var refundData = async (params, config) => import_utils.request.getRequest().post("/shop/pay/card-reader/refund", params, config);
 var addTransaction = async (params, config) => import_utils.request.getRequest().post("/shop/pay/card-reader/transaction", params, config);
 var editTransaction = async (id, params, config) => import_utils.request.getRequest().put(`/shop/pay/card-reader/transaction/${id}`, params, config);
-var linklyPayQuery = async (params, config) => import_utils.request.getRequest().get("/shop/shop/linkly/pay/query", params, config);
+var linklyPayQuery = async (params, config) => import_utils.request.getRequest().get("/shop/linkly/pay/query", params, config);
 var linklyRefundQuery = async (params, config) => import_utils.request.getRequest().get("/shop/linkly/refund/query", params, config);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/components/eftposPay/store/index.d.ts

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "success" | "warn" | "loading" | "fail" | "question";
+        status: "loading" | "warn" | "success" | "fail" | "question";
     };
 };
 /**
@@ -295,7 +295,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
+        mode?: "refund" | "fullPay" | "pay" | "query" | undefined;
         order_id?: string | number | undefined;
         eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/lib/components/index.d.ts

@@ -17,4 +17,6 @@ import PisellSelectCustomerModal from './pisellSelectCustomerModal';
 import SubTotal from './subTotal';
 import EditBookingModal from './booking/editBookingModal';
 import StepController from './stepController';
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController };
+import PinModal from './pinModal';
+import PinVerifyModal from './pinVerifyModal';
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, };

package/lib/components/index.js

@@ -36,6 +36,8 @@ __export(components_exports, {
   BookingNotes: () => import_notes.default,
   EditBookingModal: () => import_editBookingModal.default,
   Login: () => import_login.default,
+  PinModal: () => import_pinModal.default,
+  PinVerifyModal: () => import_pinVerifyModal.default,
   PisellSelectCustomerModal: () => import_pisellSelectCustomerModal.default,
   ProductExtension: () => import_productExtension.default,
   RuleSetting: () => import_ruleSetting.default,
@@ -69,6 +71,8 @@ var import_pisellSelectCustomerModal = __toESM(require("./pisellSelectCustomerMo
 var import_subTotal = __toESM(require("./subTotal"));
 var import_editBookingModal = __toESM(require("./booking/editBookingModal"));
 var import_stepController = __toESM(require("./stepController"));
+var import_pinModal = __toESM(require("./pinModal"));
+var import_pinVerifyModal = __toESM(require("./pinVerifyModal"));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Booking,
@@ -78,6 +82,8 @@ var import_stepController = __toESM(require("./stepController"));
   BookingNotes,
   EditBookingModal,
   Login,
+  PinModal,
+  PinVerifyModal,
   PisellSelectCustomerModal,
   ProductExtension,
   RuleSetting,

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js

@@ -171,6 +171,7 @@ var createThreeDSMethodIframe = async (threeDSMethodData, callback) => {
     return defaultReturnParams;
   }
   const displayBox = document.getElementById("threeds-container");
+  displayBox.innerHTML = "";
   let iframe = document.createElement("iframe");
   iframe.classList.add("hidden_TDS_From");
   iframe.name = "threeDSMethodIframe";
@@ -286,6 +287,7 @@ var checkTDSAuth = async (step2, step3, callback) => {
 };
 var createChallengeIframe = (challengeData, callback) => {
   const displayBox = document.getElementById("threeds-container");
+  displayBox.innerHTML = "";
   let iframe = document.createElement("iframe");
   iframe.classList.add("tdsv2challengeIframe");
   iframe.name = "challengeIframe";

package/lib/components/pay/toC/PaymentMethods/WalletPass/List/index.d.ts

@@ -11,6 +11,8 @@ export interface WalletPassListProps {
         name: string;
     };
     onChangeDebounce?: boolean;
+    loading?: boolean;
+    onLoadingChange?: (loading: boolean) => void;
 }
 export declare type WalletPassListRef = {
     init: (params: MachineCodeListParams, formatList?: (val: WalletPassDataType[]) => WalletPassDataType[]) => void;