@pisell/private-materials 3.4.83 → 3.4.85

package/lib/components/booking/info/header/index.js

@@ -59,37 +59,37 @@ var header = ({ state, dispatch }) => {
     {
       label: import_utils.locales.getText("pisell2.text.status.new"),
       key: "new",
-      color: "#079455"
+      color: "#91caff"
     },
     {
       label: import_utils.locales.getText("pisell2.text.status.confirmed"),
       key: "confirmed",
-      color: "#7F56D9"
+      color: "#b7eb8f"
     },
     {
       label: import_utils.locales.getText("pisell2.text.status.arrived"),
       key: "arrived",
-      color: "#088AB2"
+      color: "#d3adf7"
     },
     {
       label: import_utils.locales.getText("pisell2.text.status.started"),
       key: "started",
-      color: "#155EEF"
+      color: "#fffb8f"
     },
     {
       label: /* @__PURE__ */ import_react.default.createElement("span", { style: { color: "#D92D20" } }, import_utils.locales.getText("pisell2.text.status.cancelled")),
       key: "cancelled",
-      color: "#DC6803"
+      color: "#bfbfbf"
     },
     {
       label: /* @__PURE__ */ import_react.default.createElement("span", { style: { color: "#D92D20" } }, import_utils.locales.getText("pisell2.text.status.no_show")),
       key: "no_show",
-      color: "#D92D20"
+      color: "#ffa39e"
     },
     {
       label: import_utils.locales.getText("pisell2.text.status.completed"),
       key: "completed",
-      color: "#4A5578"
+      color: "#ffd591"
     }
   ];
   const orderSalesChannel = {

package/lib/components/booking/info/header/index.less

@@ -21,7 +21,7 @@
 
   .booking-order-sales-channel {
     width: 100%;
-    color: var(--Base-White, #FFF);
+    color: var(--Gray-900, #101828);
     font-size: 14px;
     font-style: normal;
     font-weight: 400;
@@ -37,7 +37,7 @@
   }
 
   .booking-header-left {
-    color: var(--Base-White, #FFF);
+    color: var(--Gray-900, #101828);
     font-size: 18px;
     font-style: normal;
     font-weight: 400;
@@ -48,17 +48,17 @@
       display: flex;
       align-items: center;
       gap: 10px;
-      color: var(--Base-White, #FFF) !important;
+      color: var(--Gray-900, #101828) !important;
       font-size: 18px;
       font-style: normal;
       font-weight: 400;
       cursor: pointer;
-      border: 1px solid #fff;
+      border: 1px solid var(--Gray-900, #101828);
       padding: 4px 12px;
       border-radius: 24px;
 
       span {
-        color: var(--Base-White, #FFF) !important;
+        color: var(--Gray-900, #101828) !important;
       }
 
       .booking-header-right-status-icon {

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { PosProps, RouteType } from './const';
-declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "mode" | "type" | "getApi"> & {
+declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "type" | "mode" | "getApi"> & {
     action: RouteType;
     device_number: string | number;
     api: ReturnType<PosProps['getApi']>;

package/lib/components/eftposPay/component/fail/failCustom.js

@@ -52,25 +52,31 @@ var failCustom_default = ({ className = "", isMobile, onChange }) => {
     order_id,
     number,
     device,
-    client
+    client,
+    originalParams
   } = (0, import_store.useContextData)();
   const failCustom = custom == null ? void 0 : custom.failCustom;
   const dispatch = (0, import_store.useDispatch)();
   const onRetry = () => {
     onChange("page", "pay");
-    dispatch(
-      (0, import_store.updateState)(
-        (0, import_manufacturer.getInitState)(
-          eftpos,
-          mode === import_const.ModeEnum.Query ? { mode, name, symbol, amount, order_id } : { mode, name, symbol, amount, order_id, number: "" }
-        )
-      )
-    );
+    const params = {
+      ...originalParams || {},
+      mode,
+      name,
+      symbol,
+      amount,
+      order_id
+    };
+    if (mode !== import_const.ModeEnum.Query) {
+      params.number = "";
+    }
+    dispatch((0, import_store.updateState)((0, import_manufacturer.getInitState)(eftpos, params)));
   };
   const onModify = () => {
     dispatch(
       (0, import_store.updateState)(
         (0, import_manufacturer.getInitState)(eftpos, {
+          ...originalParams || {},
           mode,
           name,
           symbol,

package/lib/components/eftposPay/component/fail/index.js

@@ -54,7 +54,8 @@ var fail_default = ({ onChange, className = "", isMobile }) => {
     order_id,
     number,
     device,
-    client
+    client,
+    originalParams
   } = (0, import_store.useContextData)();
   const isPosNetworkError = ((_b = (_a = steps[step]) == null ? void 0 : _a.custom) == null ? void 0 : _b.isPosNetworkError) || false;
   const dispatch = (0, import_store.useDispatch)();
@@ -63,6 +64,7 @@ var fail_default = ({ onChange, className = "", isMobile }) => {
     dispatch(
       (0, import_store.updateState)(
         (0, import_manufacturer.getInitState)(eftpos, {
+          ...originalParams || {},
           mode,
           name,
           symbol,
@@ -77,6 +79,7 @@ var fail_default = ({ onChange, className = "", isMobile }) => {
     dispatch(
       (0, import_store.updateState)(
         (0, import_manufacturer.getInitState)(eftpos, {
+          ...originalParams || {},
           mode,
           name,
           symbol,

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

@@ -154,6 +154,8 @@ export declare enum PayStatus {
     'Unknown' = "701000",
     /** 交易请求超时 */
     'Timeout' = "701001",
+    /** 支付失败 */
+    'PaymentFailed' = "701002",
     /** 繁忙 EFTPOS终端暂时不可用，因为EFTPOS正在处理另一个请求。 */
     'PayOtherEftposFailed' = "701003",
     /** 购物者没有出示卡片/卡片金额不足/在线拒绝/卡已过期/卡被锁定 */

package/lib/components/eftposPay/const.js

@@ -92,6 +92,7 @@ var PayStatus = /* @__PURE__ */ ((PayStatus2) => {
   PayStatus2["PairingFailure"] = "606020";
   PayStatus2["Unknown"] = "701000";
   PayStatus2["Timeout"] = "701001";
+  PayStatus2["PaymentFailed"] = "701002";
   PayStatus2["PayOtherEftposFailed"] = "701003";
   PayStatus2["PayCardErrorFailed"] = "701004";
   PayStatus2["NoNetWork"] = "701005";

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

@@ -32,4 +32,5 @@ export declare const useStoreRef: <T extends {
  */
 export declare const useFail: (index: number) => (res: {
     code?: `${PayStatus}`;
+    message?: string;
 }, isMark?: boolean) => void;

package/lib/components/eftposPay/hooks.js

@@ -384,6 +384,22 @@ ${import_utils.locales.getText(
         );
         return;
       }
+      if (code === import_const.PayStatus.PaymentFailed) {
+        steps[index].title = import_utils.locales.getText(
+          "page.eftpos-pay.text.transaction.fail"
+        );
+        steps[index].fail = (res == null ? void 0 : res.message) || import_utils.locales.getText("page.eftpos-pay.text.failed")(modeRef.current);
+        steps[index].status = "fail";
+        dispatch((0, import_store.updateSteps)(steps));
+        dispatch((0, import_store.updateComponent)("Fail"));
+        dispatch(
+          (0, import_store.updateCustom)({
+            errorStatus: "know"
+            // unknow know
+          })
+        );
+        return;
+      }
       steps[index].title = import_utils.locales.getText("page.eftpos-pay.text.failed")(
         modeRef.current
       );

package/lib/components/eftposPay/index.js

@@ -94,10 +94,14 @@ var eftposPay_default = (props) => {
     if (props.source === import_const.RestoreEumn.Restore) {
       return props.params;
     }
-    return (0, import_manufacturer.getInitState)(
+    const initState = (0, import_manufacturer.getInitState)(
       props.type,
       props.params ? { mode, ...props.params, symbol: current } : { mode, symbol: current }
     );
+    return {
+      ...initState || {},
+      originalParams: props.params || {}
+    };
   }, [mode, props.params, props.type, symbol]);
   const stateRef = (0, import_react.useRef)(state);
   (0, import_react.useEffect)(() => {

package/lib/components/eftposPay/linkly/const.js

@@ -72,7 +72,7 @@ var const_default = (params) => {
     status: import_const.StatusEnum.Loading,
     steps: getStep(mode),
     render: true,
-    client: client !== "undefined" ? client : import_const.ClientEnum.Merchant,
+    client: client !== "undefined" && client !== void 0 ? client : import_const.ClientEnum.Merchant,
     warn: "",
     custom: other || {},
     ...typeof net !== "undefined" ? { net } : {},

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

@@ -187,6 +187,7 @@ var POS = ({
       card_reader_type: eftposRef.current,
       card_reader_id: (_b = deviceRef.current) == null ? void 0 : _b.id,
       number: numRef.current,
+      original_payment_number: custom == null ? void 0 : custom.original_payment_number,
       pay_param_base64: encodeURIComponent(
         btoa(
           encodeURIComponent(

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

@@ -71,7 +71,7 @@ var const_default = (params) => {
     status: import_const.StatusEnum.Loading,
     steps: getStep(mode),
     render: true,
-    client: client !== "undefined" ? client : import_const.ClientEnum.Merchant,
+    client: client !== "undefined" && client !== void 0 ? client : import_const.ClientEnum.Merchant,
     custom: other || {},
     ...typeof net !== "undefined" ? { net } : {},
     ...typeof number !== "undefined" ? { number } : {},

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

@@ -91,6 +91,8 @@ export declare type State = {
     };
     backup?: Omit<State, 'backup'>;
     client: ClientEnum;
+    /** 支付原始参数 */
+    originalParams?: Record<string, any>;
 };
 export declare type Action = {
     type: EActionTypes;
@@ -344,6 +346,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         } | undefined;
         backup?: Omit<State, "backup"> | undefined;
         client?: ClientEnum | undefined;
+        originalParams?: Record<string, any> | undefined;
     };
 };
 export declare function reducers(state: State, action: Action): State;

package/lib/components/eftposPay/tyro/const.js

@@ -57,7 +57,7 @@ var const_default = (params) => {
     status: import_const.StatusEnum.Loading,
     steps: [],
     render: true,
-    client: client !== "undefined" ? client : import_const.ClientEnum.Merchant,
+    client: client !== "undefined" && client !== void 0 ? client : import_const.ClientEnum.Merchant,
     custom: other || {},
     ...typeof net !== "undefined" ? { net } : {},
     ...typeof number !== "undefined" ? { number } : {},

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 获取 Tyro 资源
  * @description:

package/lib/components/eftposPay/windcave/const.js

@@ -60,7 +60,7 @@ var const_default = (params) => {
     status: import_const.StatusEnum.Loading,
     steps: [],
     render: true,
-    client: client !== "undefined" ? client : import_const.ClientEnum.Merchant,
+    client: client !== "undefined" && client !== void 0 ? client : import_const.ClientEnum.Merchant,
     custom: other ? { ...other, list: [], step: 1 /* Free */ } : { list: [], step: 1 /* Free */ },
     ...typeof net !== "undefined" ? { net } : {},
     ...typeof number !== "undefined" ? { number } : {},

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateStatus/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Status: (props: any) => import("react").JSX.Element;
 export default Status;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const DayItem: (props: any) => import("react").JSX.Element;
 export default DayItem;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 import { CalendarItemProps } from '../../../../../type';
 declare const Item: (props: CalendarItemProps) => import("react").JSX.Element;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Status/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Status: (props: any) => import("react").JSX.Element;
 export default Status;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

package/lib/components/shoppingCart/components/Empty/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Empty: (props: any) => import("react").JSX.Element;
 export default Empty;

package/lib/plus/walletPassGallery/components/passList/index.js

@@ -95,6 +95,7 @@ var PassList = (props) => {
           limit_status,
           product_cover = "",
           par_value = "",
+          unified_available_status,
           unified_messages = {},
           holder,
           metadata,
@@ -121,8 +122,8 @@ var PassList = (props) => {
               showQrCode: true,
               showBalance: !isDiscountCard,
               cover: product_cover,
-              disabled: limit_status !== "enable",
-              showDisabledReason: limit_status !== "enable",
+              disabled: unified_available_status === 0,
+              showDisabledReason: unified_available_status === 0,
               disabledReason,
               style: { marginBottom: 16, width: "100%" },
               showBalanceSymbol: !["point_card", "good_pass"].includes(tag),

package/lib/plus/walletPassGallery/index.js

@@ -542,6 +542,7 @@ var WalletPassGallery = (props) => {
       shop,
       limit_status,
       product_cover = "",
+      unified_available_status,
       unified_messages = {},
       par_value = "",
       tag = "",
@@ -550,7 +551,7 @@ var WalletPassGallery = (props) => {
     const { title = "" } = unified_messages;
     const { name = "" } = shop;
     const isActive = id === (currentUnbindItem == null ? void 0 : currentUnbindItem.id) && platform === "pc";
-    const isEnabled = limit_status === "enable";
+    const isDisabled = unified_available_status === 0;
     const isDiscountCard = tag === "product_discount_card";
     const getBalanceTitle = () => {
       if (tag === "point_card") {
@@ -572,8 +573,8 @@ var WalletPassGallery = (props) => {
         showRedeem: false,
         showQrCode: false,
         cover: product_cover,
-        disabled: !isEnabled,
-        showDisabledReason: !isEnabled,
+        disabled: isDisabled,
+        showDisabledReason: isDisabled,
         disabledReason: title,
         propStyle: { marginBottom: 10 },
         showBalanceSymbol: !["point_card", "good_pass"].includes(tag),

package/lib/pro/Login2.0/Login2.js

@@ -603,7 +603,7 @@ var Login2 = ({
         }
         const res = await registerAndLogin.resetPassword(resetPasswordParams);
         if ((res == null ? void 0 : res.code) !== 200) {
-          throw new Error((res == null ? void 0 : res.message) || "密码重置失败");
+          throw new Error((res == null ? void 0 : res.message) || import_utils.locales.getText("pisell-forgot-password-failed"));
         }
       }
       handleCloseForgotPassword();
@@ -627,7 +627,7 @@ var Login2 = ({
       }
       setLoginStep("account");
     } catch (error) {
-      import_antd.message.error((error == null ? void 0 : error.message) || "密码重置失败");
+      import_antd.message.error((error == null ? void 0 : error.message) || import_utils.locales.getText("pisell-forgot-password-failed"));
     } finally {
       setLoading(false);
     }
@@ -641,14 +641,14 @@ var Login2 = ({
           password
         });
         if ((res == null ? void 0 : res.code) !== 200) {
-          throw new Error((res == null ? void 0 : res.message) || "密码重置失败");
+          throw new Error((res == null ? void 0 : res.message) || import_utils.locales.getText("pisell-forgot-password-failed"));
         }
       }
       handleCloseForgotPassword();
       setEmailLinkVerifyStatus(null);
-      import_antd.message.success("密码重置成功");
+      import_antd.message.success(import_utils.locales.getText("pisell-forgot-password-success"));
     } catch (error) {
-      import_antd.message.error((error == null ? void 0 : error.message) || "密码重置失败");
+      import_antd.message.error((error == null ? void 0 : error.message) || import_utils.locales.getText("pisell-forgot-password-failed"));
       throw error;
     } finally {
       setLoading(false);
@@ -1413,7 +1413,7 @@ var Login2 = ({
                     password
                   });
                   if (result.status) {
-                    import_antd.message.success("密码重置成功");
+                    import_antd.message.success(import_utils.locales.getText("pisell-forgot-password-success"));
                     setEmailLinkVerifyStatus(null);
                     setEmailLinkError("");
                     if (resetPasswordUserEmail) {
@@ -1427,13 +1427,13 @@ var Login2 = ({
                       setLoginStep("account");
                     }
                   } else {
-                    import_antd.message.error(result.message || "密码重置失败");
+                    import_antd.message.error(result.message || import_utils.locales.getText("pisell-forgot-password-failed"));
                   }
                 } else {
                   import_antd.message.error("系统错误，请稍后重试");
                 }
               } catch (error) {
-                import_antd.message.error((error == null ? void 0 : error.message) || "密码重置失败");
+                import_antd.message.error((error == null ? void 0 : error.message) || import_utils.locales.getText("pisell-forgot-password-failed"));
               }
             },
             onBack: () => {

package/lib/pro/Login2.0/locales.d.ts

@@ -75,6 +75,7 @@ declare const _default: {
         'pisell-forgot-password-send-link': string;
         'pisell-forgot-password-link-sent': string;
         'pisell-forgot-password-success': string;
+        'pisell-forgot-password-failed': string;
         'pisell-forgot-password-verify': string;
         'pisell-common-resend': string;
         'pisell-common-verify': string;
@@ -255,6 +256,7 @@ declare const _default: {
         'pisell-forgot-password-send-link': string;
         'pisell-forgot-password-link-sent': string;
         'pisell-forgot-password-success': string;
+        'pisell-forgot-password-failed': string;
         'pisell-forgot-password-verify': string;
         'pisell-common-resend': string;
         'pisell-common-verify': string;
@@ -447,6 +449,7 @@ declare const _default: {
         'pisell-forgot-password-send-link': string;
         'pisell-forgot-password-link-sent': string;
         'pisell-forgot-password-success': string;
+        'pisell-forgot-password-failed': string;
         'pisell-forgot-password-verify': string;
         'pisell-common-resend': string;
         'pisell-common-verify': string;
@@ -615,6 +618,7 @@ declare const _default: {
         'pisell-forgot-password-send-link': string;
         'pisell-forgot-password-link-sent': string;
         'pisell-forgot-password-success': string;
+        'pisell-forgot-password-failed': string;
         'pisell-forgot-password-verify': string;
         'pisell-common-resend': string;
         'pisell-common-verify': string;
@@ -795,6 +799,7 @@ declare const _default: {
         'pisell-forgot-password-send-link': string;
         'pisell-forgot-password-link-sent': string;
         'pisell-forgot-password-success': string;
+        'pisell-forgot-password-failed': string;
         'pisell-forgot-password-verify': string;
         'pisell-common-resend': string;
         'pisell-common-verify': string;

package/lib/pro/Login2.0/locales.js

@@ -109,6 +109,7 @@ var locales_default = {
     "pisell-forgot-password-send-link": "Send reset password link",
     "pisell-forgot-password-link-sent": "Reset password link sent",
     "pisell-forgot-password-success": "Password reset successfully",
+    "pisell-forgot-password-failed": "Password reset failed",
     "pisell-forgot-password-verify": "Verify",
     // Common buttons and actions
     "pisell-common-resend": "Resend",
@@ -315,6 +316,7 @@ var locales_default = {
     "pisell-forgot-password-send-link": "发送重置密码链接",
     "pisell-forgot-password-link-sent": "重置密码链接已发送",
     "pisell-forgot-password-success": "密码重置成功",
+    "pisell-forgot-password-failed": "密码重置失败",
     "pisell-forgot-password-verify": "验证",
     // Common buttons and actions
     "pisell-common-resend": "重新发送",
@@ -537,6 +539,7 @@ var locales_default = {
     "pisell-forgot-password-send-link": "發送重置密碼連結",
     "pisell-forgot-password-link-sent": "重置密碼連結已發送",
     "pisell-forgot-password-success": "密碼重設成功",
+    "pisell-forgot-password-failed": "密碼重設失敗",
     "pisell-forgot-password-verify": "驗證",
     // Common buttons and actions
     "pisell-common-resend": "重新發送",
@@ -719,6 +722,7 @@ var locales_default = {
     "pisell-forgot-password-send-link": "パスワードリセットリンクを送信",
     "pisell-forgot-password-link-sent": "パスワードリセットリンクが送信されました",
     "pisell-forgot-password-success": "パスワードリセット成功",
+    "pisell-forgot-password-failed": "パスワードリセット失敗",
     "pisell-forgot-password-verify": "確認",
     "pisell-common-resend": "再送信",
     "pisell-common-verify": "確認",
@@ -899,6 +903,7 @@ var locales_default = {
     "pisell-forgot-password-send-link": "Enviar link de redefinição de senha",
     "pisell-forgot-password-link-sent": "Link de redefinição de senha enviado",
     "pisell-forgot-password-success": "Redefinição de senha bem-sucedida",
+    "pisell-forgot-password-failed": "Falha na redefinição de senha",
     "pisell-forgot-password-verify": "Verificar",
     "pisell-common-resend": "Reenviar",
     "pisell-common-verify": "Verificar",

package/lowcode/eco-cup-list/meta.ts

@@ -9,7 +9,7 @@ const EcoCupListMeta: ComponentMetadata = {
   "devMode": "proCode",
   "npm": {
     "package": "@pisell/private-materials",
-    "version": "1.1.2066",
+    "version": "3.4.84",
     "exportName": "EcoCupList",
     "main": "src/index.ts",
     "destructuring": true,

package/lowcode/eco-customer-list/meta.ts

@@ -9,7 +9,7 @@ const EcoCustomerListMeta: ComponentMetadata = {
   "devMode": "proCode",
   "npm": {
     "package": "@pisell/private-materials",
-    "version": "1.1.2066",
+    "version": "3.4.84",
     "exportName": "EcoCustomerList",
     "main": "src/index.ts",
     "destructuring": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.4.83",
+  "version": "3.4.85",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -77,9 +77,9 @@
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
     "@pisell/utils": "3.0.2",
+    "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "3.0.4",
-    "@pisell/materials": "3.3.86",
-    "@pisell/icon": "0.0.11"
+    "@pisell/materials": "3.3.87"
   },
   "peerDependencies": {
     "react": "^18.0.0",