zias/stats
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(dashboard): cancel subscription before new checkout if free

Browse Source
This commit is contained in:
Carl-Gerhard Lindesvärd
2025-03-24 18:49:17 +01:00
parent a26e64e80d
commit b77ee71445
2 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/trpc/src/routers/subscription.ts
View File

@@ -53,16 +53,25 @@ export const subscriptionRouter = createTRPCRouter({
organization.subscriptionId &&
organization.subscriptionStatus === 'active'
) {
if (organization.subscriptionCanceledAt) {
await reactivateSubscription(organization.subscriptionId);
const existingProduct = organization.subscriptionProductId
? await getProduct(organization.subscriptionProductId)
: null;
// If the existing product is free, cancel the subscription and then jump to the checkout
if (existingProduct?.prices.some((p) => p.amountType === 'free')) {
await cancelSubscription(organization.subscriptionId);
} else {
if (organization.subscriptionCanceledAt) {
await reactivateSubscription(organization.subscriptionId);
return null;
}
await changeSubscription(
organization.subscriptionId,
input.productId,
);
return null;
}
return null;
}
const checkout = await createCheckout({