payment-kit 1.23.5 → 1.23.6

package/api/src/routes/payment-currencies.ts

@@ -19,6 +19,7 @@ import { checkDepositVaultAmount } from '../libs/payment';
 import { getTokenSummaryByDid } from '../integrations/arcblock/stake';
 import { MetadataSchema } from '../libs/api';
 import { getRechargePaymentUrl } from '../libs/currency';
+import { checkCurrencySupportRecurring } from '../libs/product';
 
 const router = Router();
 
@@ -577,4 +578,29 @@ router.put('/:id/recharge-config', auth, async (req, res) => {
   });
 });
 
+// check if currencies support recurring subscriptions
+router.post('/check-recurring-support', async (req, res) => {
+  try {
+    const { currency_ids: currencyIds } = req.body;
+    if (!Array.isArray(currencyIds)) {
+      return res.status(400).json({ error: 'currency_ids must be an array' });
+    }
+    if (currencyIds.length === 0) {
+      return res.status(400).json({ error: 'currency_ids cannot be empty' });
+    }
+    const { notSupportCurrencies, validate } = await checkCurrencySupportRecurring(currencyIds, true);
+    return res.json({
+      supported: validate,
+      unsupported_currencies: notSupportCurrencies.map((c) => ({
+        id: c.id,
+        name: c.name,
+        symbol: c.symbol,
+      })),
+    });
+  } catch (err) {
+    logger.error('check recurring support error', err);
+    return res.status(400).json({ error: err.message });
+  }
+});
+
 export default router;

package/blocklet.yml

@@ -14,7 +14,7 @@ repository:
   type: git
   url: git+https://github.com/blocklet/payment-kit.git
 specVersion: 1.2.8
-version: 1.23.5
+version: 1.23.6
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.23.5",
+  "version": "1.23.6",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -44,7 +44,7 @@
     ]
   },
   "dependencies": {
-    "@abtnode/cron": "^1.17.5",
+    "@abtnode/cron": "^1.17.6",
     "@arcblock/did": "^1.27.15",
     "@arcblock/did-connect-react": "^3.2.19",
     "@arcblock/did-connect-storage-nedb": "^1.8.0",
@@ -56,15 +56,15 @@
     "@arcblock/vc": "^1.27.15",
     "@blocklet/did-space-js": "^1.2.11",
     "@blocklet/error": "^0.3.5",
-    "@blocklet/js-sdk": "^1.17.5",
-    "@blocklet/logger": "^1.17.5",
-    "@blocklet/payment-broker-client": "1.23.5",
-    "@blocklet/payment-react": "1.23.5",
-    "@blocklet/payment-vendor": "1.23.5",
-    "@blocklet/sdk": "^1.17.5",
+    "@blocklet/js-sdk": "^1.17.6",
+    "@blocklet/logger": "^1.17.6",
+    "@blocklet/payment-broker-client": "1.23.6",
+    "@blocklet/payment-react": "1.23.6",
+    "@blocklet/payment-vendor": "1.23.6",
+    "@blocklet/sdk": "^1.17.6",
     "@blocklet/ui-react": "^3.2.19",
-    "@blocklet/uploader": "^0.3.16",
-    "@blocklet/xss": "^0.3.14",
+    "@blocklet/uploader": "^0.3.17",
+    "@blocklet/xss": "^0.3.15",
     "@mui/icons-material": "^7.1.2",
     "@mui/lab": "7.0.0-beta.14",
     "@mui/material": "^7.1.2",
@@ -128,9 +128,9 @@
     "web3": "^4.16.0"
   },
   "devDependencies": {
-    "@abtnode/types": "^1.17.5",
+    "@abtnode/types": "^1.17.6",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.23.5",
+    "@blocklet/payment-types": "1.23.6",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -177,5 +177,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "486456ed522207cc4efa54cd14b1f65c6433d179"
+  "gitHead": "0026a41a10475159d72ade801561d6cbce0008fe"
 }

package/src/components/customer/related-credit-grants.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable react/no-unstable-nested-components */
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import { formatBNStr, formatToDate, Table, usePaymentContext } from '@blocklet/payment-react';
+import { formatBNStr, formatCreditAmount, formatToDate, Table, usePaymentContext } from '@blocklet/payment-react';
 import type { TCreditGrantExpanded } from '@blocklet/payment-types';
 import { Box, Chip, Divider, styled, Typography } from '@mui/material';
 import { useNavigate } from 'react-router-dom';
@@ -88,8 +88,10 @@ export default function RelatedCreditGrants({ grants, showDivider = true, mode =
           return (
             <Box onClick={() => handleShowGrantDetail(grant)}>
               <Typography variant="body2">
-                {formatBNStr(grant.remaining_amount, grant.paymentCurrency?.decimal || 0)}{' '}
-                {grant.paymentCurrency?.symbol}
+                {formatCreditAmount(
+                  formatBNStr(grant.remaining_amount, grant.paymentCurrency?.decimal || 0),
+                  grant.paymentCurrency?.symbol || ''
+                )}
               </Typography>
             </Box>
           );

package/src/components/invoice/table.tsx

@@ -1,6 +1,12 @@
 /* eslint-disable react/no-unstable-nested-components */
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import { formatAmount, Table, getPriceUintAmountByCurrency, formatNumber } from '@blocklet/payment-react';
+import {
+  formatAmount,
+  Table,
+  getPriceUintAmountByCurrency,
+  formatNumber,
+  formatCreditForCheckout,
+} from '@blocklet/payment-react';
 import type { TInvoiceExpanded, TInvoiceItem } from '@blocklet/payment-types';
 import { InfoOutlined } from '@mui/icons-material';
 import { Box, Stack, Tooltip, Typography } from '@mui/material';
@@ -77,7 +83,7 @@ export function getInvoiceRows(invoice: TInvoiceExpanded, t: (key: string) => st
     if (creditInfo?.amount) {
       credits = {
         total: creditInfo.amount,
-        currency: creditInfo.currency?.name || 'Credits',
+        currency: creditInfo.currency?.symbol || 'Credits',
       };
     }
 
@@ -245,8 +251,7 @@ export default function InvoiceTable({ invoice, simple = false, emptyNodeText =
                     },
                   }}>
                   {t('customer.invoice.creditsInfo', {
-                    amount: formatNumber(item.credits.total),
-                    currency: item.credits.currency,
+                    amount: formatCreditForCheckout(formatNumber(item.credits.total), item.credits.currency, locale),
                   })}
                 </Typography>
               )}

package/src/locales/en.tsx

@@ -1874,7 +1874,7 @@ export default flat({
     invoice: {
       relatedInvoice: 'Related Invoice',
       donation: 'Donation',
-      creditsInfo: 'Total {amount} {currency} included',
+      creditsInfo: 'Total {amount} included',
       appliedDiscounts: 'Applied Discounts',
     },
     payout: {

package/src/locales/zh.tsx

@@ -1818,7 +1818,7 @@ export default flat({
     invoice: {
       relatedInvoice: '关联账单',
       donation: '打赏记录',
-      creditsInfo: '总共包含 {amount} {currency}',
+      creditsInfo: '总共包含 {amount}',
       appliedDiscounts: '已应用优惠',
     },
     payout: {