payment-kit 1.13.134 → 1.13.136

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

@@ -49,7 +49,7 @@ import { Product } from '../store/models/product';
 import { SetupIntent } from '../store/models/setup-intent';
 import { Subscription } from '../store/models/subscription';
 import { SubscriptionItem } from '../store/models/subscription-item';
-import { ensureInvoiceForCheckout } from './connect/shared';
+import { ensureInvoiceForCheckout, ensureSetupIntent } from './connect/shared';
 
 const getInvoicePrefix = createCodeGenerator('', 8);
 
@@ -774,6 +774,10 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
 
     if (checkoutSession.mode === 'setup' && setupIntent && subscription) {
       if (delegation.sufficient) {
+        const { invoice } = await ensureSetupIntent(checkoutSession.id, customer.did);
+        if (invoice) {
+          await invoiceQueue.pushAndWait({ id: invoice.id, job: { invoiceId: invoice.id, retryOnError: false } });
+        }
         await setupIntent.update({ status: 'succeeded', ...paymentSettings });
         await subscription.update({
           status: subscription.trail_end ? 'trialing' : 'active',

package/api/src/routes/connect/shared.ts

@@ -184,7 +184,7 @@ export async function ensureSetupIntent(checkoutSessionId: string, userDid?: str
     }
     const { user } = await blocklet.getUser(userDid, { enableConnectedAccount: true });
     if (customer.did !== user.did) {
-      throw new Error('This is not your payment intent');
+      throw new Error('This is not your setup intent');
     }
   }
 
@@ -205,6 +205,48 @@ export async function ensureSetupIntent(checkoutSessionId: string, userDid?: str
 
   checkoutSession.line_items = await Price.expand(checkoutSession.line_items);
 
+  let invoice;
+  if (subscription) {
+    // generate empty invoice here
+    const result = await ensureInvoiceAndItems({
+      customer: customer as Customer,
+      currency: paymentCurrency,
+      subscription,
+      lineItems: [],
+      trailing: !!checkoutSession.subscription_data?.trial_period_days,
+      metered: false,
+      props: {
+        livemode: checkoutSession.livemode,
+        description: checkoutSession.invoice_creation?.invoice_data?.description || 'Subscription creation',
+        statement_descriptor: getStatementDescriptor(checkoutSession.line_items),
+        period_start: subscription.current_period_start,
+        period_end: subscription.current_period_end,
+
+        auto_advance: true,
+        billing_reason: 'subscription_create',
+
+        currency_id: checkoutSession.currency_id,
+        payment_intent_id: '',
+        checkout_session_id: checkoutSession.id,
+
+        total: '0',
+
+        default_payment_method_id: subscription.default_payment_method_id as string,
+
+        custom_fields: checkoutSession.invoice_creation?.invoice_data?.custom_fields || [],
+        footer: checkoutSession.invoice_creation?.invoice_data?.footer || '',
+        metadata: checkoutSession.invoice_creation?.invoice_data?.metadata || {},
+      } as Invoice,
+    });
+    invoice = result.invoice;
+
+    logger.info(`Invoice created for checkoutSession ${checkoutSession.id} in setup mode: ${invoice.id}`);
+
+    // persist invoice id
+    await checkoutSession.update({ invoice_id: invoice.id });
+    await subscription.update({ latest_invoice_id: invoice.id });
+  }
+
   return {
     checkoutSession,
     setupIntent: setupIntent as SetupIntent,
@@ -212,6 +254,7 @@ export async function ensureSetupIntent(checkoutSessionId: string, userDid?: str
     subscription,
     paymentMethod,
     paymentCurrency,
+    invoice,
   };
 }
 
@@ -320,8 +363,8 @@ export async function ensureInvoiceAndItems({
   lineItems: TLineItemExpanded[];
   trailing: boolean; // do we have trailing
   metered: boolean; // is the quantity metered
-    applyCredit?: boolean; // should we apply customer credit?
-  }): Promise<{ invoice: Invoice; items: InvoiceItem[] }> {
+  applyCredit?: boolean; // should we apply customer credit?
+}): Promise<{ invoice: Invoice; items: InvoiceItem[] }> {
   // apply possible balance to invoice
   let remaining = props.total;
   let result = { starting: {}, ending: {} };

package/api/src/routes/subscriptions.ts

@@ -221,7 +221,13 @@ router.put('/:id/cancel', authPortal, async (req, res) => {
   }
 
   // update cancel at
-  const updates: Partial<Subscription> = {};
+  const updates: Partial<Subscription> = {
+    cancelation_details: {
+      reason: 'payment_disputed',
+      feedback: 'other',
+      comment: `Requested by ${req.user?.role}:${req.user?.did}`,
+    },
+  };
   if (req.user?.via === 'portal') {
     updates.cancel_at_period_end = true;
     updates.cancel_at = subscription.current_period_end;
@@ -293,6 +299,8 @@ router.put('/:id/cancel', authPortal, async (req, res) => {
         ending_token_balance: {},
         metadata: {
           requested_by: req.user?.did,
+          unused_period_start: refund === 'last' ? subscription.current_period_start : updates.cancel_at,
+          unused_period_end: subscription.current_period_end,
         },
       });
       logger.info('subscription cancel refund done', {

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.134",
+  "version": "1.13.136",
   "scripts": {
     "dev": "cross-env COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev",
     "eject": "vite eject",
@@ -50,7 +50,7 @@
     "@arcblock/jwt": "^1.18.108",
     "@arcblock/ux": "^2.9.23",
     "@blocklet/logger": "1.16.23-beta-aeb9f5bd",
-    "@blocklet/payment-react": "1.13.134",
+    "@blocklet/payment-react": "1.13.136",
     "@blocklet/sdk": "1.16.23-beta-aeb9f5bd",
     "@blocklet/ui-react": "^2.9.23",
     "@blocklet/uploader": "^0.0.69",
@@ -110,7 +110,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.23-beta-aeb9f5bd",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@blocklet/payment-types": "1.13.134",
+    "@blocklet/payment-types": "1.13.136",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "d4a11b7d69d309107ad6085827b61a7808e21f02"
+  "gitHead": "ab601e3842610993e41ac2951acaf040a0d345b6"
 }