payment-kit 1.13.259 → 1.13.261

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.13.259
+version: 1.13.261
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.259",
+  "version": "1.13.261",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -43,28 +43,28 @@
   },
   "dependencies": {
     "@abtnode/cron": "1.16.26",
-    "@arcblock/did": "^1.18.117",
+    "@arcblock/did": "^1.18.120",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.9.79",
-    "@arcblock/did-util": "^1.18.117",
-    "@arcblock/jwt": "^1.18.117",
-    "@arcblock/ux": "^2.9.79",
-    "@arcblock/validator": "^1.18.117",
+    "@arcblock/did-connect": "^2.9.80",
+    "@arcblock/did-util": "^1.18.120",
+    "@arcblock/jwt": "^1.18.120",
+    "@arcblock/ux": "^2.9.80",
+    "@arcblock/validator": "^1.18.120",
     "@blocklet/logger": "1.16.26",
-    "@blocklet/payment-react": "1.13.259",
+    "@blocklet/payment-react": "1.13.261",
     "@blocklet/sdk": "1.16.26",
-    "@blocklet/ui-react": "^2.9.79",
+    "@blocklet/ui-react": "^2.9.80",
     "@blocklet/uploader": "^0.1.6",
-    "@mui/icons-material": "^5.15.17",
+    "@mui/icons-material": "^5.15.18",
     "@mui/lab": "^5.0.0-alpha.170",
-    "@mui/material": "^5.15.17",
-    "@mui/styles": "^5.15.17",
+    "@mui/material": "^5.15.18",
+    "@mui/styles": "^5.15.18",
     "@mui/system": "^5.15.15",
-    "@ocap/asset": "^1.18.117",
-    "@ocap/client": "^1.18.117",
-    "@ocap/mcrypto": "^1.18.117",
-    "@ocap/util": "^1.18.117",
-    "@ocap/wallet": "^1.18.117",
+    "@ocap/asset": "^1.18.120",
+    "@ocap/client": "^1.18.120",
+    "@ocap/mcrypto": "^1.18.120",
+    "@ocap/util": "^1.18.120",
+    "@ocap/wallet": "^1.18.120",
     "@react-pdf/renderer": "^3.4.4",
     "@stripe/react-stripe-js": "^2.7.1",
     "@stripe/stripe-js": "^2.4.0",
@@ -116,7 +116,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.26",
     "@arcblock/eslint-config-ts": "^0.3.0",
-    "@blocklet/payment-types": "1.13.259",
+    "@blocklet/payment-types": "1.13.261",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -155,5 +155,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "54eed6876c292c39219f953625d88cf314347105"
+  "gitHead": "30f66652a71168cbd4050639527dc7dbf15b12bb"
 }

package/src/components/invoice/table.tsx

@@ -1,5 +1,5 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import { formatAmount, formatToDate } from '@blocklet/payment-react';
+import { formatAmount, formatToDate, getPriceUintAmountByCurrency } from '@blocklet/payment-react';
 import type { TInvoiceExpanded, TInvoiceItem } from '@blocklet/payment-types';
 import { InfoOutlined } from '@mui/icons-material';
 import { Box, Stack, Table, TableBody, TableCell, TableHead, TableRow, Tooltip, Typography } from '@mui/material';
@@ -53,19 +53,23 @@ export function getAppliedBalance(invoice: TInvoiceExpanded) {
 }
 
 export function getInvoiceRows(invoice: TInvoiceExpanded) {
-  const detail: InvoiceDetailItem[] = invoice.lines.map((line) => ({
-    id: line.id,
-    product: `${line.description} ${
-      line.price.product.unit_label ? ` (per ${line.price.product.unit_label})` : ''
-    }`.trim(),
-    quantity: line.quantity,
-    rawQuantity: line.metadata?.quantity || 0,
-    price: !line.proration
-      ? formatAmount(toBN(line.amount).div(toBN(line.quantity)).toString(), invoice.paymentCurrency.decimal) // prettier-ignore
-      : '',
-    amount: formatAmount(line.amount, invoice.paymentCurrency.decimal),
-    raw: line,
-  }));
+  const detail: InvoiceDetailItem[] = invoice.lines.map((line) => {
+    const price = line.quantity
+      ? toBN(line.amount).div(toBN(line.quantity)).toString()
+      : getPriceUintAmountByCurrency(line.price, invoice.paymentCurrency) || line.amount;
+
+    return {
+      id: line.id,
+      product: `${line.description} ${
+        line.price.product.unit_label ? ` (per ${line.price.product.unit_label})` : ''
+      }`.trim(),
+      quantity: line.quantity,
+      rawQuantity: line.metadata?.quantity || 0,
+      price: !line.proration ? formatAmount(price, invoice.paymentCurrency.decimal) : '',
+      amount: formatAmount(line.amount, invoice.paymentCurrency.decimal),
+      raw: line,
+    };
+  });
 
   const summary: InvoiceSummaryItem[] = [
     {

package/src/pages/customer/subscription/change-plan.tsx

@@ -15,7 +15,7 @@ import { ArrowBackOutlined } from '@mui/icons-material';
 import { LoadingButton } from '@mui/lab';
 import { Alert, CircularProgress, Divider, Stack, Typography } from '@mui/material';
 import { useRequest, useSetState } from 'ahooks';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useNavigate, useParams, useSearchParams } from 'react-router-dom';
 
 import InfoCard from '../../../components/info-card';
 import SectionHeader from '../../../components/section/header';
@@ -53,6 +53,8 @@ export default function CustomerSubscriptionChangePlan() {
   const { id } = useParams() as { id: string };
   const { t, locale } = useLocaleContext();
   const { connect } = usePaymentContext();
+  const [searchParams] = useSearchParams();
+  const redirectUrl = searchParams.get('redirectUrl');
 
   const { loading, error, data } = useRequest(() => fetchData(id));
   const [state, setState] = useSetState({
@@ -70,7 +72,7 @@ export default function CustomerSubscriptionChangePlan() {
   });
 
   if (error) {
-    return <Alert severity="error">{error.message}</Alert>;
+    return <Alert severity="error">{formatError(error)}</Alert>;
   }
 
   if (loading || !data) {
@@ -120,7 +122,11 @@ export default function CustomerSubscriptionChangePlan() {
   };
 
   const handleBack = () => {
-    navigate(`/customer/subscription/${data.subscription.id}`);
+    if (redirectUrl) {
+      window.location.href = redirectUrl;
+    } else {
+      navigate(`/customer/subscription/${data.subscription.id}`);
+    }
   };
 
   const handleConfirm = async () => {