Skip to content

The open alternative to Salesforce, designed for AI.

Batch seat prorations and credit upgrades for invoice-paying subscriptions (#27607)

Marieb8dc3c6a43d5
diff --git a/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription-update.service.ts b/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription-update.service.ts
index e44e4c01a23..cc6b8a0a6a1 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription-update.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription-update.service.ts
@@ -40,6 +40,7 @@ import { findSellableBaseProductPriceOrThrow } from 'src/engine/core-modules/bil
import { findProductPriceForIntervalOrThrow } from 'src/engine/core-modules/billing/utils/find-product-price-for-interval-or-throw.util';
import { isResourceCreditPriceForSubscription } from 'src/engine/core-modules/billing/utils/is-resource-credit-price-for-subscription.util';
import { isSellableCatalogPrice } from 'src/engine/core-modules/billing/utils/is-sellable-catalog-price.util';
+import { isSendInvoiceSubscription } from 'src/engine/core-modules/billing/utils/is-send-invoice-subscription.util';
import { getBaseProductSubscriptionItemOrThrow } from 'src/engine/core-modules/billing/utils/get-base-product-subscription-item-or-throw.util';
import { getCurrentResourceCreditSubscriptionItemOrThrow } from 'src/engine/core-modules/billing/utils/get-resource-credit-subscription-item-or-throw.util';
import { normalizePriceRef } from 'src/engine/core-modules/billing/utils/normalize-price-ref.utils';
@@ -408,15 +409,29 @@ export class BillingSubscriptionUpdateService {
const diffInCents =
Number(newPrice.unitAmount) - Number(currentPrice.unitAmount);
- if (diffInCents > 0) {
- await this.stripeInvoiceService.createImmediateUpgradeInvoice({
- stripeCustomerId: subscription.stripeCustomerId,
- stripeSubscriptionId: subscription.stripeSubscriptionId,
- diffAmountInCents: diffInCents,
- description: `Resource usage - Upgrade resource credit price from $${Number(currentPrice.unitAmount) / 100} to $${Number(newPrice.unitAmount) / 100}`,
- currency: newPrice.currency,
- });
+ if (diffInCents <= 0) {
+ return;
}
+
+ const upgradeInvoiceItem = {
+ stripeCustomerId: subscription.stripeCustomerId,
+ stripeSubscriptionId: subscription.stripeSubscriptionId,
+ diffAmountInCents: diffInCents,
+ description: `Resource usage - Upgrade resource credit price from $${Number(currentPrice.unitAmount) / 100} to $${Number(newPrice.unitAmount) / 100}`,
+ currency: newPrice.currency,
+ };
+
+ if (isSendInvoiceSubscription(subscription)) {
+ await this.stripeInvoiceService.createPendingUpgradeInvoiceItem(
+ upgradeInvoiceItem,
+ );
+
+ return;
+ }
+
+ await this.stripeInvoiceService.createImmediateUpgradeInvoice(
+ upgradeInvoiceItem,
+ );
}
private async getProductKeyByPriceId(
@@ -510,6 +525,7 @@ export class BillingSubscriptionUpdateService {
{
currentSeats: currentPrices.seats,
isTrialing: subscription.status === SubscriptionStatus.Trialing,
+ isSendInvoice: isSendInvoiceSubscription(subscription),
},
);
diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-invoice.service.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-invoice.service.ts
index 75a1758a7f4..761b4ad0b2b 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-invoice.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-invoice.service.ts
@@ -47,6 +47,28 @@ export class StripeInvoiceService {
});
}
+ async createPendingUpgradeInvoiceItem({
+ stripeCustomerId,
+ stripeSubscriptionId,
+ diffAmountInCents,
+ currency,
+ description,
+ }: {
+ stripeCustomerId: string;
+ stripeSubscriptionId: string;
+ diffAmountInCents: number;
+ currency: string;
+ description: string;
+ }): Promise<void> {
+ await this.stripe.invoiceItems.create({
+ customer: stripeCustomerId,
+ subscription: stripeSubscriptionId,
+ amount: diffAmountInCents,
+ currency,
+ description,
+ });
+ }
+
async createImmediateUpgradeInvoice({
stripeCustomerId,
stripeSubscriptionId,
diff --git a/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/compute-subscription-update-options.util.spec.ts b/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/compute-subscription-update-options.util.spec.ts
index 7c4b21d112f..3eaf9748ac0 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/compute-subscription-update-options.util.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/compute-subscription-update-options.util.spec.ts
@@ -116,4 +116,18 @@ describe('computeSubscriptionUpdateOptions', () => {
proration: 'create_prorations',
});
});
+
+ it('returns create_prorations when increasing seats on an invoice-paying subscription', () => {
+ const result = computeSubscriptionUpdateOptions(
+ {
+ type: SubscriptionUpdateType.SEATS,
+ newSeats: 10,
+ },
+ { currentSeats: 5, isSendInvoice: true },
+ );
+
+ expect(result).toEqual({
+ proration: 'create_prorations',
+ });
+ });
});
diff --git a/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/is-send-invoice-subscription.util.spec.ts b/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/is-send-invoice-subscription.util.spec.ts
new file mode 100644
index 00000000000..cf9fa6db3f3
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/is-send-invoice-subscription.util.spec.ts
@@ -0,0 +1,21 @@
+import { BillingSubscriptionCollectionMethod } from 'src/engine/core-modules/billing/enums/billing-subscription-collection-method.enum';
+import { isSendInvoiceSubscription } from 'src/engine/core-modules/billing/utils/is-send-invoice-subscription.util';
+
+describe('isSendInvoiceSubscription', () => {
+ it('is true for subscriptions paid by emailed invoice', () => {
+ expect(
+ isSendInvoiceSubscription({
+ collectionMethod: BillingSubscriptionCollectionMethod.SEND_INVOICE,
+ }),
+ ).toBe(true);
+ });
+
+ it('is false for subscriptions charged automatically', () => {
+ expect(
+ isSendInvoiceSubscription({
+ collectionMethod:
+ BillingSubscriptionCollectionMethod.CHARGE_AUTOMATICALLY,
+ }),
+ ).toBe(false);
+ });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/billing/utils/compute-subscription-update-options.util.ts b/packages/twenty-server/src/engine/core-modules/billing/utils/compute-subscription-update-options.util.ts
index 67d167155d0..f23788f94f5 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/utils/compute-subscription-update-options.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/utils/compute-subscription-update-options.util.ts
@@ -9,7 +9,11 @@ import {
export const computeSubscriptionUpdateOptions = (
subscriptionUpdate: SubscriptionUpdate,
- context?: { currentSeats?: number; isTrialing?: boolean },
+ context?: {
+ currentSeats?: number;
+ isTrialing?: boolean;
+ isSendInvoice?: boolean;
+ },
): {
proration: Stripe.SubscriptionUpdateParams.ProrationBehavior;
metadata?: Record<string, string>;
@@ -39,11 +43,13 @@ export const computeSubscriptionUpdateOptions = (
case SubscriptionUpdateType.SEATS: {
const currentSeats = context?.currentSeats ?? subscriptionUpdate.newSeats;
+ const shouldInvoiceImmediately =
+ subscriptionUpdate.newSeats > currentSeats && !context?.isSendInvoice;
+
return {
- proration:
- subscriptionUpdate.newSeats > currentSeats
- ? 'always_invoice'
- : 'create_prorations',
+ proration: shouldInvoiceImmediately
+ ? 'always_invoice'
+ : 'create_prorations',
};
}
default:
diff --git a/packages/twenty-server/src/engine/core-modules/billing/utils/is-send-invoice-subscription.util.ts b/packages/twenty-server/src/engine/core-modules/billing/utils/is-send-invoice-subscription.util.ts
new file mode 100644
index 00000000000..42e354f5204
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/utils/is-send-invoice-subscription.util.ts
@@ -0,0 +1,10 @@
+/* @license Enterprise */
+
+import { type BillingSubscriptionEntity } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
+import { BillingSubscriptionCollectionMethod } from 'src/engine/core-modules/billing/enums/billing-subscription-collection-method.enum';
+
+export const isSendInvoiceSubscription = (
+ subscription: Pick<BillingSubscriptionEntity, 'collectionMethod'>,
+): boolean =>
+ subscription.collectionMethod ===
+ BillingSubscriptionCollectionMethod.SEND_INVOICE;