@blocklet/payment-react 1.13.185 → 1.13.187

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/history/mini-invoice/list.js

@@ -135,7 +135,7 @@ export default function MiniInvoiceList() {
                 variant: "contained",
                 sx: { color: "#fff!important", width: subscription.service_actions?.length ? "auto" : "100%" },
                 href: joinURL(window.location.origin, getPrefix(), `/customer/subscription/${subscription.id}`),
-                children: t("payment.customer.subscriptions.title")
+                children: t("payment.customer.subscriptions.view")
               }
             )
           ] })

package/es/locales/en.js

@@ -242,6 +242,7 @@ export default flat({
         plan: "Plan",
         nextInvoice: "Next Invoice",
         title: "Manage subscriptions",
+        view: "View Subscription",
         current: "Current subscription",
         empty: "There are no subscriptions here",
         changePayment: "Change payment method"

package/es/locales/zh.js

@@ -63,13 +63,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",
@@ -242,6 +242,7 @@ export default flat({
         plan: "\u8BA2\u9605",
         nextInvoice: "\u4E0B\u4E00\u5F20\u8D26\u5355",
         title: "\u8BA2\u9605\u7BA1\u7406",
+        view: "\u7BA1\u7406\u8BA2\u9605",
         current: "\u5F53\u524D\u8BA2\u9605",
         empty: "\u6CA1\u6709\u4EFB\u4F55\u8BA2\u9605",
         changePayment: "\u5207\u6362\u652F\u4ED8\u65B9\u5F0F"

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/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/history/mini-invoice/list.js

@@ -212,7 +212,7 @@ function MiniInvoiceList() {
             width: subscription.service_actions?.length ? "auto" : "100%"
           },
           href: (0, _ufo.joinURL)(window.location.origin, (0, _util.getPrefix)(), `/customer/subscription/${subscription.id}`),
-          children: t("payment.customer.subscriptions.title")
+          children: t("payment.customer.subscriptions.view")
         })]
       })]
     })]

package/lib/locales/en.js

@@ -249,6 +249,7 @@ module.exports = (0, _flat.default)({
         plan: "Plan",
         nextInvoice: "Next Invoice",
         title: "Manage subscriptions",
+        view: "View Subscription",
         current: "Current subscription",
         empty: "There are no subscriptions here",
         changePayment: "Change payment method"

package/lib/locales/zh.js

@@ -70,13 +70,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",
@@ -249,6 +249,7 @@ module.exports = (0, _flat.default)({
         plan: "\u8BA2\u9605",
         nextInvoice: "\u4E0B\u4E00\u5F20\u8D26\u5355",
         title: "\u8BA2\u9605\u7BA1\u7406",
+        view: "\u7BA1\u7406\u8BA2\u9605",
         current: "\u5F53\u524D\u8BA2\u9605",
         empty: "\u6CA1\u6709\u4EFB\u4F55\u8BA2\u9605",
         changePayment: "\u5207\u6362\u652F\u4ED8\u65B9\u5F0F"

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.185",
+  "version": "1.13.187",
   "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.185",
+    "@blocklet/payment-types": "1.13.187",
     "@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": "4780ee769cd4f0a7e4c415fd2209dea6711a6b74"
+  "gitHead": "1eba252975f6a974397c878738badaca8388bb7a"
 }

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/history/mini-invoice/list.tsx

@@ -170,7 +170,7 @@ export default function MiniInvoiceList() {
             variant="contained"
             sx={{ color: '#fff!important', width: subscription.service_actions?.length ? 'auto' : '100%' }}
             href={joinURL(window.location.origin, getPrefix(), `/customer/subscription/${subscription.id}`)}>
-            {t('payment.customer.subscriptions.title')}
+            {t('payment.customer.subscriptions.view')}
           </Button>
         </Stack>
       </Box>

package/src/locales/en.tsx

@@ -251,6 +251,7 @@ export default flat({
         plan: 'Plan',
         nextInvoice: 'Next Invoice',
         title: 'Manage subscriptions',
+        view: 'View Subscription',
         current: 'Current subscription',
         empty: 'There are no subscriptions here',
         changePayment: 'Change payment method',

package/src/locales/zh.tsx

@@ -64,13 +64,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: '天',
@@ -244,6 +244,7 @@ export default flat({
         plan: '订阅',
         nextInvoice: '下一张账单',
         title: '订阅管理',
+        view: '管理订阅',
         current: '当前订阅',
         empty: '没有任何订阅',
         changePayment: '切换支付方式',

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),