The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(billing) - unblock resource credit upgrades rejected by Stripe (#24383)
Etienne6bb811e23d4b
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.tsindex 466a9021995..75a1758a7f4 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@@ -2,6 +2,8 @@import { Injectable, Logger } from '@nestjs/common';+import { isDefined } from 'twenty-shared/utils';+import type Stripe from 'stripe';import {@@ -61,13 +63,13 @@ export class StripeInvoiceService {const invoice = await this.stripe.invoices.create({customer: stripeCustomerId,subscription: stripeSubscriptionId,- pending_invoice_items_behavior: 'exclude',});let finalizedInvoice: Stripe.Invoice;+ let invoiceItemId: string | undefined;try {- await this.stripe.invoiceItems.create({+ const invoiceItem = await this.stripe.invoiceItems.create({customer: stripeCustomerId,subscription: stripeSubscriptionId,invoice: invoice.id,@@ -76,6 +78,8 @@ export class StripeInvoiceService {description,});+ invoiceItemId = invoiceItem.id;+finalizedInvoice = await this.stripe.invoices.finalizeInvoice(invoice.id,{@@ -83,7 +87,10 @@ export class StripeInvoiceService {},);} catch (error) {- await this.deleteDraftUpgradeInvoice(invoice.id);+ await this.deleteDraftUpgradeInvoice({+ invoiceId: invoice.id,+ invoiceItemId,+ });throw error;}@@ -145,7 +152,13 @@ export class StripeInvoiceService {);}- private async deleteDraftUpgradeInvoice(invoiceId: string): Promise<void> {+ private async deleteDraftUpgradeInvoice({+ invoiceId,+ invoiceItemId,+ }: {+ invoiceId: string;+ invoiceItemId?: string;+ }): Promise<void> {try {await this.stripe.invoices.del(invoiceId);} catch (deleteError) {@@ -153,6 +166,18 @@ export class StripeInvoiceService {`Failed to delete draft upgrade invoice ${invoiceId}: ${this.getErrorMessage(deleteError)}`,);}++ if (!isDefined(invoiceItemId)) {+ return;+ }++ try {+ await this.stripe.invoiceItems.del(invoiceItemId);+ } catch (deleteError) {+ this.logger.error(+ `Failed to delete upgrade invoice item ${invoiceItemId}: ${this.getErrorMessage(deleteError)}`,+ );+ }}private getErrorMessage(error: unknown): string {