Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Passed currency to stripe checkout setup session #19991

Merged
merged 4 commits into from May 9, 2024
Merged

Passed currency to stripe checkout setup session #19991

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8ce553
Passed currency to stripe checkout setup session
allouis Apr 4, 2024
c458886
fixup! Passed currency to stripe checkout setup session
allouis Apr 24, 2024
ed50db3
fixup! Passed currency to stripe checkout setup session
allouis May 9, 2024
c5f18b1
fixup! Passed currency to stripe checkout setup session
allouis May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 9 additions & 4 deletions ghost/members-api/lib/controllers/RouterController.js
View file
Open in desktop
Expand Up @@ -111,11 +111,18 @@ module.exports = class RouterController {
return res.end('Bad Request.');
}

const subscriptions = await member.related('stripeSubscriptions').fetch();

const activeSubscription = subscriptions.models.find((sub) => {
return ['active', 'trialing', 'unpaid', 'past_due'].includes(sub.get('status'));
});

let currency = activeSubscription?.get('plan_currency') || undefined;

let customer;
if (!req.body.subscription_id) {
customer = await this._stripeAPIService.getCustomerForMemberCheckoutSession(member);
} else {
const subscriptions = await member.related('stripeSubscriptions').fetch();
const subscription = subscriptions.models.find((sub) => {
return sub.get('subscription_id') === req.body.subscription_id;
});
Expand All @@ -126,12 +133,10 @@ module.exports = class RouterController {
});
return res.end(`Could not find subscription ${req.body.subscription_id}`);
}
currency = subscription.get('plan_currency') || undefined;
customer = await this._stripeAPIService.getCustomer(subscription.get('customer_id'));
}

const defaultTier = await this._tiersService.api.readDefaultTier();
const currency = defaultTier?.currency?.toLowerCase() || 'usd';

const session = await this._stripeAPIService.createCheckoutSetupSession(customer, {
successUrl: req.body.successUrl,
cancelUrl: req.body.cancelUrl,
Expand Down