payment-kit 1.13.85 → 1.13.87

package/api/src/queues/subscription.ts

@@ -173,6 +173,10 @@ export const handleSubscription = async (job: SubscriptionJob) => {
           end: setup.period.end - duration,
           usage: x.price.recurring?.aggregate_usage,
         });
+
+        // record raw quantity in metadata
+        x.metadata = x.metadata || {};
+        x.metadata.quantity = rawQuantity;
       }
 
       return x;

package/api/src/routes/connect/shared.ts

@@ -429,7 +429,7 @@ export async function ensureInvoiceAndItems({
         discount_amounts: [],
         proration: false,
         proration_details: {},
-        metadata: {},
+        metadata: x.metadata || {},
       });
     })
   );

package/api/src/store/models/index.ts

@@ -95,7 +95,11 @@ export type TPriceExpanded = TPrice & {
   };
 };
 
-export type TLineItemExpanded = LineItem & { price: TPriceExpanded; upsell_price: TPriceExpanded };
+export type TLineItemExpanded = LineItem & {
+  price: TPriceExpanded;
+  upsell_price: TPriceExpanded;
+  metadata?: Record<string, any>;
+};
 
 export type TProductExpanded = TProduct & {
   object: 'price';

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.85",
+  "version": "1.13.87",
   "scripts": {
     "dev": "COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev",
     "eject": "vite eject",
@@ -110,7 +110,7 @@
     "@abtnode/types": "1.16.21-beta-e828f413",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.85",
+    "@did-pay/types": "1.13.87",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "3d976b6a4bb4c0f910ddda7a60d42ec0e08ea5d9"
+  "gitHead": "e56e774ed27b74caa9b6ecdc8e02d7e0cc8d7fce"
 }

package/src/components/invoice/table.tsx

@@ -1,6 +1,7 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import type { TInvoiceExpanded } from '@did-pay/types';
-import { Table, TableBody, TableCell, TableHead, TableRow, Typography } from '@mui/material';
+import { InfoOutlined } from '@mui/icons-material';
+import { Stack, Table, TableBody, TableCell, TableHead, TableRow, Tooltip, Typography } from '@mui/material';
 import { styled } from '@mui/system';
 import { toBN } from '@ocap/util';
 
@@ -78,7 +79,18 @@ export default function InvoiceTable({ invoice, simple }: Props) {
               {line.description}
               {line.price.product.unit_label ? ` (per ${line.price.product.unit_label})` : ''}
             </TableCell>
-            <TableCell align="right">{line.quantity}</TableCell>
+            <TableCell align="right">
+              <Stack direction="row" spacing={0.5} alignItems="center" justifyContent="flex-end">
+                <Typography>{line.quantity}</Typography>
+                {line.metadata && line.metadata.quantity && (
+                  <Tooltip
+                    title={t('customer.invoice.rawQuantity', { quantity: line.metadata.quantity })}
+                    placement="top">
+                    <InfoOutlined fontSize="small" sx={{ color: 'text.secondary', cursor: 'pointer' }} />
+                  </Tooltip>
+                )}
+              </Stack>
+            </TableCell>
             <TableCell align="right">
               {!line.proration
                 ? formatAmount(getPriceUintAmountByCurrency(line.price, invoice.paymentCurrency), invoice.paymentCurrency.decimal) // prettier-ignore

package/src/locales/en.tsx

@@ -609,6 +609,7 @@ export default flat({
       download: 'Download PDF',
       unitPrice: 'Unit Price',
       amountPaid: 'Amount Paid',
+      rawQuantity: 'Raw Quantity: {quantity}',
       amountDue: 'Amount Due',
       amountApplied: 'Applied Balance',
       pay: 'Pay this invoice',

package/src/locales/zh.tsx

@@ -594,6 +594,7 @@ export default flat({
       details: '详情',
       download: '下载PDF',
       unitPrice: '单价',
+      rawQuantity: '汇总前数量: {quantity}',
       amountPaid: '已支付',
       amountDue: '待支付',
       amountApplied: '余额变更',

package/src/pages/admin/customers/customers/detail.tsx

@@ -37,12 +37,9 @@ function getTokenBalances(customer: TCustomerExpanded, paymentMethods: TPaymentM
   const currencies = paymentMethods.reduce((acc, x) => acc.concat(x.payment_currencies), []);
 
   if (customer.balance) {
-    const currency = currencies.find((x: any) => x.symbol === 'USD');
     tokens.push({
-      // @ts-ignore
-      currency: currency.symbol,
-      // @ts-ignore
-      balance: fromUnitToToken(customer.balance, currency.decimal),
+      currency: 'USD',
+      balance: fromUnitToToken(customer.balance, 2),
     });
   }