blsmedia/bot
2
0
Fork 0
Code Issues Activity

🚸 (billing) Improve feedback when subscription is "past_due"

Browse Source
This commit is contained in:
Baptiste Arnaud
2023-09-12 13:17:14 +02:00
parent 6375a2425f
commit 0ccc2efa45
11 changed files with 86 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/builder/src/features/billing/api/getSubscription.ts
View File

@@ -61,20 +61,24 @@ export const getSubscription = authenticatedProcedure
})
const subscriptions = await stripe.subscriptions.list({
customer: workspace.stripeId,
limit: 1,
status: 'active',
})
const subscription = subscriptions?.data.shift()
const currentSubscription = subscriptions.data
.filter((sub) => ['past_due', 'active'].includes(sub.status))
.sort((a, b) => a.created - b.created)
.shift()
if (!subscription)
if (!currentSubscription)
return {
subscription: null,
}
return {
subscription: {
isYearly: subscription.items.data.some((item) => {
status: subscriptionSchema.shape.status.parse(
currentSubscription.status
),
isYearly: currentSubscription.items.data.some((item) => {
return (
priceIds.STARTER.chats.yearly === item.price.id ||
priceIds.STARTER.storage.yearly === item.price.id ||
@@ -82,9 +86,9 @@ export const getSubscription = authenticatedProcedure
priceIds.PRO.storage.yearly === item.price.id
)
}),
currency: subscription.currency as 'usd' | 'eur',
cancelDate: subscription.cancel_at
? new Date(subscription.cancel_at * 1000)
currency: currentSubscription.currency as 'usd' | 'eur',
cancelDate: currentSubscription.cancel_at
? new Date(currentSubscription.cancel_at * 1000)
: undefined,
},
}