payment-kit 1.14.0 → 1.14.2

package/api/src/libs/refund.ts

@@ -1,5 +1,5 @@
 import { BN } from '@ocap/util';
-import type { WhereOptions } from 'sequelize';
+import { Op, type WhereOptions } from 'sequelize';
 import { PaymentIntent, Refund } from '../store/models';
 
 export async function getRefundAmountSetup({
@@ -20,7 +20,9 @@ export async function getRefundAmountSetup({
     throw new Error('PaymentIntent not found');
   }
   const where: WhereOptions<Refund> = {
-    status: ['succeeded'],
+    status: {
+      [Op.not]: 'canceled',
+    },
     payment_intent_id: paymentIntentId,
   };
   if (currencyId) {

package/api/src/libs/subscription.ts

@@ -6,6 +6,7 @@ import pick from 'lodash/pick';
 import type { LiteralUnion } from 'type-fest';
 import { withQuery } from 'ufo';
 
+import { Op } from 'sequelize';
 import {
   Customer,
   Invoice,
@@ -642,7 +643,13 @@ export async function getRemainingStakes(subscriptionIds: string[], subscription
   await Promise.all(
     subscriptionIds.map(async (subscriptionId) => {
       const refund = await Refund.findOne({
-        where: { subscription_id: subscriptionId, status: 'succeeded', type: 'stake_return' },
+        where: {
+          subscription_id: subscriptionId,
+          status: {
+            [Op.not]: 'canceled',
+          },
+          type: 'stake_return',
+        },
       });
       if (!refund) {
         // this subscription not return stake

package/api/src/queues/subscription.ts

@@ -224,6 +224,14 @@ const handleSubscriptionWhenActive = async (subscription: Subscription) => {
     }
   }
 
+  // change to active if still in trialing
+  if (subscription.status === 'trialing') {
+    const now = dayjs().unix();
+    if (subscription.trial_end && subscription.trial_end <= now) {
+      await subscription.update({ status: 'active' });
+    }
+  }
+
   const invoice = await handleSubscriptionInvoice({
     subscription,
     filter: () => true, // include all items

package/api/src/routes/subscriptions.ts

@@ -1008,12 +1008,14 @@ router.put('/:id', authPortal, async (req, res) => {
       await subscription.update(updates);
     } else {
       const now = dayjs().unix();
+      let jobRunAt = 0;
       let shouldCycle = false;
       let periodChanged = false;
       if (value.trial_end && subscription.isActive()) {
         if (value.trial_end === 'now') {
           if (subscription.status === 'trialing') {
             updates.trial_end = now;
+            jobRunAt = now;
             shouldCycle = true;
             periodChanged = true;
           } else {
@@ -1021,6 +1023,8 @@ router.put('/:id', authPortal, async (req, res) => {
           }
         } else if ((value.trial_end as number) > now) {
           updates.trial_end = value.trial_end as number;
+          jobRunAt = updates.trial_end;
+          shouldCycle = true;
           periodChanged = true;
         } else {
           throw new Error('trial_end must be a future timestamp');
@@ -1062,7 +1066,7 @@ router.put('/:id', authPortal, async (req, res) => {
           });
         }
         if (shouldCycle) {
-          await addSubscriptionJob(subscription, 'cycle', true, now);
+          await addSubscriptionJob(subscription, 'cycle', true, jobRunAt);
           logger.info('subscription job rescheduled on period end', { subscription: subscription.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.14.0
+version: 1.14.2
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.14.0",
+  "version": "1.14.2",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -52,7 +52,7 @@
     "@arcblock/validator": "^1.18.124",
     "@blocklet/js-sdk": "1.16.28",
     "@blocklet/logger": "1.16.28",
-    "@blocklet/payment-react": "1.14.0",
+    "@blocklet/payment-react": "1.14.2",
     "@blocklet/sdk": "1.16.28",
     "@blocklet/ui-react": "^2.10.3",
     "@blocklet/uploader": "^0.1.20",
@@ -118,7 +118,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.28",
     "@arcblock/eslint-config-ts": "^0.3.2",
-    "@blocklet/payment-types": "1.14.0",
+    "@blocklet/payment-types": "1.14.2",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -160,5 +160,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "f39e47fae8a2c10598c6ee28e10b76f338b14c97"
+  "gitHead": "a4a936dc1b6bb74eb02674cd619d453410b1aa86"
 }