payment-kit 1.15.8 → 1.15.9

package/api/src/libs/notification/template/subscription-will-renew.ts

@@ -100,11 +100,14 @@ export class SubscriptionWillRenewEmailTemplate
     // paymentDetail.price = +amount;
 
     const paymentAmount = await getPaymentAmountForCycleSubscription(subscription, paymentCurrency);
-    const paymentDetail = { price: paymentAmount, balance: 0, symbol: paymentCurrency.symbol };
+    const paymentDetail = { price: paymentAmount, balance: 0, symbol: paymentCurrency.symbol, balanceFormatted: '0' };
 
     const token = await getTokenSummaryByDid(userDid, customer.livemode);
 
-    paymentDetail.balance = +fromUnitToToken(token?.[paymentCurrency.id] || '0', paymentCurrency.decimal);
+    const balance = fromUnitToToken(token?.[paymentCurrency.id] || '0', paymentCurrency.decimal);
+    paymentDetail.balanceFormatted = balance;
+    paymentDetail.balance = +balance;
+
     const { isPrePaid, interval } = await this.getPaymentCategory({
       subscriptionId: subscription.id,
     });
@@ -173,9 +176,10 @@ export class SubscriptionWillRenewEmailTemplate
 
     const lineItemExpanded = await Price.expand(subscriptionItems);
     const metered = lineItemExpanded.find((lineItem) => lineItem.price.recurring?.usage_type === 'metered');
+    const recurringItems = lineItemExpanded.filter((lineItem) => lineItem.price.type === 'recurring');
 
     const isPrePaid = !metered;
-    const interval = metered?.price.recurring?.interval;
+    const interval = recurringItems?.[0]?.price.recurring?.interval;
 
     return {
       isPrePaid,
@@ -269,7 +273,7 @@ export class SubscriptionWillRenewEmailTemplate
               at,
               productName,
               willRenewDuration,
-              balance: `${paymentDetail.balance} ${paymentDetail.symbol}`,
+              balance: `${paymentDetail.balanceFormatted} ${paymentDetail.symbol}`,
             })}`
           : `${translate('notification.subscriptionWillRenew.unableToPayBody', locale, {
               at,
@@ -343,7 +347,7 @@ export class SubscriptionWillRenewEmailTemplate
                       ...(!canPay && {
                         color: '#FF0000',
                       }),
-                      text: `${paymentDetail.balance} ${paymentDetail.symbol}`,
+                      text: `${paymentDetail.balanceFormatted} ${paymentDetail.symbol}`,
                     },
                   },
                 ]

package/api/src/libs/payment.ts

@@ -185,6 +185,7 @@ export interface PaymentDetail {
   balance: number;
   price: number;
   symbol: LiteralUnion<'ABT' | 'USD', string>;
+  balanceFormatted?: string;
 }
 export async function getPaymentDetail(
   userDid: string,

package/api/src/routes/invoices.ts

@@ -134,13 +134,14 @@ router.get('/', authMine, async (req, res) => {
             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 firstInvoice = await Invoice.findOne({
+              where: { subscription_id: subscription.id },
+              order: [['created_at', 'ASC']],
+            });
+            const last = query.o === 'asc' ? list?.[list.length - 1] : list?.[0];
+            if (state && firstInvoice) {
               const data = JSON.parse(state.data?.value || '{}');
-              const customer = await Customer.findByPk(last.customer_id);
+              const customer = await Customer.findByPk(firstInvoice.customer_id);
               const currency = await PaymentCurrency.findOne({
                 where: { payment_method_id: method.id, is_base_currency: true },
               });
@@ -178,7 +179,7 @@ router.get('/', authMine, async (req, res) => {
                 amount_due: '0',
                 amount_paid: stakeAmount,
                 amount_remaining: '0',
-                ...pick(last, [
+                ...pick(firstInvoice, [
                   'number',
                   'paid',
                   'auto_advance',

package/api/src/routes/prices.ts

@@ -305,7 +305,7 @@ router.put('/:id', auth, async (req, res) => {
     pick(
       req.body,
       locked
-        ? ['nickname', 'description', 'metadata', 'currency_options', 'upsell', ...quantityKeys]
+        ? ['nickname', 'description', 'metadata', 'currency_options', 'upsell', 'lookup_key', ...quantityKeys]
         : ['type', 'model', 'active', 'livemode', 'nickname', 'recurring', 'description', 'tiers', 'unit_amount', 'transform_quantity', 'metadata', 'lookup_key', 'currency_options', 'upsell', ...quantityKeys] // prettier-ignore
     )
   );

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.15.8",
+  "version": "1.15.9",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -52,7 +52,7 @@
     "@arcblock/validator": "^1.18.135",
     "@blocklet/js-sdk": "^1.16.31",
     "@blocklet/logger": "^1.16.31",
-    "@blocklet/payment-react": "1.15.8",
+    "@blocklet/payment-react": "1.15.9",
     "@blocklet/sdk": "^1.16.31",
     "@blocklet/ui-react": "^2.10.33",
     "@blocklet/uploader": "^0.1.36",
@@ -118,7 +118,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.31",
     "@arcblock/eslint-config-ts": "^0.3.2",
-    "@blocklet/payment-types": "1.15.8",
+    "@blocklet/payment-types": "1.15.9",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -160,5 +160,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "d0e3c23bed5a41a9b16554fc3b7458e8dee4fd60"
+  "gitHead": "d2919fe52ba2b7aee1c6c1275c325f91b81027da"
 }

package/src/pages/customer/index.tsx

@@ -116,7 +116,7 @@ export default function CustomerHome() {
 
   useEffect(() => {
     runAsync();
-    events.once('switch-did', () => {
+    events.on('switch-did', () => {
       runAsync();
     });
   }, []);

package/src/pages/customer/invoice/past-due.tsx

@@ -30,7 +30,7 @@ export default function CustomerInvoicePastDue() {
   const { loading, error, data, runAsync } = useRequest(fetchData);
 
   useEffect(() => {
-    events.once('switch-did', () => {
+    events.on('switch-did', () => {
       runAsync().catch(console.error);
     });
   }, []);

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

@@ -60,16 +60,21 @@ export default function SubscriptionEmbed() {
   const authToken = params.get('authToken') || '';
   const defaultPageSize = useDefaultPageSize(20);
   const { data: subscription, error, loading } = useRequest(() => fetchSubscriptionData(subscriptionId, authToken));
-  const { data } = useRequest(() =>
-    fetchInvoiceData({
-      page: 1,
-      pageSize: defaultPageSize,
-      status: 'open,paid,uncollectible',
-      subscription_id: subscriptionId,
-      authToken,
-      ignore_zero: true,
-      include_staking: true,
-    })
+  const { data } = useRequest(
+    () =>
+      fetchInvoiceData({
+        page: 1,
+        pageSize: defaultPageSize,
+        status: 'open,paid,uncollectible',
+        subscription_id: subscriptionId,
+        authToken,
+        ignore_zero: true,
+        include_staking: true,
+        customer_id: subscription?.customer_id,
+      }),
+    {
+      refreshDeps: [subscriptionId, authToken, subscription?.customer_id],
+    }
   );
 
   const subscriptionPageUrl: string = useMemo(() => {