@pisell/private-materials 6.7.7 → 6.7.8

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

@@ -205,10 +205,6 @@ var GlobalToastManager = class {
       instance.offsetIndex = index;
       const bottomPosition = this.calculateBottomPosition(index, totalCount);
       if (instance.container) {
-        const hasMask = instance.container.getAttribute("data-mask") === "true";
-        if (hasMask) {
-          return;
-        }
         instance.container.classList.add("toast-moving");
         instance.container.style.position = "fixed";
         instance.container.style.left = `${this.LEFT_OFFSET}px`;
@@ -244,36 +240,22 @@ var GlobalToastManager = class {
       autoClose: config.autoClose,
       autoCloseDelay: config.autoCloseDelay || 30,
       showCountdownProgress: config.showCountdownProgress,
-      clickOutsideToClose: config.clickOutsideToClose,
       onCountdownComplete: config.onCountdownComplete,
       onClose: () => {
         var _a;
         (_a = config.onClose) == null ? void 0 : _a.call(config);
         this.removeToast(id);
       },
-      closable: config.closable !== void 0 ? config.closable : DEFAULT_TOAST_CONFIG.closable,
-      mask: config.mask || false
+      closable: config.closable !== void 0 ? config.closable : DEFAULT_TOAST_CONFIG.closable
     };
     const container = document.createElement("div");
     container.setAttribute("data-toast-id", id);
-    if (config.mask) {
-      container.setAttribute("data-mask", "true");
-    }
     const dynamicBottomOffset = this.calculateAndCacheBottomOffset();
     container.style.position = "fixed";
-    if (config.mask) {
-      container.style.left = "50%";
-      container.style.top = "50%";
-      container.style.transform = "translate(-50%, -50%)";
-      container.style.bottom = "auto";
-      container.style.right = "auto";
-    } else {
-      container.style.left = `${this.LEFT_OFFSET}px`;
-      container.style.bottom = `${dynamicBottomOffset}px`;
-      container.style.top = "auto";
-      container.style.right = "auto";
-      container.style.transform = "none";
-    }
+    container.style.left = `${this.LEFT_OFFSET}px`;
+    container.style.bottom = `${dynamicBottomOffset}px`;
+    container.style.top = "auto";
+    container.style.right = "auto";
     container.style.pointerEvents = "none";
     container.style.width = "auto";
     container.style.height = "auto";

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

@@ -225,8 +225,8 @@ var PaymentResultToast = (0, import_react.memo)((props) => {
       mask,
       maskClosable,
       closable: false,
-      className: getBaseClassName(`${className} ${statusClassName} ${mask ? "payment-result-toast-with-mask" : ""}`),
-      wrapClassName: `toast-modal-wrap ${mask ? "toast-modal-wrap-with-mask" : ""}`,
+      className: getBaseClassName(`${className} ${statusClassName}`),
+      wrapClassName: "toast-modal-wrap",
       style: {
         ...height ? { height: `${height}px` } : {},
         // 确保Modal不会被默认定位影响
@@ -246,8 +246,8 @@ var PaymentResultToast = (0, import_react.memo)((props) => {
       focusTriggerAfterClose: false,
       transitionName: "",
       maskTransitionName: "",
-      centered: mask,
-      getContainer: mask ? void 0 : false
+      centered: false,
+      getContainer: false
     },
     /* @__PURE__ */ import_react.default.createElement(
       "div",

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

@@ -17,7 +17,6 @@
   margin: 0 !important;
   pointer-events: none !important; // 让Toast Modal Wrap点击穿透
 
-  // 非 mask 模式下的样式
   .ant-modal {
     position: static !important;
     top: auto !important;
@@ -33,47 +32,11 @@
   }
 }
 
-// mask 模式下的全局样式（Modal 渲染到 body）
-.toast-modal-wrap-with-mask {
-  position: fixed !important;
-  top: 0 !important;
-  left: 0 !important;
-  right: 0 !important;
-  bottom: 0 !important;
-  width: 100vw !important;
-  height: 100vh !important;
-  display: flex !important;
-  align-items: center !important;
-  justify-content: center !important;
-  pointer-events: auto !important; // mask 模式下需要响应点击
-
-  .ant-modal-mask {
-    position: fixed !important;
-    top: 0 !important;
-    left: 0 !important;
-    right: 0 !important;
-    bottom: 0 !important;
-    width: 100vw !important;
-    height: 100vh !important;
-  }
-
-  .ant-modal {
-    position: relative !important;
-    top: auto !important;
-    left: auto !important;
-    transform: none !important;
-    margin: 0 !important;
-    padding: 0 !important;
-    width: auto !important;
-    max-width: none !important;
-    pointer-events: auto !important; // Modal 内容可以响应点击
-  }
-}
-
 // Toast容器样式 - 用于多实例定位
 [data-toast-id] {
   z-index: 1000;
   position: fixed !important;
+  left: 96px !important;
   /* 注意：不设置bottom的!important，让JavaScript可以动态更新 */
   /* 移除强制的z-index设置，让Toast使用默认层级 */
   pointer-events: none !important; // 让Toast容器本身点击穿透
@@ -82,23 +45,6 @@
   width: auto !important;
   height: auto !important;
 
-  // 非 mask 模式下使用左下角定位
-  &:not([data-mask="true"]) {
-    left: 96px !important;
-  }
-
-  // mask 模式下，Modal 会渲染到 body，容器只作为占位符
-  // 不需要设置定位，因为 Modal 已经独立渲染
-  &[data-mask="true"] {
-    // 容器在 mask 模式下不需要定位，Modal 会独立渲染到 body
-    position: static !important;
-    left: auto !important;
-    top: auto !important;
-    bottom: auto !important;
-    right: auto !important;
-    transform: none !important;
-  }
-
   /* 新Toast进入动画 */
   &.toast-entering {
     opacity: 0;
@@ -135,49 +81,42 @@
   }
 
   // 强制覆盖Ant Design Modal的默认定位
-  // 非 mask 模式下使用 static 定位
-  &:not([data-mask="true"]) {
-    .ant-modal-wrap {
-      position: static !important;
-      pointer-events: none !important; // 让Modal wrap点击穿透
-    }
+  .ant-modal-wrap {
+    position: static !important;
+    pointer-events: none !important; // 让Modal wrap点击穿透
+  }
 
-    .ant-modal {
-      position: static !important;
-      top: auto !important;
-      left: auto !important;
-      transform: none !important;
-      margin: 0 !important;
-      padding: 0 !important;
-      pointer-events: none !important; // 让Modal本身点击穿透
-    }
+  .ant-modal {
+    position: static !important;
+    top: auto !important;
+    left: auto !important;
+    transform: none !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    pointer-events: none !important; // 让Modal本身点击穿透
   }
 
-  // mask 模式下，Modal 会渲染到 body，容器内的样式不再需要
-  // 样式已通过全局 .toast-modal-wrap-with-mask 类名设置
 
-  // 覆盖所有可能的Ant Design Modal定位（非 mask 模式）
-  &:not([data-mask="true"]) {
-    .ant-modal-wrap {
-      position: static !important;
-      display: block !important;
-      overflow: visible !important;
-      pointer-events: none !important; // 让Modal wrap点击穿透
-    }
+  // 覆盖所有可能的Ant Design Modal定位
+  .ant-modal-wrap {
+    position: static !important;
+    display: block !important;
+    overflow: visible !important;
+    pointer-events: none !important; // 让Modal wrap点击穿透
+  }
 
-    .ant-modal {
-      position: static !important;
-      top: auto !important;
-      left: auto !important;
-      right: auto !important;
-      bottom: auto !important;
-      transform: none !important;
-      margin: 0 !important;
-      padding: 0 !important;
-      width: 100% !important;
-      max-width: none !important;
-      pointer-events: none !important; // 让Modal点击穿透
-    }
+  .ant-modal {
+    position: static !important;
+    top: auto !important;
+    left: auto !important;
+    right: auto !important;
+    bottom: auto !important;
+    transform: none !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    width: 100% !important;
+    max-width: none !important;
+    pointer-events: none !important; // 让Modal点击穿透
   }
 
   // Toast进入动画
@@ -462,7 +401,7 @@
   // 副标题样式
   &-subtitle {
     &-text {
-      font-size: 48px; // 与图片一致
+      font-size: 30px; // 与图片一致
       font-weight: 600; // 与图片一致
       text-shadow: none; // 移除阴影
 

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

@@ -48,7 +48,7 @@ var SearchAndClientModule = (props) => {
   const bookingTicket = (0, import_pisellos.useBookingTicket)();
   const handleSearch = (0, import_ahooks.useDebounceFn)(
     async (keyword) => {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c, _d;
       if (!!keyword) {
         setLoading(true);
         try {
@@ -61,18 +61,9 @@ var SearchAndClientModule = (props) => {
             return;
           }
           if ("type" in res && res.type == "walletCode") {
-            if (disabledSwitch) {
-              (_b = Toast == null ? void 0 : Toast.info) == null ? void 0 : _b.call(
-                Toast,
-                import_utils.locales.getText(
-                  "pisell2.checkout.client-card.tip.partially-paid"
-                )
-              );
-              return;
-            }
             const { customer, ...rest } = res.data;
             if (!customer) {
-              (_c = Toast == null ? void 0 : Toast.info) == null ? void 0 : _c.call(
+              (_b = Toast == null ? void 0 : Toast.info) == null ? void 0 : _b.call(
                 Toast,
                 import_utils.locales.getText("pisell2.checkout.wallet-pass-module.no-result")
               );
@@ -82,7 +73,7 @@ var SearchAndClientModule = (props) => {
               ...customer,
               latest_wallet_detail: rest
             };
-            (_e = (_d = clientCardRef.current) == null ? void 0 : _d.handleSetClient) == null ? void 0 : _e.call(_d, _customer, {
+            (_d = (_c = clientCardRef.current) == null ? void 0 : _c.handleSetClient) == null ? void 0 : _d.call(_c, _customer, {
               sameClientTip: import_utils.locales.getText(
                 "pisell2.checkout.client-card.tip.same-client"
               )
@@ -139,23 +130,6 @@ var SearchAndClientModule = (props) => {
         size: "default"
       }
     };
-    if (disabledSwitch === true) {
-      _props = {
-        open: false,
-        buttonProps: {
-          icon,
-          size: "default",
-          onClick: () => {
-            var _a;
-            (_a = Toast == null ? void 0 : Toast.info) == null ? void 0 : _a.call(
-              Toast,
-              import_utils.locales.getText("pisell2.checkout.client-card.tip.partially-paid")
-            );
-          },
-          style: { cursor: "not-allowed" }
-        }
-      };
-    }
     return _props;
   }, [Toast, disabledSwitch]);
   return /* @__PURE__ */ import_react.default.createElement(

package/lib/components/checkout/index.less

@@ -71,7 +71,7 @@
     grid-template-rows: auto auto;
     gap: 8px 16px;
     background-color: #f6f2ff;
-    padding: 16px 16px 8px 16px;
+    padding: 16px 16px 0 16px;
     border-radius: 0 0 12px 12px;
     width: 100%; // 确保容器占满宽度
 

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

@@ -141,7 +141,6 @@ declare const _default: {
         'pisell2.checkout.modal.close-price-adjustment': string;
         'pisell2.checkout.modal.reset-price-adjustment': string;
         'pisell2.checkout.modal.done-price-adjustment': string;
-        'pisell2.checkout.modal.price-adjustment-tips': string;
         'pisell2.checkout.send-payment-link.modal-title': string;
         'pisell2.checkout.send-payment-link.email-address': string;
         'pisell2.checkout.send-payment-link.email-placeholder': string;
@@ -155,7 +154,6 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
-        'pisell2.checkout.order-create-failed': string;
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;
@@ -303,7 +301,6 @@ declare const _default: {
         'pisell2.checkout.modal.close-price-adjustment': string;
         'pisell2.checkout.modal.reset-price-adjustment': string;
         'pisell2.checkout.modal.done-price-adjustment': string;
-        'pisell2.checkout.modal.price-adjustment-tips': string;
         'pisell2.checkout.send-payment-link.modal-title': string;
         'pisell2.checkout.send-payment-link.email-address': string;
         'pisell2.checkout.send-payment-link.email-placeholder': string;
@@ -325,7 +322,6 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
-        'pisell2.checkout.order-create-failed': string;
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;
@@ -481,7 +477,6 @@ declare const _default: {
         'pisell2.checkout.modal.close-price-adjustment': string;
         'pisell2.checkout.modal.reset-price-adjustment': string;
         'pisell2.checkout.modal.done-price-adjustment': string;
-        'pisell2.checkout.modal.price-adjustment-tips': string;
         'pisell2.checkout.send-payment-link.modal-title': string;
         'pisell2.checkout.send-payment-link.email-address': string;
         'pisell2.checkout.send-payment-link.email-placeholder': string;
@@ -495,7 +490,6 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
-        'pisell2.checkout.order-create-failed': string;
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;

package/lib/components/checkout/locales.js

@@ -192,7 +192,6 @@ var locales_default = {
     "pisell2.checkout.modal.close-price-adjustment": "Close price adjustment modal",
     "pisell2.checkout.modal.reset-price-adjustment": "Reset",
     "pisell2.checkout.modal.done-price-adjustment": "Done",
-    "pisell2.checkout.modal.price-adjustment-tips": "Changing amount will update order total",
     // Send Payment Link Modal
     "pisell2.checkout.send-payment-link.modal-title": "Send Payment Link",
     "pisell2.checkout.send-payment-link.email-address": "Email Address",
@@ -211,7 +210,6 @@ var locales_default = {
     "pisell2.amount-summary.amount-cannot-be-zero": "The amount cannot be 0",
     // Order sync errors
     "pisell2.checkout.order-sync-failed": "Order sync failed, please check your network",
-    "pisell2.checkout.order-create-failed": "Order create failed, please refresh app",
     "pisell2.checkout.sync-retry-hint": "Network error, please click the retry button to resync the order",
     "pisell2.checkout.tips": "Tips",
     "retry": "Retry",
@@ -383,7 +381,6 @@ var locales_default = {
     "pisell2.checkout.modal.close-price-adjustment": "关闭价格调整弹窗",
     "pisell2.checkout.modal.reset-price-adjustment": "重置",
     "pisell2.checkout.modal.done-price-adjustment": "完成",
-    "pisell2.checkout.modal.price-adjustment-tips": "修改金额将更新订单总额",
     // Send Payment Link Modal
     "pisell2.checkout.send-payment-link.modal-title": "发送支付链接",
     "pisell2.checkout.send-payment-link.email-address": "邮箱地址",
@@ -418,7 +415,6 @@ var locales_default = {
     "pisell2.amount-summary.amount-cannot-be-zero": "金额不能为0",
     // Order sync errors
     "pisell2.checkout.order-sync-failed": "订单同步失败，请检查网络",
-    "pisell2.checkout.order-create-failed": "订单创建失败，请重启APP",
     "pisell2.checkout.sync-retry-hint": "网络异常，请点击重试按钮重新同步订单",
     "pisell2.checkout.tips": "提示",
     "retry": "重试",
@@ -606,7 +602,6 @@ var locales_default = {
     "pisell2.checkout.modal.close-price-adjustment": "關閉價格調整彈窗",
     "pisell2.checkout.modal.reset-price-adjustment": "重置",
     "pisell2.checkout.modal.done-price-adjustment": "完成",
-    "pisell2.checkout.modal.price-adjustment-tips": "修改金額將更新訂單總額",
     // Send Payment Link Modal
     "pisell2.checkout.send-payment-link.modal-title": "發送支付鏈接",
     "pisell2.checkout.send-payment-link.email-address": "郵箱地址",
@@ -625,7 +620,6 @@ var locales_default = {
     "pisell2.amount-summary.amount-cannot-be-zero": "金額不能為0",
     // Order sync errors
     "pisell2.checkout.order-sync-failed": "訂單同步失敗，請檢查網絡",
-    "pisell2.checkout.order-create-failed": "订单创建失败，请重启APP",
     "pisell2.checkout.sync-retry-hint": "網絡異常，請點擊重試按鈕重新同步訂單",
     "pisell2.checkout.tips": "提示",
     "retry": "重試",

package/lib/components/checkout/utils/PaymentResultToastUtils.d.ts

@@ -6,6 +6,7 @@ export interface PaymentResultToastConfig {
     getData: (key: string) => any;
     interaction: any;
     Toast: any;
+    state: any;
     onToastClose?: () => void;
 }
 export interface PaymentResultToastParams {

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

@@ -150,7 +150,6 @@ var displayPaymentResultToast = async (params, config) => {
   const { getData, onToastClose } = config;
   if (paymentStatus === "paid") {
     await (0, import_PaymentResultToast.showPaymentResultToastSuccess)({
-      mask: !(autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose) || false,
       title: calculateTitle(paymentStatus),
       subtitle: calculateSubtitle(
         paymentStatus,
@@ -160,18 +159,16 @@ var displayPaymentResultToast = async (params, config) => {
       ),
       autoClose: (autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose) || false,
       autoCloseDelay: (autoCloseConfig == null ? void 0 : autoCloseConfig.autoCloseDelay) || 3e3,
-      clickOutsideToClose: (autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose) || false,
       showCountdownProgress: true,
       actionButtons: actionButtons || [],
       onClose: onToastClose || (() => {
       }),
       // 提供默认空函数
-      closable: !(autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose)
+      closable: false
       // 控制关闭按钮显示
     });
   } else if (paymentStatus === "partially_paid") {
     await (0, import_PaymentResultToast.showPaymentResultToastSuccess)({
-      mask: !(autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose) || false,
       title: calculateTitle(paymentStatus),
       subtitle: calculateSubtitle(
         paymentStatus,
@@ -181,16 +178,12 @@ var displayPaymentResultToast = async (params, config) => {
       ),
       autoClose: (autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose) || false,
       actionButtons: actionButtons || [],
-      clickOutsideToClose: (autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose) || false,
-      closable: !(autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose),
-      // 控制关闭按钮显示
       onClose: onToastClose || (() => {
       })
       // 提供默认空函数
     });
   } else if (paymentStatus === "failed" || paymentStatus === "error") {
     await (0, import_PaymentResultToast.showPaymentResultToastFailed)({
-      mask: !(autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose) || false,
       title: calculateTitle(paymentStatus, failureReason),
       subtitle: calculateSubtitle(
         paymentStatus,
@@ -200,9 +193,6 @@ var displayPaymentResultToast = async (params, config) => {
       ),
       autoClose: (autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose) || false,
       actionButtons: actionButtons || [],
-      clickOutsideToClose: (autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose) || false,
-      closable: !(autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose),
-      // 控制关闭按钮显示
       onClose: onToastClose || (() => {
       })
       // 提供默认空函数

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

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

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<"loading" | "success" | "warn" | "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/useTimeQuery.js

@@ -41,7 +41,6 @@ var import_const = require("../../const");
 var import_const2 = require("../const");
 var GlobalTimeout = 1e3 * 60 * 2;
 var RequestTimeout = 1e3 * 5;
-var QUERY_INTERVAL = 1e3 * 2;
 var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
   const dispatch = (0, import_store.useDispatch)();
   const { numRef, modeRef, deviceRef, orderIdRef } = (0, import_hooks.useStoreRef)();
@@ -57,7 +56,6 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
   const startTimeRef = (0, import_react.useRef)(null);
   const isQueryFinishedRef = (0, import_react.useRef)(true);
   const queryIdRef = (0, import_react.useRef)(null);
-  const queryIntervalTimerRef = (0, import_react.useRef)(null);
   const _resultQuery = async () => {
     var _a, _b;
     if (controllerRef.current) {
@@ -109,9 +107,9 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
         console.log("交易状态为0需要继续查询");
         _log("Querying" /* Querying */, result);
         isQueryFinishedRef.current = false;
-        queryIntervalTimerRef.current = setTimeout(() => {
+        setTimeout(() => {
           _resultQuery();
-        }, QUERY_INTERVAL);
+        }, 1500);
         return;
       }
       if (data.status < 0) {
@@ -147,18 +145,18 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
         _log("AbortError" /* AbortError */);
         console.log("Error: 请求被取消，将继续查询");
         isQueryFinishedRef.current = false;
-        queryIntervalTimerRef.current = setTimeout(() => {
+        setTimeout(() => {
           _resultQuery();
-        }, QUERY_INTERVAL);
+        }, 1500);
         return;
       }
       if (!(error == null ? void 0 : error.code) || `${error.code}` === import_const.PayStatus.Timeout) {
         _log("NetworkError" /* NetworkError */);
         console.log("Error: 网关类报错，将继续查询");
         isQueryFinishedRef.current = false;
-        queryIntervalTimerRef.current = setTimeout(() => {
+        setTimeout(() => {
           _resultQuery();
-        }, QUERY_INTERVAL);
+        }, 1500);
         return;
       }
       _log("Error" /* Error */, error);
@@ -205,10 +203,6 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
       clearTimeout(requestTimeoutIdRef.current);
       requestTimeoutIdRef.current = null;
     }
-    if (queryIntervalTimerRef.current) {
-      clearTimeout(queryIntervalTimerRef.current);
-      queryIntervalTimerRef.current = null;
-    }
     if (controllerRef.current) {
       controllerRef.current.abort();
       controllerRef.current = null;