@pisell/private-materials 6.3.12 → 6.3.14

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

package/lib/components/eventBooking/components/progressBar/index.js

@@ -64,6 +64,24 @@ var ProgressBar = ({
   const handleOk = () => {
     var _a2, _b;
     if ((_b = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b.call(_a2)) {
+      const url = window.location.href;
+      if (url.includes("isByTabbar")) {
+        removeSessionStorage == null ? void 0 : removeSessionStorage();
+        const urlParams = new URLSearchParams(window.location.search);
+        urlParams.delete("cacheId");
+        setOpen(false);
+        interaction.utils.postMessageToApp({
+          module: "global",
+          key: "openNative",
+          data: {
+            link: {
+              page: "home"
+            }
+          }
+        });
+        window.location.href = window.location.pathname + "?" + urlParams.toString();
+        return;
+      }
       interaction.utils.postMessageToApp({
         module: "global",
         key: "paymentResultAction",

package/lib/components/pay/toC/PaymentMethods/GooglePay/index.js

@@ -41,30 +41,34 @@ var import_payGroup = require("../../payGroup");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var import_utils2 = require("../../utils");
 var GooglePay = (props, ref) => {
-  var _a;
+  var _a, _b;
   const { state } = (0, import_react.useContext)(import_model.Context);
   const [open, setOpen] = (0, import_react.useState)(false);
   const context = (0, import_useEngineContext.default)();
   const { config } = ((_a = context.appHelper) == null ? void 0 : _a.constants) || {};
+  const { interaction } = (_b = context.appHelper) == null ? void 0 : _b.utils;
   const init = async ({ payGroup }) => {
-    var _a2, _b, _c, _d, _e, _f, _g;
-    setOpen(true);
+    var _a2, _b2, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     const utils = context.appHelper.utils || {};
-    const dvaStore = (_b = (_a2 = utils == null ? void 0 : utils.getStore) == null ? void 0 : _a2.call(utils)) == null ? void 0 : _b.getState();
+    const dvaStore = (_b2 = (_a2 = utils == null ? void 0 : utils.getStore) == null ? void 0 : _a2.call(utils)) == null ? void 0 : _b2.getState();
     const values = (0, import_payGroup.getPayGroupParamsFromStorage)(payGroup.order_id);
+    if (((_d = (_c = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c.isAppEnv) == null ? void 0 : _d.call(_c)) && ((_f = (_e = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _e.isAndroid_ios) == null ? void 0 : _f.call(_e)) === "android") {
+      return (0, import_utils2.clientPayment)({ order_id: payGroup.order_id, type: "google_pay", values, interaction });
+    }
+    setOpen(true);
     if (!values) {
       setOpen(false);
       return;
     }
     try {
-      const locale = ((_c = dvaStore.core) == null ? void 0 : _c.translateLocale) || "en";
-      const shopId = (_f = (_e = (_d = dvaStore.core) == null ? void 0 : _d.core) == null ? void 0 : _e.shop) == null ? void 0 : _f.id;
+      const locale = ((_g = dvaStore.core) == null ? void 0 : _g.translateLocale) || "en";
+      const shopId = (_j = (_i = (_h = dvaStore.core) == null ? void 0 : _h.core) == null ? void 0 : _i.shop) == null ? void 0 : _j.id;
       const currentURL = window.location.href;
       const linkElement = document.createElement("a");
       linkElement.href = currentURL;
       const shop_domain = linkElement.hostname;
       const _href = `${config.pay}${(0, import_utils2.formatFranchiseeRoute)(
-        `/google-pay?order_id=${(_g = state.payGroup) == null ? void 0 : _g.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}`,
+        `/google-pay?order_id=${(_k = state.payGroup) == null ? void 0 : _k.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}`,
         state.history
       )}`;
       window.location.href = _href;

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

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

package/lib/components/pay/toC/PaymentMethods/WalletPass/List/index.js

@@ -41,7 +41,7 @@ var import_utils2 = require("../utils");
 var import_index = require("./index.less");
 var WalletPassList = (0, import_react.forwardRef)(
   (props, ref) => {
-    const { title, onChange, data: propsData, value, walletSetting } = props;
+    const { title, onChange, data: propsData, value, walletSetting, onLoadingChange, loading: propsLoading, onChangeDebounce } = props;
     const [data, setData] = (0, import_react.useState)(
       propsData || []
     );
@@ -51,6 +51,9 @@ var WalletPassList = (0, import_react.forwardRef)(
         setData(propsData);
       }
     }, [propsData]);
+    (0, import_react.useEffect)(() => {
+      setLoading(!!propsLoading);
+    }, [propsLoading]);
     const getList = async (params, formatList) => {
       setLoading(true);
       try {
@@ -70,6 +73,9 @@ var WalletPassList = (0, import_react.forwardRef)(
     (0, import_react.useImperativeHandle)(ref, () => ({
       init
     }));
+    (0, import_react.useEffect)(() => {
+      onLoadingChange == null ? void 0 : onLoadingChange(loading);
+    }, [loading]);
     const { availableList, disabledList } = (0, import_react.useMemo)(() => {
       const _disabledList = [];
       const _availableList = [];
@@ -111,7 +117,8 @@ var WalletPassList = (0, import_react.forwardRef)(
         value,
         onChange: handleChange,
         showEmpty: data.length === 0,
-        empty
+        empty,
+        onChangeDebounce
       }
     ), !!disabledList.length && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-walletPass-list-disabled" }, import_utils.locales.getText("tocPay.text.walletPassDisabled")), /* @__PURE__ */ import_react.default.createElement(
       import_materials.PisellCardList,

package/lib/components/pay/toC/PaymentMethods/WalletPass/index.js

@@ -48,6 +48,7 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
   var _a;
   const { onWalletPassChange, walletPass, walletSetting } = props;
   const [currentWalletPass, setCurrentWalletPass] = (0, import_react.useState)(walletPass);
+  const [loading, setLoading] = (0, import_react.useState)(false);
   const [open, setOpen] = (0, import_react.useState)(false);
   const [searchOpen, setSearchOpen] = (0, import_react.useState)(false);
   const [addList, setAddList] = (0, import_react.useState)([]);
@@ -281,7 +282,9 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
         data: otherCustomerWalletPassList,
         title: import_utils.locales.getText("tocPay.text.couponCodesAdded"),
         onChange: handleOtherChange,
-        value: selectValue
+        value: selectValue,
+        loading,
+        onChangeDebounce: true
       }
     ), /* @__PURE__ */ import_react.default.createElement(
       import_List.default,
@@ -290,7 +293,8 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
         title: walletSetting.name,
         onChange: handleCurrentChange,
         ref: listRef,
-        value: selectValue
+        value: selectValue,
+        onLoadingChange: setLoading
       }
     ))
   ), /* @__PURE__ */ import_react.default.createElement(

package/lib/components/pay/toC/utils.d.ts

@@ -51,7 +51,7 @@ export declare const formatFranchiseeRoute: (url: string, history?: any) => stri
 export declare const getAvailableMaxAmount: (data: WalletPassDataType) => string;
 export declare const clientPayment: (params: {
     order_id: number;
-    type: "aliPay" | "wxPay";
+    type: "aliPay" | "wxPay" | 'google_pay';
     values: any;
     interaction?: any;
 }) => void;

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

@@ -17,6 +17,6 @@ declare let modal: Omit<ModalStaticFunctions, "warn">;
 export declare const setModal: (m: Omit<ModalStaticFunctions, "warn">) => void;
 export declare const saveConfirm: () => Promise<{
     destroy: () => void;
-    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
+    update: (configUpdate: import("antd/es/modal/interface").ModalFuncProps | ((prevConfig: import("antd/es/modal/interface").ModalFuncProps) => import("antd/es/modal/interface").ModalFuncProps)) => void;
 }>;
 export { modal };

package/lib/components/schedules/utils.js

@@ -27,8 +27,8 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
 var Request = class {
+  request = {};
   constructor() {
-    this.request = {};
   }
   setRequest(val) {
     this.request = val;

package/lib/components/wallet/Detail/index.js

@@ -50,7 +50,7 @@ var { Text } = import_materials2.Typography;
 import_dayjs.default.extend(import_timezone.default);
 import_dayjs.default.extend(import_utc.default);
 var Detail = (0, import_react.forwardRef)((props, ref) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
   const {
     detail = {},
     buttonGroupList = [[]],
@@ -659,7 +659,7 @@ var Detail = (0, import_react.forwardRef)((props, ref) => {
       className: `wallet-detail${platform === "h5" ? " wallet-detail-h5" : " wallet-detail-pc"} ${className || ""}`,
       ref: detailWrapperRef
     },
-    (platform === "h5" || showWalletBar) && /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-detail-header" }, /* @__PURE__ */ import_react.default.createElement(import_components.WalletBar, { setup: "detail", onBack: handleBack })),
+    (platform === "h5" || showWalletBar) && !((_l = (_k = (_j = utils == null ? void 0 : utils.interaction) == null ? void 0 : _j.utils) == null ? void 0 : _k.isAppEnv) == null ? void 0 : _l.call(_k)) && /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-detail-header" }, /* @__PURE__ */ import_react.default.createElement(import_components.WalletBar, { setup: "detail", onBack: handleBack })),
     /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
@@ -751,7 +751,7 @@ var Detail = (0, import_react.forwardRef)((props, ref) => {
         step: "detail",
         addWalletLoading,
         onAppleWalletClick: tag === "gift_card" ? addWalletCard : void 0,
-        onRechargeClick: tag === "gift_card" && ((_j = detail == null ? void 0 : detail.machinecode_config) == null ? void 0 : _j.hide_recharge) === 0 ? handleRecharge : void 0,
+        onRechargeClick: tag === "gift_card" && ((_m = detail == null ? void 0 : detail.machinecode_config) == null ? void 0 : _m.hide_recharge) === 0 ? handleRecharge : void 0,
         platform,
         isIOS: (0, import_utils.isIos)()
       }

package/lib/components/wallet/components/WalletCard.js

@@ -73,7 +73,7 @@ var WalletCard = ({
       disabled: isDisabled,
       showDisabledReason: isDisabled,
       disabledReason,
-      propStyle: { marginBottom: 16 },
+      style: { marginBottom: 16, width: "100%" },
       showBalanceSymbol: !["point_card", "good_pass"].includes(tag),
       active: isActive,
       name: product_title,

package/lib/utils/index.d.ts

@@ -18,6 +18,6 @@ declare let modal: Omit<ModalStaticFunctions, 'warn'>;
 export declare const setModal: (m: Omit<ModalStaticFunctions, 'warn'>) => void;
 export declare const saveConfirm: () => Promise<{
     destroy: () => void;
-    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
+    update: (configUpdate: import("antd/es/modal/interface").ModalFuncProps | ((prevConfig: import("antd/es/modal/interface").ModalFuncProps) => import("antd/es/modal/interface").ModalFuncProps)) => void;
 }>;
 export { modal };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.3.12",
+  "version": "6.3.14",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -61,8 +61,8 @@
     "decimal.js": "^10.4.3",
     "@pisell/utils": "3.0.1",
     "@pisell/materials": "6.3.4",
-    "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.4"
+    "@pisell/date-picker": "3.0.4",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",