houseassassin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(billing) - Suspend workspace at trial period end if cancelation is planned (#21363)

Browse Source 
https://twenty-v7.sentry.io/issues/6900026484/events/e5a9e11fe0464df296d8beeabcf0f538/?end=2026-06-09T05%3A24%3A00&project=4507072499810304&query=%21twenty.workspace.id%3A%EF%80%8DContains%EF%80%8Dad6668da-9f4c-4618-9424-9092ea87db26%20%21twenty.workspace.id%3A%EF%80%8DContains%EF%80%8D86b352c5-ffff-4a4c-8660-b1b2bfb7f57d&referrer=next-event&start=2026-05-23T06%3A02%3A00
This commit is contained in:
Etienne
2026-06-09 16:12:48 +02:00
committed by GitHub
parent 02aa086866
commit 7530775dc1
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-subscription.service.ts
+10 -2
View File
@@ -197,7 +197,6 @@ export class BillingWebhookSubscriptionService {
const suspendedStatuses = [
SubscriptionStatus.Canceled,
SubscriptionStatus.Unpaid,
SubscriptionStatus.Paused, // TODO: remove this once paused subscriptions are deprecated
];
if (suspendedStatuses.includes(status)) {
@@ -208,7 +207,16 @@ export class BillingWebhookSubscriptionService {
const hasTrialJustEnded =
timeSinceTrialEnd > 0 && timeSinceTrialEnd < 60 * 60 * 24;
return hasTrialJustEnded && status === SubscriptionStatus.PastDue;
const canceledDuringTrial =
data.object.cancel_at_period_end &&
isDefined(data.object.canceled_at) &&
isDefined(data.object.trial_end) &&
data.object.canceled_at <= data.object.trial_end;
return (
hasTrialJustEnded &&
(status === SubscriptionStatus.PastDue || canceledDuringTrial)
);
}
async updateBillingSubscriptionItems(