payment-kit 1.13.232 → 1.13.233

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.232",
+  "version": "1.13.233",
   "scripts": {
     "dev": "cross-env COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev --open",
     "eject": "vite eject",
@@ -51,7 +51,7 @@
     "@arcblock/ux": "^2.9.68",
     "@arcblock/validator": "^1.18.115",
     "@blocklet/logger": "1.16.25",
-    "@blocklet/payment-react": "1.13.232",
+    "@blocklet/payment-react": "1.13.233",
     "@blocklet/sdk": "1.16.25",
     "@blocklet/ui-react": "^2.9.68",
     "@blocklet/uploader": "^0.0.76",
@@ -116,7 +116,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.25",
     "@arcblock/eslint-config-ts": "^0.3.0",
-    "@blocklet/payment-types": "1.13.232",
+    "@blocklet/payment-types": "1.13.233",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -155,5 +155,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "250cff1f7b3b483e089a5f19587e58556d7ef063"
+  "gitHead": "854b8c4502657675e5d08279d2efca31bafa0a88"
 }

package/src/components/invoice/table.tsx

@@ -128,7 +128,6 @@ export default function InvoiceTable({ invoice, simple }: Props) {
               {t('payment.customer.invoice.amountPaid')}
             </TableCell>
             <TableCell align="right" sx={{ fontWeight: 600 }}>
-              {invoice.amount_paid === '0' ? '' : '-'}
               {formatAmount(invoice.amount_paid, invoice.paymentCurrency.decimal)}
             </TableCell>
             <TableCell>&nbsp;</TableCell>

package/src/components/invoice-pdf/pdf.tsx

@@ -1,5 +1,6 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { formatAmount, formatTime, getPrefix, getPriceUintAmountByCurrency } from '@blocklet/payment-react';
+import type { TInvoiceExpanded, TInvoiceItemExpanded } from '@blocklet/payment-types';
 import { Button } from '@mui/material';
 import {
   Font,
@@ -44,7 +45,7 @@ function Page({ className, children }: any) {
   );
 }
 
-export function Download({ data }: any) {
+export function Download({ data }: { data: TInvoiceExpanded }) {
   const { t } = useLocaleContext();
   const title = data.number;
   return (
@@ -78,7 +79,7 @@ function InvoicePage({ data, t }: any) {
     let temp = 0;
 
     data.lines
-      .map((line: any) => {
+      .map((line: TInvoiceItemExpanded) => {
         return {
           description:
             line.description + (line.price.product.unit_label ? ` (per ${line.price.product.unit_label})` : ''),
@@ -88,9 +89,9 @@ function InvoicePage({ data, t }: any) {
             : '',
         };
       })
-      .forEach((productLine: any) => {
-        const quantityNumber = parseFloat(productLine.quantity);
-        const rateNumber = parseFloat(productLine.rate);
+      .forEach((line: any) => {
+        const quantityNumber = parseFloat(line.quantity);
+        const rateNumber = parseFloat(line.rate);
         const amount = quantityNumber && rateNumber ? quantityNumber * rateNumber : 0;
 
         temp += amount;
@@ -121,7 +122,7 @@ function InvoicePage({ data, t }: any) {
           <View className="w-60">
             <Text2 className="bold dark mb-5" value={t('admin.invoice.billTo')} />
             <Text2 value={data.customer.name} />
-            <Text2 className="blod fs-12" value={`DID:ABT: ${data.customer.did}`} />
+            <Text2 className="bold fs-12" value={`DID:ABT:${data.customer.did}`} />
           </View>
           <View className="w-45">
             <View className="flex mb-5">
@@ -177,23 +178,23 @@ function InvoicePage({ data, t }: any) {
                 : '',
             };
           })
-          .map((productLine: any) => {
+          .map((line: any) => {
             return (
-              <View key={productLine.description} className="row flex">
+              <View key={line.description} className="row flex">
                 <View className="w-48 p-4-8 pb-10">
-                  <Text2 className="dark" value={productLine.description} />
+                  <Text2 className="dark" value={line.description} />
                 </View>
                 <View className="w-17 p-4-8 pb-10">
-                  <Text2 className="dark right" value={productLine.quantity} />
+                  <Text2 className="dark right" value={line.quantity} />
                 </View>
                 <View className="w-17 p-4-8 pb-10">
                   <Text className="dark right">
-                    {productLine.rate} {data.paymentCurrency.symbol}
+                    {line.rate} {data.paymentCurrency.symbol}
                   </Text>
                 </View>
                 <View className="w-18 p-4-8 pb-10">
                   <Text className="dark right">
-                    {calculateAmount(productLine.quantity, productLine.rate)} {data.paymentCurrency.symbol}
+                    {calculateAmount(line.quantity, line.rate)} {data.paymentCurrency.symbol}
                   </Text>
                 </View>
               </View>

package/src/pages/admin/billing/invoices/detail.tsx

@@ -149,7 +149,7 @@ export default function InvoiceDetail(props: { id: string }) {
               />
             }
           />
-          {!!data.paymentIntent.payment_details?.ethereum && (
+          {!!data.paymentIntent?.payment_details?.ethereum && (
             <InfoRow
               label={t('common.txGas')}
               value={<TxGas details={data.paymentIntent.payment_details as any} method={data.paymentMethod} />}

package/src/pages/customer/invoice/detail.tsx

@@ -149,7 +149,7 @@ export default function CustomerInvoiceDetail() {
               />
             }
           />
-          {!!data.paymentIntent.payment_details?.ethereum && (
+          {!!data.paymentIntent?.payment_details?.ethereum && (
             <InfoRow
               label={t('common.txGas')}
               value={<TxGas details={data.paymentIntent.payment_details as any} method={data.paymentMethod} />}