@pisell/private-materials 6.7.8 → 6.8.1

package/lib/components/list/utils/index.js

@@ -31,13 +31,40 @@ var utils_exports = {};
 __export(utils_exports, {
   createGetText: () => import_getText.createGetText,
   createGetTextDefault: () => import_getText.default,
+  findProductIdsByPath: () => findProductIdsByPath,
   useGetText: () => import_getText.useGetText
 });
 module.exports = __toCommonJS(utils_exports);
 var import_getText = __toESM(require("./getText"));
+var findProductIdsByPath = (nodes, levelPath, currentLevel = 0) => {
+  const lastItem = levelPath[levelPath.length - 1];
+  const effectivePath = (lastItem === 0 || lastItem === "0") && levelPath.length > 1 ? levelPath.slice(0, -1) : levelPath;
+  if (!nodes || nodes.length === 0 || currentLevel >= effectivePath.length) {
+    return [];
+  }
+  const targetId = effectivePath[currentLevel];
+  const targetNode = nodes.find(
+    (node) => String(node.id) === String(targetId) || String(node.key) === String(targetId)
+  );
+  if (!targetNode) {
+    return [];
+  }
+  if (currentLevel === effectivePath.length - 1) {
+    return targetNode.productIds || [];
+  }
+  if (targetNode.children && targetNode.children.length > 0) {
+    return findProductIdsByPath(
+      targetNode.children,
+      effectivePath,
+      currentLevel + 1
+    );
+  }
+  return targetNode.productIds || [];
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createGetText,
   createGetTextDefault,
+  findProductIdsByPath,
   useGetText
 });

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

@@ -258,7 +258,7 @@ var checkTDSAuth = async (step2, step3, callback) => {
         billAddrLine1: paymentInfo.billingAddress.billAddrLine1,
         billAddrPostCode: paymentInfo.billingAddress.billAddrPostCode,
         billAddrState: paymentInfo.billingAddress.billAddrState,
-        threeDSCompInd: isPre ? "" : threeDSCompInd,
+        threeDSCompInd: isPre ? "" : threeDSCompInd || "N",
         threeDSServerTransID: isPre ? "" : threeDSServerTransID,
         threeDSRequestorAuthenticationInd: "01",
         threeDSRequestorURL: window.location.href,
@@ -311,26 +311,28 @@ var createChallengeIframe = (challengeData, callback) => {
   };
   return new Promise((res, rej) => {
     let timer = null;
+    const handleMessage = (event) => {
+      if (event.origin.indexOf(postmessageUrl) !== -1 || event.origin.indexOf("securesuite") !== -1) {
+        if (typeof event.data.cres == "string") {
+          if (timer) {
+            clearTimeout(timer);
+          }
+          res(event.data.cres);
+          closeIframe();
+        }
+      }
+    };
     timer = setTimeout(() => {
       log({
         msg: "第五步: 60秒超时则走N逻辑",
         data: challengeData
       });
+      window.removeEventListener("message", handleMessage);
       rej("time out");
     }, 2 * 60 * 1e3);
     window.addEventListener(
       "message",
-      (event) => {
-        if (event.origin.indexOf(postmessageUrl) !== -1 || event.origin.indexOf("securesuite") !== -1) {
-          if (typeof event.data.cres == "string") {
-            if (timer) {
-              clearTimeout(timer);
-            }
-            res(event.data.cres);
-            closeIframe();
-          }
-        }
-      },
+      handleMessage,
       false
     );
   });

package/lib/components/pay/toC/PaymentMethods/WalletPass/serve.d.ts

@@ -50,6 +50,12 @@ export declare type WalletPassDataType = {
     shop: Shop;
     wallet_pass_usage?: any;
     balance_par_value: string;
+    custom_schedule_snapshot?: {
+        data: any[];
+    };
+    metadata?: {
+        validity_type: string;
+    };
 };
 declare type Shop = {
     id: number;

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

@@ -39,7 +39,7 @@ var voucherTime = (data) => {
 };
 var formatMachineCodeServer2CardList = (data, selectId = []) => {
   return (data || []).map((item) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     return {
       id: item.id,
       name: item.product_name,
@@ -58,7 +58,9 @@ var formatMachineCodeServer2CardList = (data, selectId = []) => {
       cover: (_c = item.product) == null ? void 0 : _c.cover,
       qrCode: item.code,
       validDate: voucherTime(item),
-      originData: item
+      originData: item,
+      scheduleList: ((_d = item.custom_schedule_snapshot) == null ? void 0 : _d.data) || [],
+      validDateBySchedule: ((_e = item.metadata) == null ? void 0 : _e.validity_type) === "custom_schedule_validity"
     };
   });
 };

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

@@ -83,6 +83,6 @@ var PaymentReturnContent = ({
       });
     }
   };
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-return-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-return-content-img" }, /* @__PURE__ */ import_react.default.createElement("img", { src: `${prefix}/payment-content.png`, alt: "success" })), /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-return-content-buttons" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { block: true, className: "payment-return-content-order-button", onClick: handleViewOrder }, import_utils.locales.getText("tocPay.text.paymentCompletedAndViewOrder")), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { block: true, onClick: handleGoBack }, import_utils.locales.getText("tocPay.text.returnAndSelectOtherPaymentMethod"))));
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-return-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-return-content-img" }, /* @__PURE__ */ import_react.default.createElement("img", { src: `${prefix}/payment-content.png`, alt: "success" })), /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-return-content-text" }, import_utils.locales.getText("tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater")), /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-return-content-buttons" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { block: true, className: "payment-return-content-order-button", onClick: handleViewOrder }, import_utils.locales.getText("tocPay.text.paymentCompletedAndViewOrder")), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { block: true, onClick: handleGoBack }, import_utils.locales.getText("tocPay.text.returnAndSelectOtherPaymentMethod"))));
 };
 var PaymentReturnContent_default = PaymentReturnContent;

package/lib/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.less

@@ -1,16 +1,26 @@
 .payment-return-content {
   padding: 100px 46px 0;
+  max-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  gap: 24px;
 
   .payment-return-content-img {
     width: 100%;
-    margin-bottom: 60px;
     min-height: 270px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
     img {
-      width: 100%;
+      max-width: 100%;
       height: 100%;
+      max-height: 480px;
     }
   }
-  
+  .payment-return-content-text {
+    color: var(--Gray-600, #475467);
+    text-align: center;
+  }
   .payment-return-content-buttons {
     display: flex;
     flex-direction: column;

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

@@ -50,6 +50,7 @@ var import_utils2 = require("../../../utils");
 var import_payGroup = require("./payGroup");
 var import_locales = __toESM(require("./locales"));
 var import_utils3 = require("./utils");
+var import_status = require("./status");
 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, _r, _s, _t, _u;
@@ -98,7 +99,8 @@ var ToCPay = (props, ref) => {
   };
   const getWalletSetting = async (initProps) => {
     var _a2, _b2;
-    const sale_channel = ((_a2 = initProps == null ? void 0 : initProps.order) == null ? void 0 : _a2.sale_channel) || "online-store";
+    let sale_channel = ((_a2 = initProps == null ? void 0 : initProps.order) == null ? void 0 : _a2.sale_channel) || "online-store";
+    sale_channel = import_status.saleChannelMap[sale_channel] || sale_channel;
     const { wallet, wallet_setting } = await (0, import_serve.getWalletNameAndPopupStatus)({
       setting_type: `${sale_channel}-wallet-setting`
     });
@@ -323,6 +325,7 @@ var ToCPay = (props, ref) => {
           fn: "paymentInit"
         }
       });
+      throw err;
     }
   };
   const waitAmount = (0, import_react.useMemo)(() => {

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

@@ -97,6 +97,7 @@ declare const _default: {
         'tocPay.text.returnAndSelectOtherPaymentMethod': string;
         'tocPay.text.paymentCompletedAndViewOrder': string;
         'tocPay.text.paymentFailed': string;
+        'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
     };
     'zh-CN': {
         'tocPay.text.checkout': string;
@@ -195,6 +196,7 @@ declare const _default: {
         'tocPay.text.returnAndSelectOtherPaymentMethod': string;
         'tocPay.text.paymentCompletedAndViewOrder': string;
         'tocPay.text.paymentFailed': string;
+        'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
     };
     'zh-HK': {
         'tocPay.text.checkout': string;
@@ -293,6 +295,7 @@ declare const _default: {
         'tocPay.text.returnAndSelectOtherPaymentMethod': string;
         'tocPay.text.paymentCompletedAndViewOrder': string;
         'tocPay.text.paymentFailed': string;
+        'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
     };
 };
 export default _default;

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

@@ -120,7 +120,8 @@ var locales_default = {
     "tocPay.text.viewDetail": "View detail",
     "tocPay.text.returnAndSelectOtherPaymentMethod": "Go Back / Choose Another Payment",
     "tocPay.text.paymentCompletedAndViewOrder": "Payment Completed / View Order",
-    "tocPay.text.paymentFailed": "Not paid yet, please check if the payment is successful"
+    "tocPay.text.paymentFailed": "Not paid yet, please check if the payment is successful",
+    "tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater": "We are verifying your payment. Please check your order status later."
   },
   "zh-CN": {
     "tocPay.text.checkout": "结账",
@@ -218,7 +219,8 @@ var locales_default = {
     "tocPay.text.viewDetail": "查看详情",
     "tocPay.text.returnAndSelectOtherPaymentMethod": "返回 / 选择其他支付方式",
     "tocPay.text.paymentCompletedAndViewOrder": "支付完成 / 查看订单",
-    "tocPay.text.paymentFailed": "未支付完成，请检查是否支付成功"
+    "tocPay.text.paymentFailed": "未支付完成，请检查是否支付成功",
+    "tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater": "我们正在确认您的支付状态，请稍后查看订单状态。"
   },
   "zh-HK": {
     "tocPay.text.checkout": "結帳",
@@ -316,6 +318,7 @@ var locales_default = {
     "tocPay.text.viewDetail": "查看詳情",
     "tocPay.text.returnAndSelectOtherPaymentMethod": "返回 / 選擇其他支付方式",
     "tocPay.text.paymentCompletedAndViewOrder": "支付完成 / 查看訂單",
-    "tocPay.text.paymentFailed": "未支付完成，请检查是否支付成功"
+    "tocPay.text.paymentFailed": "未支付完成，请检查是否支付成功",
+    "tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater": "我們正在確認您的支付狀態，請稍後查看訂單狀態。"
   }
 };

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -29,4 +30,11 @@ export interface PayGroup {
     _order: any;
     front_order_uuid?: string;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

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

@@ -10,3 +10,4 @@ export declare const paymentKeys: string[];
  * @Date: 2024-08-30 10:16:26
  */
 export declare const isTripartitePayment: (service: string) => boolean;
+export declare const saleChannelMap: Record<string, string>;

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

@@ -23,6 +23,7 @@ __export(status_exports, {
   paymentKeys: () => paymentKeys,
   paymentServices: () => paymentServices,
   paymentTypes: () => paymentTypes,
+  saleChannelMap: () => saleChannelMap,
   tripartitePaymentKeys: () => tripartitePaymentKeys
 });
 module.exports = __toCommonJS(status_exports);
@@ -112,11 +113,15 @@ var paymentKeys = Object.keys(paymentServices);
 var isTripartitePayment = (service) => {
   return tripartitePaymentKeys.includes(service);
 };
+var saleChannelMap = {
+  "mobile_order": "mobile-order"
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   isTripartitePayment,
   paymentKeys,
   paymentServices,
   paymentTypes,
+  saleChannelMap,
   tripartitePaymentKeys
 });

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,4 +69,11 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/subTotal/index.js

@@ -74,7 +74,7 @@ var Item = (props) => {
     }
     let str = "";
     str = str + (tax == null ? void 0 : tax.title);
-    str = str + " " + Number(tax.rate) * 100 + "%";
+    str = str + " " + (Number(tax.rate) * 100).toFixed(2) + "%";
     if (tax == null ? void 0 : tax.is_price_include_tax) {
       str = str + " " + import_utils.locales.getText("pisell2.subtotal.included");
     } else {

package/lib/components/systemSettings/registry/components/GroupModal.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import { GroupModalProps } from '../types';
+declare const GroupModal: React.FC<GroupModalProps>;
+export default GroupModal;

package/lib/components/systemSettings/registry/components/GroupModal.js

@@ -0,0 +1,177 @@
+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)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  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/systemSettings/registry/components/GroupModal.tsx
+var GroupModal_exports = {};
+__export(GroupModal_exports, {
+  default: () => GroupModal_default
+});
+module.exports = __toCommonJS(GroupModal_exports);
+var import_react = __toESM(require("react"));
+var import_antd = require("antd");
+var import_materials = require("@pisell/materials");
+var import_utils = require("@pisell/utils");
+var import_locales = __toESM(require("../locales"));
+var getText = (key) => {
+  const globalText = import_utils.locales.getText(key);
+  if (globalText !== key) {
+    return globalText;
+  }
+  const currentLocale = import_utils.locales.locale || "zh-CN";
+  const localeData = import_locales.default[currentLocale] || import_locales.default["en"] || {};
+  return localeData[key] || key;
+};
+var GroupModal = ({
+  open,
+  type,
+  data,
+  onOk,
+  onCancel
+}) => {
+  const [form] = import_antd.Form.useForm();
+  (0, import_react.useEffect)(() => {
+    if (open) {
+      if (type === "edit" && data) {
+        form.setFieldsValue({
+          title: data.title,
+          code: data.code
+        });
+      } else {
+        form.resetFields();
+      }
+    }
+  }, [open, type, data, form]);
+  const handleOk = async () => {
+    try {
+      const values = await form.validateFields();
+      await onOk(values);
+      form.resetFields();
+    } catch (error) {
+      console.error("Validation failed:", error);
+    }
+  };
+  const handleCancel = () => {
+    form.resetFields();
+    onCancel();
+  };
+  const title = import_utils.locales.getText(
+    type === "add" ? "registry.modal.add.group" : "registry.modal.edit.group"
+  );
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Drawer,
+    {
+      title,
+      open,
+      onClose: handleCancel,
+      width: 400,
+      destroyOnClose: true,
+      footer: /* @__PURE__ */ import_react.default.createElement("div", { style: { textAlign: "right" } }, /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { size: "small" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { onClick: handleCancel }, import_utils.locales.getText("registry.button.cancel")), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { type: "primary", onClick: handleOk }, import_utils.locales.getText("registry.button.save"))))
+    },
+    /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Form,
+      {
+        form,
+        layout: "vertical",
+        requiredMark: true
+      },
+      /* @__PURE__ */ import_react.default.createElement(
+        import_antd.Form.Item,
+        {
+          name: "title",
+          label: import_utils.locales.getText("registry.form.title"),
+          rules: [
+            {
+              required: true,
+              message: import_utils.locales.getText("registry.message.required")
+            }
+          ]
+        },
+        /* @__PURE__ */ import_react.default.createElement(
+          import_materials.BaseTranslation,
+          {
+            placeholder: import_utils.locales.getText("registry.form.name.placeholder")
+          }
+        )
+      ),
+      /* @__PURE__ */ import_react.default.createElement(
+        import_antd.Form.Item,
+        {
+          name: "code",
+          label: import_utils.locales.getText("registry.form.code"),
+          rules: [
+            {
+              required: true,
+              message: import_utils.locales.getText("registry.message.required")
+            },
+            {
+              validator: (_, value) => {
+                if (!value) return Promise.resolve();
+                if (!/^[a-z0-9\._]+$/.test(value)) {
+                  return Promise.reject(
+                    new Error(
+                      getText("registry.message.code.format")
+                    )
+                  );
+                }
+                if (!/^[a-z]/.test(value)) {
+                  return Promise.reject(
+                    new Error(
+                      getText("registry.message.code.start")
+                    )
+                  );
+                }
+                if (/[\._]$/.test(value)) {
+                  return Promise.reject(
+                    new Error(
+                      getText("registry.message.code.end")
+                    )
+                  );
+                }
+                if (/[\.]{2,}|[\_]{2,}/.test(value)) {
+                  return Promise.reject(
+                    new Error(
+                      getText("registry.message.code.consecutive")
+                    )
+                  );
+                }
+                return Promise.resolve();
+              }
+            }
+          ]
+        },
+        /* @__PURE__ */ import_react.default.createElement(
+          import_antd.Input,
+          {
+            placeholder: import_utils.locales.getText("registry.form.code.placeholder")
+          }
+        )
+      )
+    )
+  );
+};
+var GroupModal_default = GroupModal;

package/lib/components/systemSettings/registry/components/ItemModal.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import { ItemModalProps } from '../types';
+declare const ItemModal: React.FC<ItemModalProps>;
+export default ItemModal;