payment-kit 1.15.28 → 1.15.30

package/api/src/libs/subscription.ts

@@ -462,12 +462,14 @@ export async function getUpcomingInvoiceAmount(subscriptionId: string) {
   const expanded = await Price.expand(items.map((x) => x.toJSON()));
 
   let amount = new BN(0);
+  let minExpectedAmount = new BN(0);
   for (const item of expanded) {
     const price = getSubscriptionItemPrice(item);
     if (price.type === 'recurring') {
       const unit = getPriceUintAmountByCurrency(price, subscription.currency_id);
       if (price.recurring?.usage_type === 'licensed') {
         amount = amount.add(new BN(unit).mul(new BN(item.quantity)));
+        minExpectedAmount = minExpectedAmount.add(new BN(unit).mul(new BN(item.quantity)));
       }
       if (price.recurring?.usage_type === 'metered') {
         const rawQuantity = await UsageRecord.getSummary({
@@ -481,12 +483,14 @@ export async function getUpcomingInvoiceAmount(subscriptionId: string) {
         // @ts-ignore
         const quantity = price.transformQuantity(rawQuantity);
         amount = amount.add(new BN(unit).mul(new BN(quantity)));
+        minExpectedAmount = minExpectedAmount.add(new BN(unit).mul(new BN(item.quantity)));
       }
     }
   }
 
   return {
     amount: amount.toString(),
+    minExpectedAmount: minExpectedAmount.toString(),
     start: subscription.current_period_start,
     end: subscription.current_period_end,
     currency,

package/api/src/routes/checkout-sessions.ts

@@ -497,6 +497,19 @@ export async function startCheckoutSessionFromPaymentLink(id: string, req: Reque
 
     doc.line_items = items;
 
+    if (req.query.upsell === '1') {
+      // add upsell to line items
+      const updatedItems = cloneDeep(doc.line_items);
+      updatedItems.forEach((item: any) => {
+        if (item?.price?.upsell) {
+          item.upsell_price_id = item.price.upsell.upsells_to_id;
+        }
+      });
+      await doc.update({ line_items: updatedItems });
+      await doc.update(await getCheckoutSessionAmounts(doc));
+      doc.line_items = await Price.expand(updatedItems, { upsell: true });
+    }
+
     res.json({
       checkoutSession: doc.toJSON(),
       paymentMethods: await getPaymentMethods(doc),

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.15.28
+version: 1.15.30
 logo: logo.png
 files:
   - dist
@@ -71,11 +71,11 @@ capabilities:
   clusterMode: false
   component: true
 screenshots:
-  - e218485a93fbc18e5bd870bc323f75ad.png
-  - a3bf97be05559c86bd5c50f2085aaf5c.png
-  - 440cabfd95ea93702c9c694df3dbbaf1.png
-  - df305299c1d709f159fdd95c05995069.png
-  - a1d41fe1bad76c814b4a2ad5d4e1dab8.png
+  - setting.png
+  - payment.png
+  - checkout.png
+  - subscription_detail.png
+  - customer.png
 components:
   - name: image-bin
     source:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.15.28",
+  "version": "1.15.30",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -44,29 +44,29 @@
   },
   "dependencies": {
     "@abtnode/cron": "1.16.33-beta-20241031-073543-49b1ff9b",
-    "@arcblock/did": "^1.18.137",
+    "@arcblock/did": "^1.18.139",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.10.55",
-    "@arcblock/did-util": "^1.18.137",
-    "@arcblock/jwt": "^1.18.137",
-    "@arcblock/ux": "^2.10.55",
-    "@arcblock/validator": "^1.18.137",
+    "@arcblock/did-connect": "^2.10.65",
+    "@arcblock/did-util": "^1.18.139",
+    "@arcblock/jwt": "^1.18.139",
+    "@arcblock/ux": "^2.10.65",
+    "@arcblock/validator": "^1.18.139",
     "@blocklet/js-sdk": "1.16.33-beta-20241031-073543-49b1ff9b",
     "@blocklet/logger": "1.16.33-beta-20241031-073543-49b1ff9b",
-    "@blocklet/payment-react": "1.15.28",
+    "@blocklet/payment-react": "1.15.30",
     "@blocklet/sdk": "1.16.33-beta-20241031-073543-49b1ff9b",
-    "@blocklet/ui-react": "^2.10.55",
+    "@blocklet/ui-react": "^2.10.65",
     "@blocklet/uploader": "^0.1.51",
     "@blocklet/xss": "^0.1.12",
     "@mui/icons-material": "^5.16.6",
     "@mui/lab": "^5.0.0-alpha.173",
     "@mui/material": "^5.16.6",
     "@mui/system": "^5.16.6",
-    "@ocap/asset": "^1.18.137",
-    "@ocap/client": "^1.18.137",
-    "@ocap/mcrypto": "^1.18.137",
-    "@ocap/util": "^1.18.137",
-    "@ocap/wallet": "^1.18.137",
+    "@ocap/asset": "^1.18.139",
+    "@ocap/client": "^1.18.139",
+    "@ocap/mcrypto": "^1.18.139",
+    "@ocap/util": "^1.18.139",
+    "@ocap/wallet": "^1.18.139",
     "@stripe/react-stripe-js": "^2.7.3",
     "@stripe/stripe-js": "^2.4.0",
     "ahooks": "^3.8.0",
@@ -120,7 +120,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.33-beta-20241031-073543-49b1ff9b",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.15.28",
+    "@blocklet/payment-types": "1.15.30",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -149,7 +149,7 @@
     "vite": "^5.3.5",
     "vite-node": "^2.0.4",
     "vite-plugin-babel-import": "^2.0.5",
-    "vite-plugin-blocklet": "^0.9.11",
+    "vite-plugin-blocklet": "^0.9.12",
     "vite-plugin-node-polyfills": "^0.21.0",
     "vite-plugin-svgr": "^4.2.0",
     "vite-tsconfig-paths": "^4.3.2",
@@ -165,5 +165,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "0978937b91bc34a90d0b41af665999d471cec63e"
+  "gitHead": "963ac54a2fc0d4bd68f277fe31a848a1b3337abb"
 }

package/src/components/info-row.tsx

@@ -11,6 +11,7 @@ type Props = {
   sizes?: [number, number];
   direction?: 'row' | 'column';
   sx?: SxProps;
+  showLabel?: boolean;
 };
 
 InfoRow.defaultProps = {
@@ -19,6 +20,7 @@ InfoRow.defaultProps = {
   alignItems: 'center',
   direction: 'row',
   sx: {},
+  showLabel: true,
 };
 
 export default function InfoRow(props: Props) {
@@ -39,17 +41,20 @@ export default function InfoRow(props: Props) {
         },
       }}
       className="info-row-wrapper">
-      <Box
-        flex={sizes[0]}
-        color="text.primary"
-        fontWeight={500}
-        fontSize={14}
-        sx={{
-          flex: props.direction === 'column' ? 'none' : sizes[0],
-          mb: props.direction === 'column' ? 0.5 : 0,
-        }}>
-        {props.label}
-      </Box>
+      {props.showLabel && (
+        <Box
+          flex={sizes[0]}
+          color="text.primary"
+          fontWeight={500}
+          fontSize={14}
+          sx={{
+            flex: props.direction === 'column' ? 'none' : sizes[0],
+            mb: props.direction === 'column' ? 0.5 : 0,
+          }}>
+          {props.label}
+        </Box>
+      )}
+
       <Box
         flex={sizes[1]}
         color={isNone ? 'text.disabled' : 'text.secondary'}

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

@@ -26,7 +26,7 @@ export function InvoiceTemplate({ data, t }: InvoicePDFProps) {
         }}>
         <div style={composeStyles('fs-20 bold')}>{t('admin.invoice.name')}</div>
         <div style={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center' }}>
-          <img src={window.blocklet.appLogo.split('?')[0]} style={composeStyles('logo')} alt="logo" />
+          <img src={window.blocklet.appLogo} style={composeStyles('logo')} alt="logo" />
           <span style={composeStyles('block p-10')}>{window.blocklet.appName}</span>
         </div>
       </div>
@@ -52,7 +52,9 @@ export function InvoiceTemplate({ data, t }: InvoicePDFProps) {
               <span style={composeStyles('bold')}>{t('admin.invoice.paidAt')}</span>
             </div>
             <div style={composeStyles('w-60')}>
-              <span style={composeStyles('gray')}>{formatTime(data.period_start * 1000)}</span>
+              <span style={composeStyles('gray')}>
+                {formatTime((data.period_start || data.status_transitions?.paid_at || 0) * 1000)}
+              </span>
             </div>
           </div>
           <div style={composeStyles('flex mb-5')}>

package/src/components/price/upsell-select.tsx

@@ -6,6 +6,7 @@ import { AddOutlined } from '@mui/icons-material';
 import { Alert, CircularProgress, MenuItem, Select, Stack, Typography } from '@mui/material';
 import { useRequest, useSetState } from 'ahooks';
 
+import { useMemo } from 'react';
 import AddPrice from '../product/add-price';
 
 type Props = {
@@ -24,6 +25,20 @@ export default function UpsellSelect({ price, onSelect, onAdd }: Props) {
 
   const { loading, error, data } = useRequest(() => fetchData(price.id));
 
+  const filteredData = useMemo(() => {
+    if (!data || data.length === 0) {
+      return [];
+    }
+    const priceCurrencies = price.currency_options?.map((x) => x.currency_id) || [];
+    const priceLength = priceCurrencies.length;
+    return data.filter((x) => {
+      return (
+        x.currency_options.length === priceLength &&
+        x.currency_options.every((y) => priceCurrencies.includes(y.currency_id))
+      );
+    });
+  }, [data, price.id]);
+
   if (error) {
     return <Alert severity="error">{error.message}</Alert>;
   }
@@ -75,7 +90,7 @@ export default function UpsellSelect({ price, onSelect, onAdd }: Props) {
             <Typography>{t('admin.price.add')}</Typography>
           </Stack>
         </MenuItem>
-        {data.map((x) => (
+        {filteredData.map((x) => (
           <MenuItem key={x.id} value={x.id}>
             {formatPrice(x, x.currency)}
           </MenuItem>

package/src/components/price/upsell.tsx

@@ -61,8 +61,8 @@ export function UpsellForm({ data, onChange }: { data: TPriceExpanded; onChange:
 export default function PriceUpsell({ data, onChange }: { data: TPriceExpanded; onChange: Function }) {
   return (
     <Grid container>
-      <Grid item xs={12} md={6}>
-        <InfoRow label="" value={<UpsellForm data={data} onChange={onChange} />} />
+      <Grid item xs={12} md={12}>
+        <InfoRow label="" value={<UpsellForm data={data} onChange={onChange} />} showLabel={false} />
       </Grid>
     </Grid>
   );

package/src/pages/customer/recharge.tsx

@@ -100,7 +100,9 @@ export default function RechargePage() {
         // Calculate preset amounts
         const getCycleAmount = (cycles: number) =>
           fromUnitToToken(
-            new BN(upcomingRes.data.amount).mul(new BN(cycles)).toString(),
+            new BN(upcomingRes.data.amount === '0' ? upcomingRes.data.minExpectedAmount : upcomingRes.data.amount)
+              .mul(new BN(cycles))
+              .toString(),
             upcomingRes.data?.currency?.decimal
           );
         setPresetAmounts([