-
Notifications
You must be signed in to change notification settings - Fork 1.6k
feat: disable proration #2691
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
Kitenite
wants to merge
3
commits into
main
Choose a base branch
from
feat/disable-proration
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
feat: disable proration #2691
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -109,6 +109,68 @@ export const updateSubscription = async ({ | |||||
}); | ||||||
}; | ||||||
|
||||||
export const upgradeSubscription = async ({ | ||||||
subscriptionId, | ||||||
subscriptionItemId, | ||||||
priceId, | ||||||
}: { | ||||||
subscriptionId: string; | ||||||
subscriptionItemId: string; | ||||||
priceId: string; | ||||||
}) => { | ||||||
const stripe = createStripeClient(); | ||||||
const currentSubscription = await stripe.subscriptions.retrieve(subscriptionId); | ||||||
if (!currentSubscription) { | ||||||
throw new Error('Subscription not found'); | ||||||
} | ||||||
|
||||||
const currentPrice = currentSubscription.items.data[0]?.price.id; | ||||||
if (currentPrice === priceId) { | ||||||
throw new Error('New price is the same as the current price'); | ||||||
} | ||||||
|
||||||
const currentPriceAmount = currentSubscription.items.data[0]?.price.unit_amount; | ||||||
if (!currentPriceAmount) { | ||||||
throw new Error('Current price amount not found'); | ||||||
} | ||||||
|
||||||
const updatedSubscription = await stripe.subscriptions.update(subscriptionId, { | ||||||
items: [ | ||||||
{ | ||||||
id: subscriptionItemId, | ||||||
price: priceId, | ||||||
}, | ||||||
], | ||||||
// We don't want to prorate the price difference because it would be based on time remaining in the current period | ||||||
proration_behavior: 'none', | ||||||
}); | ||||||
|
||||||
const newPriceAmount = updatedSubscription.items.data[0]?.price.unit_amount; | ||||||
if (!newPriceAmount) { | ||||||
throw new Error('New price amount not found'); | ||||||
} | ||||||
|
||||||
Kitenite marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||
const priceDifferenceAmount = newPriceAmount - currentPriceAmount; | ||||||
|
||||||
// Create a one-off invoice item for the price difference if the new price is higher | ||||||
if (priceDifferenceAmount > 0) { | ||||||
Kitenite marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||
await stripe.invoiceItems.create({ | ||||||
customer: updatedSubscription.customer as string, | ||||||
amount: priceDifferenceAmount, | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The currency field was removed from the invoiceItems.create call. Stripe typically requires a currency for invoice items; consider reinstating it.
Suggested change
|
||||||
currency: updatedSubscription.currency || 'usd', | ||||||
Kitenite marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||
description: 'Price upgrade difference', | ||||||
}); | ||||||
|
||||||
// Create invoice immediately | ||||||
const invoice = await stripe.invoices.create({ | ||||||
customer: updatedSubscription.customer as string, | ||||||
auto_advance: true, | ||||||
}); | ||||||
Kitenite marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
} | ||||||
|
||||||
return updatedSubscription; | ||||||
}; | ||||||
|
||||||
export const updateSubscriptionNextPeriod = async ({ | ||||||
subscriptionId, | ||||||
priceId, | ||||||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.