github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Allow setting plans page currency with url param (#8263)

Browse source 
* Allow setting plans page currency with url param

GitOrigin-RevId: 5ae977d9872cf5f5b1a234d1273c70c2dd0e14e9
This commit is contained in:
Thomas 2022-06-03 12:13:21 +02:00 committed by Copybot
parent 11fddee8e4
commit f4ef8a3ea0
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
services/web/app/src/Features/Subscription/SubscriptionController.js
View file

@ -33,10 +33,19 @@ const validGroupPlanModalOptions = {
async function plansPage(req, res) {
const plans = SubscriptionViewModelBuilder.buildPlansList()
const { currencyCode: recommendedCurrency } =
await GeoIpLookup.promises.getCurrencyCode(
let recommendedCurrency
if (req.query.currency) {
const queryCurrency = req.query.currency.toUpperCase()
if (GeoIpLookup.isValidCurrencyParam(queryCurrency)) {
recommendedCurrency = queryCurrency
}
}
if (!recommendedCurrency) {
const currencyLookup = await GeoIpLookup.promises.getCurrencyCode(
(req.query ? req.query.ip : undefined) || req.ip
)
recommendedCurrency = currencyLookup.currencyCode
}
function getDefault(param, category, defaultValue) {
const v = req.query && req.query[param]

1
services/web/test/unit/src/Subscription/SubscriptionControllerTests.js
View file

@ -208,6 +208,7 @@ describe('SubscriptionController', function () {
opts.groupPlanModalDefaults.usage.should.equal('foo')
done()
}
this.GeoIpLookup.isValidCurrencyParam.returns(false)
this.req.query = {
number: '42',
currency: 'ABC',