payment-kit 1.18.31 → 1.18.33

package/api/src/integrations/stripe/handlers/setup-intent.ts

@@ -3,6 +3,7 @@ import type Stripe from 'stripe';
 import logger from '../../../libs/logger';
 import { CheckoutSession, Lock, SetupIntent, Subscription, TEventExpanded } from '../../../store/models';
 import { updateGroupSubscriptionsPaymentMethod } from '../resource';
+import { getCheckoutSessionSubscriptionIds } from '../../../libs/session';
 
 async function handleSubscriptionOnSetupSucceeded(event: TEventExpanded, stripeIntentId: string) {
   const subscription = await Subscription.findOne({
@@ -22,8 +23,18 @@ async function handleSubscriptionOnSetupSucceeded(event: TEventExpanded, stripeI
 
     const checkoutSession = await CheckoutSession.findBySubscriptionId(subscription.id);
     if (checkoutSession && checkoutSession.status === 'open') {
-      await checkoutSession.update({ status: 'complete', payment_status: 'no_payment_required' });
-      logger.info('checkout session become complete on stripe intent succeeded', checkoutSession.id);
+      const subscriptionIds = getCheckoutSessionSubscriptionIds(checkoutSession);
+      if (subscriptionIds.length <= 1) {
+        const updates: Partial<CheckoutSession> = {
+          status: 'complete',
+          payment_status: 'no_payment_required',
+        };
+        if (checkoutSession.subscription_id) {
+          updates.success_subscription_count = 1;
+        }
+        await checkoutSession.update(updates);
+        logger.info('checkout session become complete on stripe intent succeeded', checkoutSession.id);
+      }
     }
 
     return;

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

@@ -5,6 +5,7 @@ import logger from '../../../libs/logger';
 import { finalizeStripeSubscriptionUpdate } from '../../../libs/subscription';
 import { CheckoutSession, PaymentMethod, Subscription, TEventExpanded } from '../../../store/models';
 import { getCheckoutSessionSubscriptionIds } from '../../../libs/session';
+import { createEvent } from '../../../libs/audit';
 
 export async function handleStripeSubscriptionSucceed(subscription: Subscription, status: string) {
   if (!subscription.payment_details?.stripe?.subscription_id) {
@@ -17,6 +18,20 @@ export async function handleStripeSubscriptionSucceed(subscription: Subscription
   const result: any = await client.subscriptions.retrieve(subscription.payment_details.stripe.subscription_id, {
     expand: ['latest_invoice.payment_intent', 'pending_setup_intent'],
   });
+  const checkoutSession = await CheckoutSession.findBySubscriptionId(subscription.id);
+  let subscriptionIds: string[] = [subscription.id];
+  if (checkoutSession) {
+    subscriptionIds = getCheckoutSessionSubscriptionIds(checkoutSession);
+  }
+  const isMultipleSubscriptions = subscriptionIds.length > 1 && checkoutSession?.enable_subscription_grouping;
+  // if not multiple subscriptions, check if setup is done
+  if (!isMultipleSubscriptions && result.pending_setup_intent && result.pending_setup_intent.status !== 'succeeded') {
+    logger.warn('subscription can not active because stripe setup not done', {
+      id: subscription.id,
+      status: result.pending_setup_intent.status,
+    });
+    return;
+  }
   const paymentIntent = result.latest_invoice?.payment_intent;
   const paymentIntentStatus = typeof paymentIntent === 'string' ? paymentIntent : paymentIntent?.status;
   if (result.latest_invoice?.payment_intent && paymentIntentStatus !== 'succeeded') {
@@ -28,13 +43,16 @@ export async function handleStripeSubscriptionSucceed(subscription: Subscription
   }
 
   await subscription.update({ status });
+  if (subscription.trial_end && subscription.trial_end > Date.now() / 1000 && subscription.status === 'trialing') {
+    createEvent('Subscription', 'customer.subscription.trial_start', subscription).catch(console.error);
+  } else if (subscription.status === 'active') {
+    createEvent('Subscription', 'customer.subscription.started', subscription).catch(console.error);
+  }
   logger.info('subscription become active on stripe event', { id: subscription.id, status: subscription.status });
 
-  const checkoutSession = await CheckoutSession.findBySubscriptionId(subscription.id);
   if (checkoutSession && checkoutSession.status === 'open') {
     await checkoutSession.increment('success_subscription_count', { by: 1 });
     await checkoutSession.reload();
-    const subscriptionIds = getCheckoutSessionSubscriptionIds(checkoutSession);
     if (checkoutSession.success_subscription_count === subscriptionIds.length) {
       await checkoutSession.update({
         status: 'complete',

package/api/src/libs/notification/template/subscription-succeeded.ts

@@ -87,7 +87,7 @@ export class SubscriptionSucceededEmailTemplate
 
         return Boolean(
           ['disabled', 'minted', 'sent', 'error'].includes(checkoutSession?.nft_mint_status as string) &&
-            (invoice?.payment_intent_id || (invoice && +invoice.total === 0))
+            (invoice?.payment_intent_id || (invoice && +invoice.amount_remaining === 0))
         );
       },
       { timeout: 1000 * 10, interval: 1000 }

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.18.31",
+  "version": "1.18.33",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -45,29 +45,29 @@
   },
   "dependencies": {
     "@abtnode/cron": "^1.16.42",
-    "@arcblock/did": "^1.20.1",
+    "@arcblock/did": "^1.20.2",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.13.5",
-    "@arcblock/did-util": "^1.20.1",
-    "@arcblock/jwt": "^1.20.1",
-    "@arcblock/ux": "^2.13.5",
-    "@arcblock/validator": "^1.20.1",
+    "@arcblock/did-connect": "^2.13.9",
+    "@arcblock/did-util": "^1.20.2",
+    "@arcblock/jwt": "^1.20.2",
+    "@arcblock/ux": "^2.13.9",
+    "@arcblock/validator": "^1.20.2",
     "@blocklet/js-sdk": "^1.16.42",
     "@blocklet/logger": "^1.16.42",
-    "@blocklet/payment-react": "1.18.31",
+    "@blocklet/payment-react": "1.18.33",
     "@blocklet/sdk": "^1.16.42",
-    "@blocklet/ui-react": "^2.13.5",
+    "@blocklet/ui-react": "^2.13.9",
     "@blocklet/uploader": "^0.1.83",
     "@blocklet/xss": "^0.1.32",
     "@mui/icons-material": "^5.16.6",
     "@mui/lab": "^5.0.0-alpha.173",
     "@mui/material": "^5.16.6",
     "@mui/system": "^5.16.6",
-    "@ocap/asset": "^1.20.1",
-    "@ocap/client": "^1.20.1",
-    "@ocap/mcrypto": "^1.20.1",
-    "@ocap/util": "^1.20.1",
-    "@ocap/wallet": "^1.20.1",
+    "@ocap/asset": "^1.20.2",
+    "@ocap/client": "^1.20.2",
+    "@ocap/mcrypto": "^1.20.2",
+    "@ocap/util": "^1.20.2",
+    "@ocap/wallet": "^1.20.2",
     "@stripe/react-stripe-js": "^2.7.3",
     "@stripe/stripe-js": "^2.4.0",
     "ahooks": "^3.8.0",
@@ -122,7 +122,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.42",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.18.31",
+    "@blocklet/payment-types": "1.18.33",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -168,5 +168,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "c9b1eff248ecd07bc1f606df039464dafa786914"
+  "gitHead": "91ae6c4dda76b8cc7a8ab5f82ae44874d429439b"
 }

package/src/components/price/form.tsx

@@ -467,6 +467,7 @@ export default function PriceForm({ prefix, simple }: PriceFormProps) {
                             <option value="day">{t('common.days')}</option>
                             <option value="week">{t('common.weeks')}</option>
                             <option value="month">{t('common.months')}</option>
+                            <option value="year">{t('common.years')}</option>
                           </select>
                         </InputAdornment>
                       ),

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

@@ -79,7 +79,7 @@ export default function CustomerSubscriptionDetail() {
     loading: overdraftProtectionLoading,
     run: refreshOverdraftProtection,
   } = useRequest(() => fetchOverdraftProtection(id), {
-    ready: ['active', 'trialing', 'past_due'].includes(data?.status || ''),
+    ready: ['active', 'trialing', 'past_due'].includes(data?.status || '') && data?.paymentMethod?.type === 'arcblock',
   });
 
   const {