payment-kit 1.15.22 → 1.15.23

package/api/src/routes/invoices.ts

@@ -10,7 +10,7 @@ import { createListParamSchema, getWhereFromKvQuery, MetadataSchema } from '../l
 import { authenticate } from '../libs/security';
 import { expandLineItems } from '../libs/session';
 import { formatMetadata } from '../libs/util';
-import { Refund } from '../store/models';
+import { Refund, SetupIntent } from '../store/models';
 import { Customer } from '../store/models/customer';
 import { Invoice } from '../store/models/invoice';
 import { InvoiceItem } from '../store/models/invoice-item';
@@ -131,23 +131,27 @@ router.get('/', authMine, async (req, res) => {
         subscription = await Subscription.findByPk(query.subscription_id);
         if (subscription?.payment_details?.arcblock?.staking?.tx_hash) {
           const method = await PaymentMethod.findOne({ where: { type: 'arcblock', livemode: subscription.livemode } });
-          if (method) {
+          const setup = await SetupIntent.findOne({
+            where: {
+              customer_id: subscription.customer_id,
+              payment_method_id: method?.id,
+              metadata: { subscription_id: subscription.id },
+            },
+            order: [['created_at', 'ASC']],
+          });
+          const currencyId = setup?.currency_id || subscription.currency_id;
+          const currency = await PaymentCurrency.findByPk(currencyId);
+          if (method && currency) {
             const { address } = subscription.payment_details.arcblock.staking;
             const firstInvoice = await Invoice.findOne({
-              where: { subscription_id: subscription.id },
+              where: { subscription_id: subscription.id, currency_id: currencyId },
               order: [['created_at', 'ASC']],
               include: [{ model: PaymentCurrency, as: 'paymentCurrency' }],
             });
-            const last = query.o === 'asc' ? list?.[list.length - 1] : list?.[0];
-            if (subscription.payment_details.arcblock.staking.tx_hash && firstInvoice) {
+            if (firstInvoice) {
               const customer = await Customer.findByPk(firstInvoice.customer_id);
-              const currency =
-                // @ts-ignore
-                firstInvoice?.paymentCurrency ||
-                (await PaymentCurrency.findOne({
-                  where: { payment_method_id: method.id, is_base_currency: true },
-                }));
               const stakeAmountResult = await getSubscriptionStakeAmountSetup(subscription, method);
+              // @ts-ignore
               const stakeAmount = stakeAmountResult?.[currency?.contract] || '0';
 
               list.push({
@@ -187,7 +191,6 @@ router.get('/', authMine, async (req, res) => {
               const stakeRefundRecord = await Refund.findOne({
                 where: { subscription_id: subscription.id, status: 'succeeded', type: 'stake_return' },
               });
-
               if (stakeRefundRecord) {
                 list.unshift({
                   id: address as string,
@@ -198,18 +201,15 @@ router.get('/', authMine, async (req, res) => {
                   amount_due: '0',
                   amount_paid: stakeRefundRecord.amount,
                   amount_remaining: '0',
-                  ...pick(last, [
-                    'number',
-                    'paid',
-                    'auto_advance',
-                    'currency_id',
-                    'customer_id',
-                    'subscription_id',
-                    'period_start',
-                    'period_end',
-                    'created_at',
-                    'updated_at',
-                  ]),
+                  created_at: stakeRefundRecord.created_at,
+                  updated_at: stakeRefundRecord.updated_at,
+                  currency_id: stakeRefundRecord.currency_id,
+                  customer_id: stakeRefundRecord.customer_id,
+                  subscription_id: subscription.id,
+                  period_start: subscription.current_period_start,
+                  period_end: subscription.current_period_end,
+                  paid: true,
+                  ...pick(firstInvoice, ['number', 'auto_advance']),
                   // @ts-ignore
                   paymentCurrency: currency,
                   paymentMethod: method,

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.15.22",
+  "version": "1.15.23",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -52,7 +52,7 @@
     "@arcblock/validator": "^1.18.136",
     "@blocklet/js-sdk": "^1.16.32",
     "@blocklet/logger": "^1.16.32",
-    "@blocklet/payment-react": "1.15.22",
+    "@blocklet/payment-react": "1.15.23",
     "@blocklet/sdk": "^1.16.32",
     "@blocklet/ui-react": "^2.10.51",
     "@blocklet/uploader": "^0.1.46",
@@ -118,7 +118,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.32",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.15.22",
+    "@blocklet/payment-types": "1.15.23",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -160,5 +160,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "12a3cbcf04d0c8bdbbf33c04d07cecfb24bd3e9b"
+  "gitHead": "94862642b9c4f0f753a47e8c68d9b70315d8f008"
 }