payment-kit 1.15.28 → 1.15.29

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/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.29
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.15.28",
+  "version": "1.15.29",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -53,7 +53,7 @@
     "@arcblock/validator": "^1.18.137",
     "@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.29",
     "@blocklet/sdk": "1.16.33-beta-20241031-073543-49b1ff9b",
     "@blocklet/ui-react": "^2.10.55",
     "@blocklet/uploader": "^0.1.51",
@@ -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.29",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -165,5 +165,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "0978937b91bc34a90d0b41af665999d471cec63e"
+  "gitHead": "74c394cd2a81792ea30fdf019aafb7b4e2400373"
 }

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([