@blocklet/payment-react 1.13.186 → 1.13.188

package/es/components/blockchain/tx.js

@@ -1,4 +1,5 @@
 import { jsx, jsxs } from "react/jsx-runtime";
+import { useLocaleContext } from "@arcblock/ux/lib/Locale/context";
 import { OpenInNewOutlined } from "@mui/icons-material";
 import { Link, Stack, Typography } from "@mui/material";
 import { joinURL } from "ufo";
@@ -38,8 +39,9 @@ TxLink.defaultProps = {
   mode: "dashboard"
 };
 export default function TxLink(props) {
+  const { t } = useLocaleContext();
   if (!props.details || props.mode === "customer" && props.method.type === "stripe") {
-    return /* @__PURE__ */ jsx(Typography, { component: "small", color: "text.secondary", children: "None" });
+    return /* @__PURE__ */ jsx(Typography, { component: "small", color: "text.secondary", children: t("common.none") });
   }
   const { text, link } = getTxLink(props.method, props.details);
   if (link) {
@@ -48,5 +50,5 @@ export default function TxLink(props) {
       /* @__PURE__ */ jsx(OpenInNewOutlined, { fontSize: "small" })
     ] }) });
   }
-  return /* @__PURE__ */ jsx(Typography, { component: "small", color: "text.secondary", children: "None" });
+  return /* @__PURE__ */ jsx(Typography, { component: "small", color: "text.secondary", children: t("common.none") });
 }

package/es/history/invoice/list.js

@@ -40,7 +40,7 @@ export default function CustomerInvoiceList({
   const { data, loadMore, loadingMore, loading } = useInfiniteScroll(
     (d) => {
       const page = d ? Math.ceil(d.list.length / size) + 1 : 1;
-      return fetchData({ page, pageSize: size, status, customer_id, currency_id, subscription_id });
+      return fetchData({ page, pageSize: size, status, customer_id, currency_id, subscription_id, ignoreZero: true });
     },
     {
       reloadDeps: [customer_id]

package/es/locales/en.js

@@ -3,6 +3,7 @@ export default flat({
   common: {
     id: "ID",
     url: "URL",
+    none: "None",
     createdAt: "Created At",
     updatedAt: "Updated At",
     resumesAt: "Resume At",
@@ -247,6 +248,18 @@ export default flat({
         empty: "There are no subscriptions here",
         changePayment: "Change payment method"
       }
+    },
+    invoice: {
+      reason: {
+        creation: "Subscription create",
+        cycle: "Subscription cycle",
+        update: "Subscription update",
+        recover: "Subscription recover",
+        threshold: "Metered usage billing",
+        cancel: "Subscription cancel",
+        manual: "Manual invoice",
+        upcoming: "Upcoming invoice"
+      }
     }
   }
 });

package/es/locales/zh.js

@@ -3,6 +3,7 @@ export default flat({
   common: {
     id: "ID",
     url: "URL",
+    none: "\u65E0",
     createdAt: "\u521B\u5EFA\u65F6\u95F4",
     updatedAt: "\u66F4\u65B0\u65F6\u95F4",
     resumesAt: "\u6062\u590D\u65F6\u95F4",
@@ -63,13 +64,13 @@ export default flat({
     week: "\u5468",
     month: "\u6708",
     year: "\u5E74",
-    hourly: "\u6309\u5C0F\u65F6",
-    daily: "\u6309\u5929",
-    weekly: "\u6309\u5468",
-    monthly: "\u6309\u6708",
-    yearly: "\u6309\u5E74",
-    month3: "\u6309\u5B63\u5EA6",
-    month6: "\u6309\u534A\u5E74",
+    hourly: "\u6BCF\u5C0F\u65F6",
+    daily: "\u6BCF\u5929",
+    weekly: "\u6BCF\u5468",
+    monthly: "\u6BCF\u6708",
+    yearly: "\u6BCF\u5E74",
+    month3: "\u6BCF\u5B63\u5EA6",
+    month6: "\u6BCF\u534A\u5E74",
     recurring: "\u6BCF{count}{interval}",
     hours: "\u5C0F\u65F6",
     days: "\u5929",
@@ -247,6 +248,18 @@ export default flat({
         empty: "\u6CA1\u6709\u4EFB\u4F55\u8BA2\u9605",
         changePayment: "\u5207\u6362\u652F\u4ED8\u65B9\u5F0F"
       }
+    },
+    invoice: {
+      reason: {
+        creation: "\u8BA2\u9605\u521B\u5EFA",
+        cycle: "\u81EA\u52A8\u6263\u8D39",
+        update: "\u8BA2\u9605\u66F4\u65B0",
+        recover: "\u8BA2\u9605\u6062\u590D",
+        threshold: "\u7528\u91CF\u8D26\u5355",
+        cancel: "\u8BA2\u9605\u53D6\u6D88",
+        manual: "\u4EBA\u5DE5\u8D26\u5355",
+        upcoming: "\u672A\u6765\u8D26\u5355"
+      }
     }
   }
 });

package/es/util.js

@@ -125,6 +125,14 @@ export function formatRecurring(recurring, translate = true, separator = "per",
     const interval = t(`common.${recurring.interval}`, locale);
     return translate ? t(`common.${intervals[recurring.interval]}`, locale) : separator ? t(`common.${separator}`, locale, { interval }) : interval;
   }
+  if (recurring.interval === "month") {
+    if (recurring.interval_count === 3) {
+      return t("common.month3", locale);
+    }
+    if (recurring.interval_count === 6) {
+      return t("common.month6", locale);
+    }
+  }
   return t("common.recurring", locale, {
     count: recurring.interval_count,
     interval: t(`common.${recurring.interval}s`, locale)

package/lib/components/blockchain/tx.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 module.exports = TxLink;
 var _jsxRuntime = require("react/jsx-runtime");
+var _context = require("@arcblock/ux/lib/Locale/context");
 var _iconsMaterial = require("@mui/icons-material");
 var _material = require("@mui/material");
 var _ufo = require("ufo");
@@ -43,11 +44,14 @@ TxLink.defaultProps = {
   mode: "dashboard"
 };
 function TxLink(props) {
+  const {
+    t
+  } = (0, _context.useLocaleContext)();
   if (!props.details || props.mode === "customer" && props.method.type === "stripe") {
     return /* @__PURE__ */(0, _jsxRuntime.jsx)(_material.Typography, {
       component: "small",
       color: "text.secondary",
-      children: "None"
+      children: t("common.none")
     });
   }
   const {
@@ -77,6 +81,6 @@ function TxLink(props) {
   return /* @__PURE__ */(0, _jsxRuntime.jsx)(_material.Typography, {
     component: "small",
     color: "text.secondary",
-    children: "None"
+    children: t("common.none")
   });
 }

package/lib/history/invoice/list.js

@@ -59,7 +59,8 @@ function CustomerInvoiceList({
       status,
       customer_id,
       currency_id,
-      subscription_id
+      subscription_id,
+      ignoreZero: true
     });
   }, {
     reloadDeps: [customer_id]

package/lib/locales/en.js

@@ -10,6 +10,7 @@ module.exports = (0, _flat.default)({
   common: {
     id: "ID",
     url: "URL",
+    none: "None",
     createdAt: "Created At",
     updatedAt: "Updated At",
     resumesAt: "Resume At",
@@ -254,6 +255,18 @@ module.exports = (0, _flat.default)({
         empty: "There are no subscriptions here",
         changePayment: "Change payment method"
       }
+    },
+    invoice: {
+      reason: {
+        creation: "Subscription create",
+        cycle: "Subscription cycle",
+        update: "Subscription update",
+        recover: "Subscription recover",
+        threshold: "Metered usage billing",
+        cancel: "Subscription cancel",
+        manual: "Manual invoice",
+        upcoming: "Upcoming invoice"
+      }
     }
   }
 });

package/lib/locales/zh.js

@@ -10,6 +10,7 @@ module.exports = (0, _flat.default)({
   common: {
     id: "ID",
     url: "URL",
+    none: "\u65E0",
     createdAt: "\u521B\u5EFA\u65F6\u95F4",
     updatedAt: "\u66F4\u65B0\u65F6\u95F4",
     resumesAt: "\u6062\u590D\u65F6\u95F4",
@@ -70,13 +71,13 @@ module.exports = (0, _flat.default)({
     week: "\u5468",
     month: "\u6708",
     year: "\u5E74",
-    hourly: "\u6309\u5C0F\u65F6",
-    daily: "\u6309\u5929",
-    weekly: "\u6309\u5468",
-    monthly: "\u6309\u6708",
-    yearly: "\u6309\u5E74",
-    month3: "\u6309\u5B63\u5EA6",
-    month6: "\u6309\u534A\u5E74",
+    hourly: "\u6BCF\u5C0F\u65F6",
+    daily: "\u6BCF\u5929",
+    weekly: "\u6BCF\u5468",
+    monthly: "\u6BCF\u6708",
+    yearly: "\u6BCF\u5E74",
+    month3: "\u6BCF\u5B63\u5EA6",
+    month6: "\u6BCF\u534A\u5E74",
     recurring: "\u6BCF{count}{interval}",
     hours: "\u5C0F\u65F6",
     days: "\u5929",
@@ -254,6 +255,18 @@ module.exports = (0, _flat.default)({
         empty: "\u6CA1\u6709\u4EFB\u4F55\u8BA2\u9605",
         changePayment: "\u5207\u6362\u652F\u4ED8\u65B9\u5F0F"
       }
+    },
+    invoice: {
+      reason: {
+        creation: "\u8BA2\u9605\u521B\u5EFA",
+        cycle: "\u81EA\u52A8\u6263\u8D39",
+        update: "\u8BA2\u9605\u66F4\u65B0",
+        recover: "\u8BA2\u9605\u6062\u590D",
+        threshold: "\u7528\u91CF\u8D26\u5355",
+        cancel: "\u8BA2\u9605\u53D6\u6D88",
+        manual: "\u4EBA\u5DE5\u8D26\u5355",
+        upcoming: "\u672A\u6765\u8D26\u5355"
+      }
     }
   }
 });

package/lib/util.js

@@ -180,6 +180,14 @@ function formatRecurring(recurring, translate = true, separator = "per", locale
       interval
     }) : interval;
   }
+  if (recurring.interval === "month") {
+    if (recurring.interval_count === 3) {
+      return (0, _locales.t)("common.month3", locale);
+    }
+    if (recurring.interval_count === 6) {
+      return (0, _locales.t)("common.month6", locale);
+    }
+  }
   return (0, _locales.t)("common.recurring", locale, {
     count: recurring.interval_count,
     interval: (0, _locales.t)(`common.${recurring.interval}s`, locale)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-react",
-  "version": "1.13.186",
+  "version": "1.13.188",
   "description": "Reusable react components for payment kit v2",
   "keywords": [
     "react",
@@ -90,7 +90,7 @@
     "@babel/core": "^7.23.9",
     "@babel/preset-env": "^7.23.9",
     "@babel/preset-react": "^7.23.3",
-    "@blocklet/payment-types": "1.13.186",
+    "@blocklet/payment-types": "1.13.188",
     "@storybook/addon-essentials": "^7.6.13",
     "@storybook/addon-interactions": "^7.6.13",
     "@storybook/addon-links": "^7.6.13",
@@ -119,5 +119,5 @@
     "vite-plugin-babel": "^1.2.0",
     "vite-plugin-node-polyfills": "^0.19.0"
   },
-  "gitHead": "1200eebf624b5d09fce59f718490e321409f4b44"
+  "gitHead": "c6755c93da4e1d3a97352be3c6dcc3554bef0b62"
 }

package/src/components/blockchain/tx.tsx

@@ -1,3 +1,4 @@
+import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import type { PaymentDetails, TPaymentMethod } from '@blocklet/payment-types';
 import { OpenInNewOutlined } from '@mui/icons-material';
 import { Link, Stack, Typography } from '@mui/material';
@@ -46,10 +47,12 @@ export default function TxLink(props: {
   method: TPaymentMethod;
   mode?: 'customer' | 'dashboard';
 }) {
+  const { t } = useLocaleContext();
+
   if (!props.details || (props.mode === 'customer' && props.method.type === 'stripe')) {
     return (
       <Typography component="small" color="text.secondary">
-        None
+        {t('common.none')}
       </Typography>
     );
   }
@@ -71,7 +74,7 @@ export default function TxLink(props: {
 
   return (
     <Typography component="small" color="text.secondary">
-      None
+      {t('common.none')}
     </Typography>
   );
 }

package/src/history/invoice/list.tsx

@@ -56,7 +56,7 @@ export default function CustomerInvoiceList({
   const { data, loadMore, loadingMore, loading } = useInfiniteScroll<Paginated<TInvoiceExpanded>>(
     (d) => {
       const page = d ? Math.ceil(d.list.length / size) + 1 : 1;
-      return fetchData({ page, pageSize: size, status, customer_id, currency_id, subscription_id });
+      return fetchData({ page, pageSize: size, status, customer_id, currency_id, subscription_id, ignoreZero: true });
     },
     {
       reloadDeps: [customer_id],

package/src/locales/en.tsx

@@ -4,6 +4,7 @@ export default flat({
   common: {
     id: 'ID',
     url: 'URL',
+    none: 'None',
     createdAt: 'Created At',
     updatedAt: 'Updated At',
     resumesAt: 'Resume At',
@@ -257,5 +258,17 @@ export default flat({
         changePayment: 'Change payment method',
       },
     },
+    invoice: {
+      reason: {
+        creation: 'Subscription create',
+        cycle: 'Subscription cycle',
+        update: 'Subscription update',
+        recover: 'Subscription recover',
+        threshold: 'Metered usage billing',
+        cancel: 'Subscription cancel',
+        manual: 'Manual invoice',
+        upcoming: 'Upcoming invoice',
+      },
+    },
   },
 });

package/src/locales/zh.tsx

@@ -4,6 +4,7 @@ export default flat({
   common: {
     id: 'ID',
     url: 'URL',
+    none: '无',
     createdAt: '创建时间',
     updatedAt: '更新时间',
     resumesAt: '恢复时间',
@@ -64,13 +65,13 @@ export default flat({
     week: '周',
     month: '月',
     year: '年',
-    hourly: '按小时',
-    daily: '按天',
-    weekly: '按周',
-    monthly: '按月',
-    yearly: '按年',
-    month3: '按季度',
-    month6: '按半年',
+    hourly: '每小时',
+    daily: '每天',
+    weekly: '每周',
+    monthly: '每月',
+    yearly: '每年',
+    month3: '每季度',
+    month6: '每半年',
     recurring: '每{count}{interval}',
     hours: '小时',
     days: '天',
@@ -250,5 +251,17 @@ export default flat({
         changePayment: '切换支付方式',
       },
     },
+    invoice: {
+      reason: {
+        creation: '订阅创建',
+        cycle: '自动扣费',
+        update: '订阅更新',
+        recover: '订阅恢复',
+        threshold: '用量账单',
+        cancel: '订阅取消',
+        manual: '人工账单',
+        upcoming: '未来账单',
+      },
+    },
   },
 });

package/src/util.ts

@@ -197,6 +197,15 @@ export function formatRecurring(
     return translate ? t(`common.${intervals[recurring.interval]}`, locale) : separator ? t(`common.${separator}`, locale, { interval }) : interval; // prettier-ignore
   }
 
+  if (recurring.interval === 'month') {
+    if (recurring.interval_count === 3) {
+      return t('common.month3', locale);
+    }
+    if (recurring.interval_count === 6) {
+      return t('common.month6', locale);
+    }
+  }
+
   return t('common.recurring', locale, {
     count: recurring.interval_count,
     interval: t(`common.${recurring.interval}s`, locale),