payment-kit 1.13.72 → 1.13.74

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

@@ -16,12 +16,9 @@ import { checkPassportForPaymentLink } from '../integrations/blocklet/passport';
 import { handleStripePaymentSucceed } from '../integrations/stripe/handlers/payment-intent';
 import { handleStripeSubscriptionSucceed } from '../integrations/stripe/handlers/subscription';
 import { ensureStripePaymentIntent, ensureStripeSubscription } from '../integrations/stripe/resource';
-import { invoiceQueue } from '../jobs/invoice';
-import { paymentQueue } from '../jobs/payment';
-import { subscriptionQueue } from '../jobs/subscription';
 import dayjs from '../libs/dayjs';
 import logger from '../libs/logger';
-import { isDelegationSufficientForPayment } from '../libs/payment';
+import { isBalanceSufficientForPayment, isDelegationSufficientForPayment } from '../libs/payment';
 import { authenticate } from '../libs/security';
 import {
   canUpsell,
@@ -35,11 +32,15 @@ import {
   getSupportedPaymentMethods,
   isLineItemAligned,
 } from '../libs/session';
+import { getDaysUntilDue } from '../libs/subscription';
 import { createCodeGenerator, formatMetadata, getMetadataFromQuery } from '../libs/util';
+import { invoiceQueue } from '../queues/invoice';
+import { paymentQueue } from '../queues/payment';
+import { subscriptionQueue } from '../queues/subscription';
 import type { TPriceExpanded, TProductExpanded } from '../store/models';
 import { CheckoutSession } from '../store/models/checkout-session';
 import { Customer } from '../store/models/customer';
-import { PaymentCurrency, TPaymentCurrency } from '../store/models/payment-currency';
+import { PaymentCurrency } from '../store/models/payment-currency';
 import { PaymentIntent } from '../store/models/payment-intent';
 import { PaymentLink } from '../store/models/payment-link';
 import { PaymentMethod } from '../store/models/payment-method';
@@ -186,9 +187,8 @@ export const formatCheckoutSession = async (payload: any, throwOnEmptyItems = tr
 
 export async function getCheckoutSessionAmounts(checkoutSession: CheckoutSession) {
   const items = await Price.expand(checkoutSession.line_items);
-  const currency = await PaymentCurrency.findByPk(checkoutSession.currency_id);
   const includeTrial = !!checkoutSession.subscription_data?.trial_period_days;
-  const amount = getCheckoutAmount(items, currency as TPaymentCurrency, includeTrial);
+  const amount = getCheckoutAmount(items, checkoutSession.currency_id, includeTrial);
   return {
     amount_subtotal: amount.subtotal,
     amount_total: amount.total,
@@ -333,6 +333,7 @@ export async function startCheckoutSessionFromPaymentLink(id: string, req: Reque
         raw.metadata = {
           ...link.metadata,
           ...getMetadataFromQuery(req.query),
+          days_until_due: getDaysUntilDue(req.query),
           passport: await checkPassportForPaymentLink(link),
           preview: '1',
         };
@@ -341,6 +342,7 @@ export async function startCheckoutSessionFromPaymentLink(id: string, req: Reque
       raw.metadata = {
         ...link.metadata,
         ...getMetadataFromQuery(req.query),
+        days_until_due: getDaysUntilDue(req.query),
         passport: await checkPassportForPaymentLink(link),
       };
     }
@@ -445,7 +447,7 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
     // always update payment amount in case currency has changed
     const lineItems = await Price.expand(checkoutSession.line_items, { product: true, upsell: true });
     const trialInDays = checkoutSession.subscription_data?.trial_period_days || 0;
-    const amount = getCheckoutAmount(lineItems, paymentCurrency, !!trialInDays);
+    const amount = getCheckoutAmount(lineItems, paymentCurrency.id, !!trialInDays);
     await checkoutSession.update({
       amount_subtotal: amount.subtotal,
       amount_total: amount.total,
@@ -581,7 +583,7 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
           payment_method_id: paymentMethod.id,
           last_setup_error: null,
         });
-        logger.info('setup intent for checkout session reset', {
+        logger.info('setupIntent reset on checkout session submit', {
           session: checkoutSession.id,
           intent: setupIntent.id,
         });
@@ -599,13 +601,13 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
           usage: 'off_session',
           metadata: checkoutSession.metadata,
         });
+
+        // persist setup intent id
+        await checkoutSession.update({ setup_intent_id: setupIntent.id });
         logger.info('setupIntent created on checkout session submit', {
           session: checkoutSession.id,
           intent: setupIntent.id,
         });
-
-        // persist setup intent id
-        await checkoutSession.update({ setup_intent_id: setupIntent.id });
       }
     }
 
@@ -627,7 +629,7 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
           pending_setup_intent: setupIntent?.id,
         });
       } else {
-        const setup = getSubscriptionCreateSetup(lineItems, paymentCurrency, trialInDays);
+        const setup = getSubscriptionCreateSetup(lineItems, paymentCurrency.id, trialInDays);
         subscription = await Subscription.create({
           livemode: !!checkoutSession.livemode,
           currency_id: paymentCurrency.id,
@@ -649,6 +651,9 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
           default_payment_method_id: paymentMethod.id,
           cancel_at_period_end: false,
           collection_method: 'charge_automatically',
+          proration_behavior: 'none',
+          payment_behavior: 'default_incomplete',
+          days_until_due: checkoutSession.metadata?.days_until_due,
           metadata: checkoutSession.metadata as any,
         });
 
@@ -678,30 +683,61 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
           items: items.map((x) => x.id),
         });
 
-        // lock prices used by this subscription
-        await Price.update({ locked: true }, { where: { id: lineItems.map((x) => x.upsell_price_id || x.price_id) } });
-
         // persist subscription id
         await checkoutSession.update({ subscription_id: subscription.id });
       }
     }
 
+    let isPaymentFromBalance = false;
+    const fastCheckoutAmount = getFastCheckoutAmount(
+      lineItems,
+      checkoutSession.mode,
+      paymentCurrency.id,
+      !!trialInDays
+    );
+    const paymentSettings = {
+      payment_method_types: checkoutSession.payment_method_types,
+      payment_method_options: {
+        arcblock: { payer: customer.did },
+      },
+    };
+
+    // if we can complete purchase with customer balance
+    const balance = isBalanceSufficientForPayment({
+      paymentMethod,
+      paymentCurrency,
+      customer,
+      amount: fastCheckoutAmount,
+    });
+    if (balance.sufficient) {
+      if (checkoutSession.mode === 'payment' && paymentIntent) {
+        await paymentIntent.update({ status: 'requires_capture' });
+        logger.info(`CheckoutSession ${checkoutSession.id} will pay from balance ${paymentIntent?.id}`);
+
+        const { invoice } = await ensureInvoiceForCheckout({ checkoutSession, customer, paymentIntent });
+        if (invoice) {
+          await invoice.update({ auto_advance: true, payment_settings: paymentSettings });
+          invoiceQueue.push({ id: invoice.id, job: { invoiceId: invoice.id, retryOnError: false } });
+        } else {
+          paymentQueue.push({
+            id: paymentIntent.id,
+            job: { paymentIntentId: paymentIntent.id, paymentSettings, retryOnError: false },
+          });
+        }
+
+        isPaymentFromBalance = true;
+      }
+    }
+
     // if we can complete purchase without any wallet interaction
-    const fastCheckoutAmount = getFastCheckoutAmount(lineItems, checkoutSession.mode, paymentCurrency, !!trialInDays);
     const delegation = await isDelegationSufficientForPayment({
       paymentMethod,
       paymentCurrency,
       userDid: customer.did,
       amount: fastCheckoutAmount,
     });
-    if (delegation.sufficient) {
-      const paymentSettings = {
-        payment_method_types: checkoutSession.payment_method_types,
-        payment_method_options: {
-          arcblock: { payer: delegation.delegator as string },
-        },
-      };
 
+    if (delegation.sufficient) {
       // all subscription payments are done after delegation
       if (checkoutSession.mode === 'subscription' && subscription) {
         await subscription.update({ payment_settings: paymentSettings });
@@ -716,7 +752,8 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
           runAt: subscription.trail_end || subscription.current_period_end,
         });
       }
-      if (checkoutSession.mode === 'payment' && paymentIntent) {
+      if (checkoutSession.mode === 'payment' && paymentIntent && !isPaymentFromBalance) {
+        logger.info(`CheckoutSession ${checkoutSession.id} will pay from delegation ${paymentIntent?.id}`);
         const { invoice } = await ensureInvoiceForCheckout({ checkoutSession, customer, paymentIntent });
         if (invoice) {
           await invoice.update({ auto_advance: true, payment_settings: paymentSettings });
@@ -784,7 +821,16 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
       }
     }
 
-    return res.json({ paymentIntent, setupIntent, stripeContext, subscription, checkoutSession, customer, delegation });
+    return res.json({
+      paymentIntent,
+      setupIntent,
+      stripeContext,
+      subscription,
+      checkoutSession,
+      customer,
+      delegation,
+      balance,
+    });
   } catch (err) {
     console.error(err);
     res.status(500).json({ code: err.code, error: err.message });

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

@@ -1,13 +1,13 @@
 import type { Transaction, TransferV3Tx } from '@ocap/client';
 import { fromAddress } from '@ocap/wallet';
 
-import { invoiceQueue } from '../../jobs/invoice';
-import { handlePaymentSucceed, paymentQueue } from '../../jobs/payment';
 import type { CallbackArgs } from '../../libs/auth';
 import { wallet } from '../../libs/auth';
 import { events } from '../../libs/event';
 import { getGasPayerExtra } from '../../libs/payment';
 import { getTxMetadata } from '../../libs/util';
+import { invoiceQueue } from '../../queues/invoice';
+import { handlePaymentSucceed, paymentQueue } from '../../queues/payment';
 import { Subscription } from '../../store/models';
 import { ensureInvoiceForCollect, getAuthPrincipalClaim } from './shared';
 

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

@@ -1,11 +1,11 @@
 import type { Transaction, TransferV3Tx } from '@ocap/client';
 import { fromAddress } from '@ocap/wallet';
 
-import { handlePaymentSucceed } from '../../jobs/payment';
 import type { CallbackArgs } from '../../libs/auth';
 import { wallet } from '../../libs/auth';
 import { getGasPayerExtra } from '../../libs/payment';
 import { getTxMetadata } from '../../libs/util';
+import { handlePaymentSucceed } from '../../queues/payment';
 import { ensureInvoiceForCheckout, ensurePaymentIntent, getAuthPrincipalClaim } from './shared';
 
 export default {

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

@@ -3,12 +3,12 @@ import { toDelegateAddress } from '@arcblock/did-util';
 import type { Transaction } from '@ocap/client';
 import { fromPublicKey } from '@ocap/wallet';
 
-import { subscriptionQueue } from '../../jobs/subscription';
 import type { CallbackArgs } from '../../libs/auth';
 import { wallet } from '../../libs/auth';
 import { getGasPayerExtra, getTokenLimitsForDelegation } from '../../libs/payment';
 import { getFastCheckoutAmount } from '../../libs/session';
 import { OCAP_PAYMENT_TX_TYPE, getTxMetadata } from '../../libs/util';
+import { subscriptionQueue } from '../../queues/subscription';
 import type { TLineItemExpanded } from '../../store/models';
 import { ensureSetupIntent, getAuthPrincipalClaim, getTokenRequirements } from './shared';
 
@@ -36,9 +36,16 @@ export default {
       const amount = getFastCheckoutAmount(
         checkoutSession.line_items as TLineItemExpanded[],
         checkoutSession.mode,
-        paymentCurrency
+        paymentCurrency.id
+      );
+
+      const tokenLimits = await getTokenLimitsForDelegation(
+        checkoutSession,
+        paymentMethod,
+        paymentCurrency,
+        address,
+        amount
       );
-      const tokenLimits = await getTokenLimitsForDelegation(paymentMethod, paymentCurrency, address, amount);
       const tokenRequirements = await getTokenRequirements(checkoutSession, paymentMethod, paymentCurrency);
 
       return {

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

@@ -4,11 +4,11 @@ import { estimateMaxGasForTx, hasStakedForGas } from '../../integrations/blockch
 import { blocklet } from '../../libs/auth';
 import dayjs from '../../libs/dayjs';
 import logger from '../../libs/logger';
-import { getFastCheckoutAmount, getStatementDescriptor } from '../../libs/session';
+import { getFastCheckoutAmount, getPriceUintAmountByCurrency, getStatementDescriptor } from '../../libs/session';
 import type { TLineItemExpanded } from '../../store/models';
 import { CheckoutSession } from '../../store/models/checkout-session';
 import { Customer } from '../../store/models/customer';
-import { Invoice } from '../../store/models/invoice';
+import { Invoice, TInvoice } from '../../store/models/invoice';
 import { InvoiceItem } from '../../store/models/invoice-item';
 import { PaymentCurrency } from '../../store/models/payment-currency';
 import { PaymentIntent } from '../../store/models/payment-intent';
@@ -135,16 +135,16 @@ export async function ensureSetupIntent(checkoutSessionId: string, userDid?: str
   if (checkoutSession.setup_intent_id) {
     setupIntent = await SetupIntent.findByPk(checkoutSession.setup_intent_id);
     if (!setupIntent) {
-      throw new Error('Payment intent not found');
+      throw new Error('Setup intent not found');
     }
     if (setupIntent.status === 'succeeded') {
-      throw new Error('Payment intent completed');
+      throw new Error('Setup intent completed');
     }
     if (setupIntent.status === 'canceled') {
-      throw new Error('Payment intent canceled');
+      throw new Error('Setup intent canceled');
     }
     if (setupIntent.status === 'processing') {
-      throw new Error('Payment intent processing');
+      throw new Error('Setup intent processing');
     }
 
     customerId = setupIntent.customer_id;
@@ -245,48 +245,109 @@ export async function ensureInvoiceForCheckout({
     };
   }
 
+  const { invoice, items } = await ensureInvoiceAndItems({
+    customer,
+    subscription,
+    lineItems: await Price.expand(checkoutSession.line_items, { product: true }),
+    trailing: !!checkoutSession.subscription_data?.trial_period_days,
+    metered: false,
+    props: {
+      livemode: checkoutSession.livemode,
+      description:
+        checkoutSession.invoice_creation?.invoice_data?.description ||
+        paymentIntent?.description ||
+        'Subscription creation',
+      statement_descriptor: paymentIntent?.statement_descriptor || getStatementDescriptor(checkoutSession.line_items),
+      period_start: subscription?.current_period_start ?? 0,
+      period_end: subscription?.current_period_end ?? 0,
+
+      auto_advance: !paymentIntent,
+      billing_reason: subscription ? 'subscription_create' : 'manual',
+
+      currency_id: checkoutSession.currency_id,
+      payment_intent_id: paymentIntent?.id,
+      checkout_session_id: checkoutSession.id,
+
+      total: checkoutSession.amount_subtotal,
+
+      default_payment_method_id: (subscription?.default_payment_method_id ||
+        paymentIntent?.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,
+  });
+  logger.info(`Invoice created for checkoutSession ${checkoutSession.id}: ${invoice.id}`);
+
+  // persist invoice id
+  await checkoutSession.update({ invoice_id: invoice.id });
+  if (paymentIntent) {
+    await paymentIntent.update({ invoice_id: invoice.id });
+  }
+  if (subscription) {
+    await subscription.update({ latest_invoice_id: invoice.id });
+  }
+
+  return { invoice, items };
+}
+
+export async function ensureInvoiceAndItems({
+  customer,
+  subscription,
+  props,
+  lineItems,
+  trailing,
+  metered,
+}: {
+  customer: Customer;
+  subscription?: Subscription;
+  props: TInvoice;
+  lineItems: TLineItemExpanded[];
+  trailing: boolean; // do we have trailing
+  metered: boolean; // is the quantity metered
+}): Promise<{ invoice: Invoice; items: InvoiceItem[] }> {
   const invoice = await Invoice.create({
-    livemode: checkoutSession.livemode,
+    livemode: props.livemode,
     number: await customer.getInvoiceNumber(),
-    description:
-      checkoutSession.invoice_creation?.invoice_data?.description ||
-      paymentIntent?.description ||
-      'Subscription creation',
-    statement_descriptor: paymentIntent?.statement_descriptor || getStatementDescriptor(checkoutSession.line_items),
-    period_start: subscription?.current_period_start ?? 0,
-    period_end: subscription?.current_period_end ?? 0,
-
-    auto_advance: !paymentIntent,
+    description: props.description,
+    statement_descriptor: props.statement_descriptor,
+    period_start: props.period_start,
+    period_end: props.period_end,
+
+    auto_advance: props.auto_advance,
     paid: false,
     paid_out_of_band: false,
 
-    status: 'open',
+    status: props.status || 'open',
     collection_method: 'charge_automatically',
-    billing_reason: subscription ? 'subscription_create' : 'manual',
+    billing_reason: props.billing_reason,
 
-    currency_id: checkoutSession.currency_id,
+    currency_id: props.currency_id,
     customer_id: customer.id,
-    payment_intent_id: paymentIntent?.id,
+    payment_intent_id: props.payment_intent_id || '',
     subscription_id: subscription?.id,
-    checkout_session_id: checkoutSession.id,
+    checkout_session_id: props.checkout_session_id || '',
 
-    subtotal: checkoutSession.amount_subtotal,
-    subtotal_excluding_tax: checkoutSession.amount_subtotal,
+    subtotal: props.total || '0',
+    subtotal_excluding_tax: props.total || '0',
     tax: '0',
-    total: checkoutSession.amount_total,
-    amount_due: checkoutSession.amount_total,
+    total: props.total || '0',
+    amount_due: props.total || '0',
     amount_paid: '0',
-    amount_remaining: checkoutSession.amount_total,
+    amount_remaining: props.total || '0',
     amount_shipping: '0',
 
     starting_balance: '0',
     ending_balance: '0',
+    starting_token_balance: {},
+    ending_token_balance: {},
 
     attempt_count: 0,
     attempted: false,
     // next_payment_attempt: undefined,
 
-    custom_fields: checkoutSession.invoice_creation?.invoice_data?.custom_fields || [],
+    custom_fields: props.custom_fields || [],
     customer_address: customer.address,
     customer_email: customer.email,
     customer_name: customer.name,
@@ -302,31 +363,19 @@ export async function ensureInvoiceForCheckout({
     },
 
     payment_settings: subscription?.payment_settings,
-    default_payment_method_id: (subscription?.default_payment_method_id || paymentIntent?.payment_method_id) as string,
+    default_payment_method_id: props.default_payment_method_id,
 
     account_country: '',
     account_name: '',
-    footer: checkoutSession.invoice_creation?.invoice_data?.footer || '',
-    metadata: checkoutSession.invoice_creation?.invoice_data?.metadata || {},
+    footer: props.footer || '',
+    metadata: props.metadata || {},
   });
-  logger.info(`Invoice created for checkoutSession ${checkoutSession.id}: ${invoice.id}`);
-
-  // persist invoice id
-  await checkoutSession.update({ invoice_id: invoice.id });
-  if (paymentIntent) {
-    await paymentIntent.update({ invoice_id: invoice.id });
-  }
-  if (subscription) {
-    await subscription.update({ latest_invoice_id: invoice.id });
-  }
 
   // create invoice items: for those require payment this time
   const subscriptionItems = subscription
     ? await SubscriptionItem.findAll({ where: { subscription_id: subscription?.id } })
     : [];
-  const lineItems = await Price.expand(checkoutSession.line_items, { product: true });
 
-  const trailing = !!checkoutSession.subscription_data?.trial_period_days;
   const getLineSetup = (x: TLineItemExpanded) => {
     const price = x.upsell_price || x.price;
     if (price.type === 'recurring' && trailing) {
@@ -335,14 +384,14 @@ export async function ensureInvoiceForCheckout({
         // @ts-ignore
         description: trailing ? `${price.product.name} (trailing)` : price.product.name,
         period: {
-          start: subscription?.current_period_start as number,
-          end: subscription?.current_period_end as number,
+          start: props.period_start,
+          end: props.period_end,
         },
       };
     }
 
     return {
-      amount: new BN(price.unit_amount).mul(new BN(x.quantity)).toString(),
+      amount: new BN(getPriceUintAmountByCurrency(price, props.currency_id)).mul(new BN(x.quantity)).toString(),
       // @ts-ignore
       description: price.product.name,
       period: undefined,
@@ -355,7 +404,7 @@ export async function ensureInvoiceForCheckout({
       const price = x.upsell_price || x.price;
       let { quantity } = x;
       if (price.type === 'recurring') {
-        if (price.recurring?.usage_type === 'metered') {
+        if (price.recurring?.usage_type === 'metered' && !metered) {
           quantity = 0;
         }
         if (trailing) {
@@ -364,12 +413,12 @@ export async function ensureInvoiceForCheckout({
       }
 
       return InvoiceItem.create({
-        livemode: checkoutSession.livemode,
+        livemode: !!props.livemode,
         amount: quantity > 0 ? setup.amount : '0',
         quantity,
         description: setup.description,
         period: setup.period,
-        currency_id: checkoutSession.currency_id,
+        currency_id: props.currency_id,
         customer_id: customer.id,
         price_id: x.price_id,
         invoice_id: invoice.id,
@@ -461,7 +510,7 @@ export async function getTokenRequirements(
   let amount = getFastCheckoutAmount(
     checkoutSession.line_items as TLineItemExpanded[],
     checkoutSession.mode,
-    paymentCurrency,
+    paymentCurrency.id,
     !!checkoutSession.subscription_data?.trial_period_days
   );
 

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

@@ -4,13 +4,13 @@ import type { Transaction } from '@ocap/client';
 import { BN } from '@ocap/util';
 import { fromPublicKey } from '@ocap/wallet';
 
-import { invoiceQueue } from '../../jobs/invoice';
-import { subscriptionQueue } from '../../jobs/subscription';
 import type { CallbackArgs } from '../../libs/auth';
 import { wallet } from '../../libs/auth';
 import { getGasPayerExtra, getTokenLimitsForDelegation } from '../../libs/payment';
 import { getFastCheckoutAmount } from '../../libs/session';
 import { OCAP_PAYMENT_TX_TYPE, getTxMetadata } from '../../libs/util';
+import { invoiceQueue } from '../../queues/invoice';
+import { subscriptionQueue } from '../../queues/subscription';
 import type { TLineItemExpanded } from '../../store/models';
 import { ensureInvoiceForCheckout, ensurePaymentIntent, getAuthPrincipalClaim, getTokenRequirements } from './shared';
 
@@ -38,9 +38,15 @@ export default {
       const amount = getFastCheckoutAmount(
         checkoutSession.line_items as TLineItemExpanded[],
         checkoutSession.mode,
-        paymentCurrency
+        paymentCurrency.id
+      );
+      const tokenLimits = await getTokenLimitsForDelegation(
+        checkoutSession,
+        paymentMethod,
+        paymentCurrency,
+        address,
+        amount
       );
-      const tokenLimits = await getTokenLimitsForDelegation(paymentMethod, paymentCurrency, address, amount);
       const tokenRequirements = await getTokenRequirements(checkoutSession, paymentMethod, paymentCurrency);
 
       return {

package/api/src/routes/pricing-table.ts

@@ -9,6 +9,7 @@ import { checkPassportForPricingTable } from '../integrations/blocklet/passport'
 import logger from '../libs/logger';
 import { authenticate } from '../libs/security';
 import { isLineItemCurrencyAligned } from '../libs/session';
+import { getDaysUntilDue } from '../libs/subscription';
 import { formatMetadata, getMetadataFromQuery } from '../libs/util';
 import { CheckoutSession } from '../store/models/checkout-session';
 import { PaymentCurrency } from '../store/models/payment-currency';
@@ -340,6 +341,7 @@ router.post('/:id/checkout/:priceId', async (req, res) => {
     metadata: {
       ...doc.metadata,
       ...getMetadataFromQuery(req.query),
+      days_until_due: getDaysUntilDue(req.query),
       passport: await checkPassportForPricingTable(doc),
       pricing_table_id: doc.id,
     },

package/api/src/routes/subscription-items.ts

@@ -130,7 +130,7 @@ router.delete('/:id', auth, async (req, res) => {
   const doc = await SubscriptionItem.findByPk(req.params.id);
 
   if (!doc) {
-    return res.status(404).json({ error: 'webhook endpoint not found' });
+    return res.status(404).json({ error: 'subscription item not found' });
   }
 
   if (req.body.clear_usage) {