@pisell/private-materials 3.0.125 → 3.0.127

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

@@ -179,8 +179,8 @@ declare const _default: {
             list: any[];
         }) => string;
         'page.event.booking.text.duplicate-enrollment-confirm': string;
-        'page.booking.text.unconfirmed-payements': string;
-        'page.booking.text.unconfirmed-payements.msg': string;
+        'page.booking.text.unconfirmed-payments': string;
+        'page.booking.text.unconfirmed-payments.msg': string;
         'page.booking.text.go-to-payments': string;
         'page.booking.text.cancel-only': string;
         'page.booking.text.refund': string;
@@ -374,8 +374,8 @@ declare const _default: {
             list: any[];
         }) => string;
         'page.event.booking.text.duplicate-enrollment-confirm': string;
-        'page.booking.text.unconfirmed-payements': string;
-        'page.booking.text.unconfirmed-payements.msg': string;
+        'page.booking.text.unconfirmed-payments': string;
+        'page.booking.text.unconfirmed-payments.msg': string;
         'page.booking.text.go-to-payments': string;
         'page.booking.text.cancel-only': string;
         'page.booking.text.refund': string;
@@ -569,8 +569,8 @@ declare const _default: {
             list: any[];
         }) => string;
         'page.event.booking.text.duplicate-enrollment-confirm': string;
-        'page.booking.text.unconfirmed-payements': string;
-        'page.booking.text.unconfirmed-payements.msg': string;
+        'page.booking.text.unconfirmed-payments': string;
+        'page.booking.text.unconfirmed-payments.msg': string;
         'page.booking.text.go-to-payments': string;
         'page.booking.text.cancel-only': string;
         'page.booking.text.refund': string;

package/lib/components/booking/locales.js

@@ -235,8 +235,8 @@ var locales_default = {
       return `${customerName || ""} has already enrolled in the ${title} ${listStr.join(",")}, Are you sure you want to enroll again？`;
     },
     "page.event.booking.text.duplicate-enrollment-confirm": "Confirm",
-    "page.booking.text.unconfirmed-payements": "Unconfirmed payements",
-    "page.booking.text.unconfirmed-payements.msg": "There are unconfirmed payments,  please confirm or void the payments first.",
+    "page.booking.text.unconfirmed-payments": "Unconfirmed payments",
+    "page.booking.text.unconfirmed-payments.msg": "There are unconfirmed payments,  please confirm or void the payments first.",
     "page.booking.text.go-to-payments": "Go to payments",
     "page.booking.text.cancel-only": "Cancel only",
     "page.booking.text.refund": "Refund",
@@ -456,8 +456,8 @@ var locales_default = {
       return `${customerName || ""}已报名${title} ${listStr.join(",")}, 确定要再次报名吗？`;
     },
     "page.event.booking.text.duplicate-enrollment-confirm": "确认",
-    "page.booking.text.unconfirmed-payements": "未确认的付款",
-    "page.booking.text.unconfirmed-payements.msg": "存在未确认的付款，请先确认收款或作废。",
+    "page.booking.text.unconfirmed-payments": "未确认的付款",
+    "page.booking.text.unconfirmed-payments.msg": "存在未确认的付款，请先确认收款或作废。",
     "page.booking.text.go-to-payments": "前往收款界面",
     "page.booking.text.cancel-only": "仅取消",
     "page.booking.text.refund": "退款",
@@ -677,8 +677,8 @@ var locales_default = {
       return `${customerName || ""}已報名${title} ${listStr.join(",")}, 確定要再次報名嗎？`;
     },
     "page.event.booking.text.duplicate-enrollment-confirm": "確認",
-    "page.booking.text.unconfirmed-payements": "未確認的付款",
-    "page.booking.text.unconfirmed-payements.msg": "存在未確認的付款，請先確認收款或作廢。",
+    "page.booking.text.unconfirmed-payments": "未確認的付款",
+    "page.booking.text.unconfirmed-payments.msg": "存在未確認的付款，請先確認收款或作廢。",
     "page.booking.text.go-to-payments": "前往收款界面",
     "page.booking.text.cancel-only": "僅取消",
     "page.booking.text.refund": "退款",

package/lib/components/booking/notes/index.d.ts

@@ -4,5 +4,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Notes: (props: any) => JSX.Element;
+declare const Notes: (props: any) => any;
 export default Notes;

package/lib/components/booking/notes/model.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/booking/payments/model.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -121,7 +121,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "loading" | "success" | "warn" | "fail" | "question";
+        status: "success" | "warn" | "loading" | "fail" | "question";
     };
 };
 export declare const updateWarn: (warn: ReactNode) => {
@@ -190,16 +190,16 @@ export declare const backUpProduction: (payload: Partial<State>) => {
 export declare const backUpFree: (payload: Partial<State>) => {
     type: EActionTypes;
     payload: {
-        mode?: "refund" | "pay" | "query" | undefined;
+        mode?: "pay" | "refund" | "query" | undefined;
         eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "eftpos" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
-        type?: "unset" | "step" | undefined;
+        type?: "step" | "unset" | undefined;
         render?: boolean | undefined;
         component?: string | undefined;
         lastComponent?: string | undefined;
-        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: ReactNode;
         steps?: {
             /** 用于重置当前步骤 */

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

@@ -48,6 +48,7 @@ var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext")
 var import_utils2 = require("../../../utils");
 var import_payGroup = require("./payGroup");
 var import_locales = __toESM(require("./locales"));
+var import_utils3 = require("./utils");
 var import_index = require("./index.less");
 var ToCPay = (props, ref) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
@@ -60,6 +61,7 @@ var ToCPay = (props, ref) => {
   const [renderType, setRenderType] = (0, import_react.useState)("modal");
   const context = (0, import_useEngineContext.default)();
   const [showInformation, setShowInformation] = (0, import_react.useState)(false);
+  const [showDetectIncognitoConfirm, setShowDetectIncognitoConfirm] = (0, import_react.useState)(false);
   const utils = context.appHelper.utils || {};
   const dvaStore = (_c = (_b = (_a = context.appHelper.utils) == null ? void 0 : _a.getStore) == null ? void 0 : _b.call(_a)) == null ? void 0 : _c.getState();
   const customer_id = (_i = (_h = (_g = (_f = (_e = (_d = context.appHelper.utils) == null ? void 0 : _d.getStore()) == null ? void 0 : _e.getState) == null ? void 0 : _f.call(_e)) == null ? void 0 : _g.global) == null ? void 0 : _h.userInfo) == null ? void 0 : _i.id;
@@ -192,9 +194,18 @@ var ToCPay = (props, ref) => {
       return !isWalletPassPay;
     }
   }, [state.payGroup, waitAmount, isWalletPassPay]);
+  const getIsShowDetectIncognitoConfirm = async (payGroup) => {
+    const { isPrivate } = await (0, import_utils.detectIncognito)();
+    return ((payGroup == null ? void 0 : payGroup.wait_amount) || 0) > 0 && (0, import_utils3.getIsWalletPassAndTripartitePayment)(payGroup) && isPrivate;
+  };
   const onSubmit = async (newOrderId) => {
     var _a2;
     let newPayGroup = state.payGroup;
+    const result = await getIsShowDetectIncognitoConfirm(newPayGroup);
+    if (result) {
+      setShowDetectIncognitoConfirm(true);
+      return;
+    }
     if (!((_a2 = state.payGroup) == null ? void 0 : _a2.payment_group_id)) {
       newPayGroup = await paymentInit(newOrderId);
     }
@@ -331,6 +342,25 @@ var ToCPay = (props, ref) => {
         }
       }
     ),
+    /* @__PURE__ */ import_react.default.createElement(
+      import_materials.PisellModal.Information,
+      {
+        open: showDetectIncognitoConfirm,
+        describe: import_utils.locales.getText("tocPay.text.detectIncognitoConfirm"),
+        okText: import_utils.locales.getText("tocPay.text.copyLink"),
+        closable: true,
+        maskClosable: false,
+        onCancel: () => {
+          setShowDetectIncognitoConfirm(false);
+        },
+        onOk: async () => {
+          await (0, import_utils.copyToClipboard)(window.location.href);
+          (0, import_materials.PisellToast)({
+            content: import_utils.locales.getText("tocPay.text.copySuccess")
+          });
+        }
+      }
+    ),
     /* @__PURE__ */ import_react.default.createElement(
       import_materials.PisellLoading,
       {

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

@@ -67,6 +67,9 @@ declare const _default: {
         'tocPay.text.walletCanPay': string;
         'tocPay.text.paymentInstructions': string;
         'tocPay.text.walletSearchEmpty': string;
+        'tocPay.text.detectIncognitoConfirm': string;
+        'tocPay.text.copyLink': string;
+        'tocPay.text.copySuccess': string;
     };
     'zh-CN': {
         'tocPay.text.checkout': string;
@@ -135,6 +138,9 @@ declare const _default: {
         'tocPay.text.walletPassNoExtraPay': string;
         'tocPay.text.walletCanPay': string;
         'tocPay.text.walletSearchEmpty': string;
+        'tocPay.text.detectIncognitoConfirm': string;
+        'tocPay.text.copyLink': string;
+        'tocPay.text.copySuccess': string;
     };
     'zh-HK': {
         'tocPay.text.checkout': string;
@@ -203,6 +209,9 @@ declare const _default: {
         'tocPay.text.walletPassNoExtraPay': string;
         'tocPay.text.walletCanPay': string;
         'tocPay.text.walletSearchEmpty': string;
+        'tocPay.text.detectIncognitoConfirm': string;
+        'tocPay.text.copyLink': string;
+        'tocPay.text.copySuccess': string;
     };
 };
 export default _default;

package/lib/components/pay/toC/locales.js

@@ -90,7 +90,10 @@ var locales_default = {
     "tocPay.text.walletPassNoExtraPay": "No extra pay needed",
     "tocPay.text.walletCanPay": "You can use the balance in your wallet pass or other eligible types of voucher to pay.",
     "tocPay.text.paymentInstructions": "Instructions",
-    "tocPay.text.walletSearchEmpty": "No results found."
+    "tocPay.text.walletSearchEmpty": "No results found.",
+    "tocPay.text.detectIncognitoConfirm": "You are currently in private mode, wallet payment may not succeed. Please copy the link and continue payment in a non-private browsing tab.",
+    "tocPay.text.copyLink": "Copy link",
+    "tocPay.text.copySuccess": "Copy Success"
   },
   "zh-CN": {
     "tocPay.text.checkout": "结账",
@@ -158,7 +161,10 @@ var locales_default = {
     "tocPay.text.walletPassCompleteTitle": "请点击底部的“提交”按钮完成支付",
     "tocPay.text.walletPassNoExtraPay": "无需额外支付金额",
     "tocPay.text.walletCanPay": "您可以使用钱包内的余额或其他符合条件的代金券进行支付。",
-    "tocPay.text.walletSearchEmpty": "没有查询到任何结果。"
+    "tocPay.text.walletSearchEmpty": "没有查询到任何结果。",
+    "tocPay.text.detectIncognitoConfirm": "当前处于无痕模式，钱包支付可能失败，请复制链接在非无痕模式下继续支付。",
+    "tocPay.text.copyLink": "复制链接",
+    "tocPay.text.copySuccess": "复制成功"
   },
   "zh-HK": {
     "tocPay.text.checkout": "結帳",
@@ -226,6 +232,9 @@ var locales_default = {
     "tocPay.text.walletPassCompleteTitle": "請點擊底部的“提交”按鈕完成支付",
     "tocPay.text.walletPassNoExtraPay": "無需額外支付金額",
     "tocPay.text.walletCanPay": "您可以使用錢包內的餘額或其他符合資格的代金券進行支付。",
-    "tocPay.text.walletSearchEmpty": "沒有查詢到任何結果。"
+    "tocPay.text.walletSearchEmpty": "沒有查詢到任何結果。",
+    "tocPay.text.detectIncognitoConfirm": "目前處於無痕模式，錢包支付可能失敗，請複製連結在非無痕模式下繼續支付。",
+    "tocPay.text.copyLink": "復製链接",
+    "tocPay.text.copySuccess": "復製成功"
   }
 };

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

@@ -1,3 +1,12 @@
 export declare const paymentServices: any;
 export declare const paymentTypes: any[];
+export declare const tripartitePaymentKeys: string[];
 export declare const paymentKeys: string[];
+/**
+ * @title: 判断是否是三方支付
+ * @description:
+ * @return: *
+ * @Author: shengjie.zuo
+ * @Date: 2024-08-30 10:16:26
+ */
+export declare const isTripartitePayment: (service: string) => boolean;

package/lib/components/pay/toC/status.js

@@ -19,57 +19,72 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/pay/toC/status.ts
 var status_exports = {};
 __export(status_exports, {
+  isTripartitePayment: () => isTripartitePayment,
   paymentKeys: () => paymentKeys,
   paymentServices: () => paymentServices,
-  paymentTypes: () => paymentTypes
+  paymentTypes: () => paymentTypes,
+  tripartitePaymentKeys: () => tripartitePaymentKeys
 });
 module.exports = __toCommonJS(status_exports);
 var paymentServices = {
   // stripe支付
   stripe: {
     // url: stripe,
+    isTripartitePayment: true
   },
   // 微信支付
   "globepay.wechat.jsapi": {
     // url: wxpay,
+    isTripartitePayment: true
   },
   // 微信H5支付
   "superpay.wechat.h5": {
     // url: wxpay,
-    channel: ["wx"]
+    channel: ["wx"],
+    isTripartitePayment: true
   },
   // 支付包H5支付
   "globepay.alipay.h5": {
     // url: alipay,
-    channel: ["nowx", "phone", "ios"]
+    channel: ["nowx", "phone", "ios"],
+    isTripartitePayment: true
   },
   "globepay.paypal.h5": {
     // url: paypal,
-    channel: ["wx", "nowx", "phone", "ios"]
+    channel: ["wx", "nowx", "phone", "ios"],
+    isTripartitePayment: false
   },
   "superpay.alipay.h5": {
     // url: alipay,
+    isTripartitePayment: true
   },
   "mw.google": {
     // url: google_pay,
+    isTripartitePayment: true
   },
   "mw.apple": {
     // url: apple_pay,
+    isTripartitePayment: true
   },
   "mw.credit_card": {
     // url: credit_card,
+    isTripartitePayment: true
   },
   "pisell.bank_deposit": {
     // url: bank_deposit,
+    isTripartitePayment: false
   },
   "pisell.offline_payment": {
     // url: offline_payment,
+    isTripartitePayment: false
   },
   "pisell.other.cashmanual": {
     // url: custom,
+    isTripartitePayment: false
   },
   "pisell.custom_payment": {
     // url: custom,
+    isTripartitePayment: false
   }
 };
 var getPaymentTypes = () => {
@@ -82,11 +97,26 @@ var getPaymentTypes = () => {
   }
   return arr;
 };
+var getTripartitePaymentKeys = () => {
+  let arr = [];
+  for (let key in paymentServices) {
+    if (paymentServices[key].isTripartitePayment) {
+      arr.push(key);
+    }
+  }
+  return arr;
+};
 var paymentTypes = getPaymentTypes();
+var tripartitePaymentKeys = getTripartitePaymentKeys();
 var paymentKeys = Object.keys(paymentServices);
+var isTripartitePayment = (service) => {
+  return tripartitePaymentKeys.includes(service);
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  isTripartitePayment,
   paymentKeys,
   paymentServices,
-  paymentTypes
+  paymentTypes,
+  tripartitePaymentKeys
 });

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

@@ -28,3 +28,11 @@ export declare const formatWalletPassParams: (payGroup: PayGroup) => {
         wallet_pass_usage_unit: any;
     }[];
 };
+/**
+ * @title: 获取是否walletPass和三方支付的组合支付
+ * @description: 三方支付 (stripe  支付宝 微信  苹果 谷歌)
+ * @return: *
+ * @Author: shengjie.zuo
+ * @Date: 2024-08-30 10:06:17
+ */
+export declare const getIsWalletPassAndTripartitePayment: (payGroup: PayGroup) => boolean | 0 | undefined;

package/lib/components/pay/toC/utils.js

@@ -21,10 +21,12 @@ var utils_exports = {};
 __export(utils_exports, {
   calcWalletPassListAmount: () => calcWalletPassListAmount,
   formatWalletPassList2PreparePayments: () => formatWalletPassList2PreparePayments,
-  formatWalletPassParams: () => formatWalletPassParams
+  formatWalletPassParams: () => formatWalletPassParams,
+  getIsWalletPassAndTripartitePayment: () => getIsWalletPassAndTripartitePayment
 });
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = require("decimal.js");
+var import_status = require("./status");
 var calcWalletPassListAmount = (list) => {
   return list.reduce((pre, cur) => pre.add(new import_decimal.Decimal(String(cur.available_max_amount || 0))), new import_decimal.Decimal("0")).toNumber();
 };
@@ -54,9 +56,14 @@ var formatWalletPassParams = (payGroup) => {
     payments
   };
 };
+var getIsWalletPassAndTripartitePayment = (payGroup) => {
+  var _a, _b, _c;
+  return ((_b = (_a = payGroup == null ? void 0 : payGroup.walletPass) == null ? void 0 : _a.cards) == null ? void 0 : _b.length) && (0, import_status.isTripartitePayment)((_c = payGroup == null ? void 0 : payGroup.otherPayment) == null ? void 0 : _c.service);
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   calcWalletPassListAmount,
   formatWalletPassList2PreparePayments,
-  formatWalletPassParams
+  formatWalletPassParams,
+  getIsWalletPassAndTripartitePayment
 });

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

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: (props: any) => JSX.Element;
+declare const Schedules: (props: any) => any;
 export default Schedules;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -68,7 +69,7 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.125",
+  "version": "3.0.127",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
-    "@pisell/materials": "3.0.40",
+    "@pisell/utils": "1.0.29",
+    "@pisell/materials": "3.0.42",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "1.0.98",
-    "@pisell/utils": "1.0.29"
+    "@pisell/date-picker": "1.0.99"
   },
   "peerDependencies": {
     "react": "^18.0.0",