payment-kit 1.13.199 → 1.13.201

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

@@ -10,7 +10,6 @@ import isEmpty from 'lodash/isEmpty';
 import { estimateMaxGasForTx, hasStakedForGas } from '../../integrations/blockchain/stake';
 import { blocklet, wallet } from '../../libs/auth';
 import dayjs from '../../libs/dayjs';
-import env from '../../libs/env';
 import logger from '../../libs/logger';
 import { getGasPayerExtra, getTokenLimitsForDelegation } from '../../libs/payment';
 import { getFastCheckoutAmount, getPriceUintAmountByCurrency, getStatementDescriptor } from '../../libs/session';
@@ -667,7 +666,7 @@ export async function getStakeTxClaim({
 
   return {
     type: 'StakeTx',
-    description: 'Sign the staking to continue',
+    description: `Stake to complete subscription ${subscription.id}`,
     partialTx: {
       from: userDid,
       pk: userPk,
@@ -676,7 +675,7 @@ export async function getStakeTxClaim({
         receiver: wallet.address,
         slashers: [wallet.address],
         revokeWaitingPeriod: setup.cycle.duration / 1000, // wait for at least 1 billing cycle
-        message: `Stake for subscription on ${env.appName}`,
+        message: `Stake for subscription ${subscription.id}`,
         inputs: [],
         data,
       },

package/api/src/routes/invoices.ts

@@ -118,7 +118,63 @@ router.get('/', authMine, async (req, res) => {
       ],
     });
 
-    res.json({ count, list });
+    // push staking info as first invoice if we are on the last page
+    let subscription;
+    if (where.subscription_id) {
+      subscription = await Subscription.findByPk(where.subscription_id);
+      if (subscription?.payment_details?.arcblock?.staking?.tx_hash && page === Math.ceil((count || 1) / pageSize)) {
+        const method = await PaymentMethod.findOne({ where: { type: 'arcblock', livemode: subscription.livemode } });
+        if (method) {
+          const client = method.getOcapClient();
+          const { address } = subscription.payment_details.arcblock.staking;
+          const { state } = await client.getStakeState({ address });
+          const last =
+            list[list.length - 1] ||
+            (await Invoice.findOne({ where: { subscription_id: subscription.id }, order: [['created_at', 'ASC']] }));
+
+          if (state && last) {
+            const data = JSON.parse(state.data?.value || '{}');
+            list.push({
+              id: address as string,
+              status: 'paid',
+              description: 'Subscription staking',
+              billing_reason: 'subscription_create',
+              total: data[subscription.id],
+              amount_due: '0',
+              amount_paid: data[subscription.id],
+              amount_remaining: '0',
+              ...pick(last, [
+                'number',
+                'paid',
+                'auto_advance',
+                'currency_id',
+                'customer_id',
+                'subscription_id',
+                'period_start',
+                'period_end',
+                'created_at',
+                'updated_at',
+              ]),
+              // @ts-ignore
+              paymentCurrency: await PaymentCurrency.findByPk(last.currency_id),
+              paymentMethod: method,
+              // @ts-ignore
+              customer: await Customer.findByPk(last.customer_id),
+              metadata: {
+                payment_details: {
+                  arcblock: {
+                    tx_hash: subscription.payment_details.arcblock.staking.tx_hash,
+                    payer: subscription.payment_details.arcblock.payer,
+                  },
+                },
+              },
+            });
+          }
+        }
+      }
+    }
+
+    res.json({ count, list, subscription });
   } catch (err) {
     console.error(err);
     res.json({ count: 0, list: [] });

package/api/src/routes/subscriptions.ts

@@ -681,18 +681,17 @@ router.put('/:id', authPortal, async (req, res) => {
     }
 
     // handle subscription item changes
-    let invoice: Invoice;
     let connectAction = '';
-    if (subscription.isActive() === false) {
-      throw new Error('Subscription is not active');
-    }
-    if (subscription.isScheduledToCancel()) {
-      throw new Error('Subscription is scheduled to cancel');
-    }
-
     if (Array.isArray(value.items) && value.items.length > 0) {
+      if (subscription.isActive() === false) {
+        throw new Error('Updating subscription item not allowed for inactive subscriptions');
+      }
+      if (subscription.isScheduledToCancel()) {
+        throw new Error('Updating subscription item not allowed for scheduled-to-cancel subscriptions');
+      }
+
       if (paymentMethod.type === 'stripe') {
-        throw new Error('Update is not supported for subscriptions paid with stripe');
+        throw new Error('Updating subscription item not allowed for subscriptions paid with stripe');
       }
 
       // validate the request
@@ -773,7 +772,7 @@ router.put('/:id', authPortal, async (req, res) => {
             footer: lastInvoice.footer || '',
           } as Invoice,
         });
-        invoice = result.invoice;
+        const { invoice } = result;
         updates.latest_invoice_id = invoice.id;
         logger.info('subscription update invoice created', { subscription: req.params.id, invoice: invoice.id });
 
@@ -869,6 +868,13 @@ router.put('/:id', authPortal, async (req, res) => {
         }
       }
     } else if (req.body.billing_cycle_anchor === 'now') {
+      if (subscription.isActive() === false) {
+        throw new Error('Updating billing_cycle_anchor not allowed for inactive subscriptions');
+      }
+      if (subscription.isScheduledToCancel()) {
+        throw new Error('Updating billing_cycle_anchor not allowed for scheduled-to-cancel subscriptions');
+      }
+
       // FIXME: handle billing cycle anchor change without any item change
       await subscription.update(updates);
     } else {

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.199",
+  "version": "1.13.201",
   "scripts": {
     "dev": "cross-env COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev --open",
     "eject": "vite eject",
@@ -50,7 +50,7 @@
     "@arcblock/jwt": "^1.18.113",
     "@arcblock/ux": "^2.9.57",
     "@blocklet/logger": "1.16.24",
-    "@blocklet/payment-react": "1.13.199",
+    "@blocklet/payment-react": "1.13.201",
     "@blocklet/sdk": "1.16.24",
     "@blocklet/ui-react": "^2.9.57",
     "@blocklet/uploader": "^0.0.74",
@@ -110,7 +110,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.24",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@blocklet/payment-types": "1.13.199",
+    "@blocklet/payment-types": "1.13.201",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "0e049d966eb2d53b1ed731b1f32a7ba709008ede"
+  "gitHead": "0f62c0c55a77845cece0656cc6801847b9dc9e24"
 }

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

@@ -1,6 +1,6 @@
 /* eslint-disable react/no-unstable-nested-components */
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import { TxLink, api, formatTime } from '@blocklet/payment-react';
+import { CustomerInvoiceList, TxLink, api, formatTime } from '@blocklet/payment-react';
 import type { TSubscriptionExpanded } from '@blocklet/payment-types';
 import { ArrowBackOutlined } from '@mui/icons-material';
 import { Alert, Box, Button, CircularProgress, Stack, Typography } from '@mui/material';
@@ -10,7 +10,6 @@ import { Link, useNavigate, useParams } from 'react-router-dom';
 import Currency from '../../../components/currency';
 import CustomerLink from '../../../components/customer/link';
 import InfoRow from '../../../components/info-row';
-import InvoiceList from '../../../components/invoice/list';
 import SectionHeader from '../../../components/section/header';
 import SubscriptionDescription from '../../../components/subscription/description';
 import SubscriptionItemList from '../../../components/subscription/items';
@@ -160,17 +159,7 @@ export default function CustomerSubscriptionDetail() {
       <Box className="section">
         <SectionHeader title={t('admin.invoices')} mb={0} />
         <Box className="section-body">
-          <InvoiceList
-            features={{ customer: false, toolbar: false }}
-            subscription_id={data.id}
-            invoiceProps={{
-              onClick: (invoice) => {
-                navigate(`/customer/invoice/${invoice.id}`);
-              },
-            }}
-            ignoreZero
-            mode="customer"
-          />
+          <CustomerInvoiceList subscription_id={data.id} />
         </Box>
       </Box>
     </Stack>