payment-kit 1.13.172 → 1.13.174

package/api/src/libs/subscription.ts

@@ -309,7 +309,7 @@ export async function getSubscriptionRefundSetup(subscription: Subscription, anc
 }
 
 export function shouldCancelSubscription(
-  subscription: Pick<Subscription, 'status' | 'current_period_end' | 'cancel_at'>
+  subscription: Pick<Subscription, 'status' | 'current_period_end' | 'cancel_at' | 'cancel_at_period_end'>
 ) {
   if (['past_due', 'active', 'trialing'].includes(subscription.status)) {
     const now = dayjs().unix();
@@ -317,8 +317,10 @@ export function shouldCancelSubscription(
       if (subscription.cancel_at <= now) {
         return true;
       }
-    } else if (subscription.current_period_end <= now) {
-      return true;
+    } else if (subscription.cancel_at_period_end) {
+      if (subscription.current_period_end <= now) {
+        return true;
+      }
     }
   }
 

package/api/src/routes/checkout-sessions.ts

@@ -688,8 +688,9 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
             formatSubscriptionProduct(lineItems.filter((x) => x.price.type === 'recurring')),
           proration_behavior: checkoutSession.subscription_data?.proration_behavior || 'none',
           payment_behavior: 'default_incomplete',
-          days_until_due: checkoutSession.metadata?.days_until_due,
-          days_until_cancel: checkoutSession.metadata?.days_until_cancel,
+          days_until_due: checkoutSession.subscription_data?.days_until_due || checkoutSession.metadata?.days_until_due,
+          days_until_cancel:
+            checkoutSession.subscription_data?.days_until_cancel || checkoutSession.metadata?.days_until_cancel,
           metadata: checkoutSession.metadata as any,
         });
 

package/api/src/store/models/checkout-session.ts

@@ -168,6 +168,8 @@ export class CheckoutSession extends Model<InferAttributes<CheckoutSession>, Inf
         missing_payment_method: LiteralUnion<'cancel' | 'pause' | 'create_invoice', string>;
       };
     };
+    days_until_due?: number;
+    days_until_cancel?: number;
   };
 
   // 3rd party payment tx hash

package/api/tests/libs/subscription.spec.ts

@@ -269,9 +269,15 @@ describe('shouldCancelSubscription', () => {
     expect(result).toBe(true);
   });
 
-  it('should return true when status is "active" and current_period_end is less than or equal to now', () => {
+  it('should return false when status is "active" and current_period_end is less than or equal to now', () => {
     const subscription = { status: 'active', current_period_end: now - 1 };
     const result = shouldCancelSubscription(subscription as any);
+    expect(result).toBe(false);
+  });
+
+  it('should return true when status is "active" and current_period_end is less than or equal to now', () => {
+    const subscription = { status: 'active', current_period_end: now - 1, cancel_at_period_end: true };
+    const result = shouldCancelSubscription(subscription as any);
     expect(result).toBe(true);
   });
 
@@ -287,9 +293,15 @@ describe('shouldCancelSubscription', () => {
     expect(result).toBe(false);
   });
 
-  it('should return false when current_period_end is greater than now', () => {
+  it('should return false when current_period_end is greater than now #1', () => {
     const subscription = { status: 'active', current_period_end: now + 1 };
     const result = shouldCancelSubscription(subscription as any);
     expect(result).toBe(false);
   });
+
+  it('should return false when current_period_end is greater than now #2', () => {
+    const subscription = { status: 'active', current_period_end: now + 1, cancel_at_period_end: false };
+    const result = shouldCancelSubscription(subscription as any);
+    expect(result).toBe(false);
+  });
 });

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.172",
+  "version": "1.13.174",
   "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.110",
     "@arcblock/ux": "^2.9.39",
     "@blocklet/logger": "1.16.23",
-    "@blocklet/payment-react": "1.13.172",
+    "@blocklet/payment-react": "1.13.174",
     "@blocklet/sdk": "1.16.23",
     "@blocklet/ui-react": "^2.9.39",
     "@blocklet/uploader": "^0.0.74",
@@ -110,7 +110,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.23",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@blocklet/payment-types": "1.13.172",
+    "@blocklet/payment-types": "1.13.174",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "bb4f4aec316f48c3e299fe97758b00fb4380cda8"
+  "gitHead": "6aa0d712bf8f36a3592fd564f14fd9ca05b5c7a9"
 }