payment-kit 1.13.251 → 1.13.253

package/api/src/integrations/stripe/handlers/invoice.ts

@@ -1,4 +1,5 @@
 import env from '@blocklet/sdk/lib/env';
+import merge from 'lodash/merge';
 import pick from 'lodash/pick';
 import pWaitFor from 'p-wait-for';
 import type Stripe from 'stripe';
@@ -14,6 +15,7 @@ import {
   Subscription,
   SubscriptionItem,
   TEventExpanded,
+  TInvoiceItem,
 } from '../../../store/models';
 
 export async function handleStripeInvoicePaid(invoice: Invoice, event: TEventExpanded) {
@@ -37,6 +39,21 @@ export async function handleStripeInvoicePaid(invoice: Invoice, event: TEventExp
   });
 }
 
+export function getStripeInvoicePeriod(invoice: any) {
+  const lineItem: TInvoiceItem = (invoice.lines.data || []).find((x: any) => !x.proration && x.type === 'subscription');
+  if (lineItem && lineItem.period) {
+    return {
+      period_start: lineItem.period.start,
+      period_end: lineItem.period.end,
+    };
+  }
+
+  return {
+    period_start: invoice.period_start,
+    period_end: invoice.period_end,
+  };
+}
+
 export async function syncStripeInvoice(invoice: Invoice) {
   if (!invoice.metadata?.stripe_id) {
     return;
@@ -52,21 +69,24 @@ export async function syncStripeInvoice(invoice: Invoice) {
   if (stripeInvoice) {
     await invoice.update(
       // @ts-ignore
-      pick(stripeInvoice, [
-        'amount_due',
-        'amount_paid',
-        'amount_remaining',
-        'last_finalization_error',
-        'paid_out_of_band',
-        'paid',
-        'status_transitions',
-        'status',
-        'subtotal_excluding_tax',
-        'subtotal',
-        'tax',
-        'total_discount_amounts',
-        'total',
-      ])
+      merge(
+        pick(stripeInvoice, [
+          'amount_due',
+          'amount_paid',
+          'amount_remaining',
+          'last_finalization_error',
+          'paid_out_of_band',
+          'paid',
+          'status_transitions',
+          'status',
+          'subtotal_excluding_tax',
+          'subtotal',
+          'tax',
+          'total_discount_amounts',
+          'total',
+        ]),
+        getStripeInvoicePeriod(stripeInvoice)
+      )
     );
     logger.info('stripe invoice synced', { locale: invoice.id, remote: stripeInvoice.id });
   }

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

@@ -86,8 +86,9 @@ export class SubscriptionWillRenewEmailTemplate
       locale === 'en' ? this.getWillRenewDuration(locale) : this.getWillRenewDuration(locale).split(' ').join('');
 
     const upcomingInvoiceAmount = await getUpcomingInvoiceAmount(subscription.id);
-    const paymentDetail: PaymentDetail = await getPaymentDetail(userDid, invoice);
-    paymentDetail.price = +fromUnitToToken(+upcomingInvoiceAmount.amount, upcomingInvoiceAmount.currency?.decimal);
+    const amount: string = fromUnitToToken(+upcomingInvoiceAmount.amount, upcomingInvoiceAmount.currency?.decimal);
+    const paymentDetail: PaymentDetail = await getPaymentDetail(userDid, invoice, amount);
+    paymentDetail.price = +amount;
 
     const { isPrePaid, interval } = await this.getPaymentCategory({
       subscriptionId: subscription.id,

package/api/src/libs/payment.ts

@@ -174,7 +174,11 @@ export interface PaymentDetail {
   price: number;
   symbol: LiteralUnion<'ABT' | 'USD', string>;
 }
-export async function getPaymentDetail(userDid: string, invoice: Invoice): Promise<PaymentDetail> {
+export async function getPaymentDetail(
+  userDid: string,
+  invoice: Invoice,
+  amount: string = '0'
+): Promise<PaymentDetail> {
   const defaultResult = {
     balance: 0,
     price: 0,
@@ -188,11 +192,9 @@ export async function getPaymentDetail(userDid: string, invoice: Invoice): Promi
   Object.assign(defaultResult, { symbol: paymentCurrency.symbol });
 
   const paymentIntent = await PaymentIntent.findByPk(invoice.payment_intent_id);
-  if (!paymentIntent) {
-    return defaultResult;
-  }
+  const inputAmount: string = paymentIntent ? paymentIntent.amount : amount;
 
-  const paymentMethod = await PaymentMethod.findByPk(paymentIntent?.payment_method_id);
+  const paymentMethod = await PaymentMethod.findByPk(invoice.default_payment_method_id);
   if (!paymentMethod) {
     return defaultResult;
   }
@@ -203,7 +205,7 @@ export async function getPaymentDetail(userDid: string, invoice: Invoice): Promi
       paymentMethod,
       paymentCurrency,
       userDid,
-      amount: paymentIntent.amount,
+      amount: inputAmount,
     });
 
     // Do not have enough permission
@@ -212,18 +214,18 @@ export async function getPaymentDetail(userDid: string, invoice: Invoice): Promi
     }
 
     // Do not have enough token
-    const amount: number = +fromUnitToToken(paymentIntent.amount, paymentCurrency.decimal);
+    const price: number = +fromUnitToToken(inputAmount, paymentCurrency.decimal);
     if (!result.delegator) {
       return {
         balance: 0,
-        price: amount,
+        price,
         symbol: paymentCurrency.symbol,
       };
     }
 
     return {
       balance: +fromUnitToToken(result.token.balance, paymentCurrency.decimal),
-      price: amount,
+      price,
       symbol: paymentCurrency.symbol,
     };
   }

package/api/src/routes/invoices.ts

@@ -219,7 +219,7 @@ router.get('/:id', authPortal, async (req, res) => {
     });
 
     if (doc) {
-      if (doc.status !== 'paid' && doc.metadata?.stripe_id) {
+      if (doc.metadata?.stripe_id && (doc.status !== 'paid' || req.query.forceSync)) {
         await syncStripeInvoice(doc);
       }
       if (doc.payment_intent_id) {

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.251",
+  "version": "1.13.253",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -51,7 +51,7 @@
     "@arcblock/ux": "^2.9.77",
     "@arcblock/validator": "^1.18.116",
     "@blocklet/logger": "1.16.26",
-    "@blocklet/payment-react": "1.13.251",
+    "@blocklet/payment-react": "1.13.253",
     "@blocklet/sdk": "1.16.26",
     "@blocklet/ui-react": "^2.9.77",
     "@blocklet/uploader": "^0.1.6",
@@ -116,7 +116,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.26",
     "@arcblock/eslint-config-ts": "^0.3.0",
-    "@blocklet/payment-types": "1.13.251",
+    "@blocklet/payment-types": "1.13.253",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -155,5 +155,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "46caad7baca15f2ba3876018589f78ba11179f59"
+  "gitHead": "4ad023bae87cc6b0c7480e701e5ba51b7b66ca19"
 }