Remove plans redirect

This commit is contained in:
Jessica Lawshe 2018-08-30 13:17:05 -05:00
parent f0d17c1db7
commit a4956294c1

View file

@ -15,33 +15,30 @@ planFeatures = require './planFeatures'
module.exports = SubscriptionController = module.exports = SubscriptionController =
plansPage: (req, res, next) -> plansPage: (req, res, next) ->
if Settings.overleaf? && !req.query.plns plans = SubscriptionViewModelBuilder.buildViewModel()
res.redirect "#{Settings.overleaf.host}/plans" viewName = "subscriptions/plans"
else if req.query.v?
plans = SubscriptionViewModelBuilder.buildViewModel() viewName = "#{viewName}_#{req.query.v}"
viewName = "subscriptions/plans" logger.log viewName:viewName, "showing plans page"
if req.query.v? currentUser = null
viewName = "#{viewName}_#{req.query.v}"
logger.log viewName:viewName, "showing plans page"
currentUser = null
GeoIpLookup.getCurrencyCode req.query?.ip || req.ip, (err, recomendedCurrency)-> GeoIpLookup.getCurrencyCode req.query?.ip || req.ip, (err, recomendedCurrency)->
return next(err) if err? return next(err) if err?
render = () -> render = () ->
res.render viewName, res.render viewName,
title: "plans_and_pricing" title: "plans_and_pricing"
plans: plans plans: plans
gaExperiments: Settings.gaExperiments.plansPage gaExperiments: Settings.gaExperiments.plansPage
recomendedCurrency:recomendedCurrency recomendedCurrency:recomendedCurrency
planFeatures: planFeatures planFeatures: planFeatures
user_id = AuthenticationController.getLoggedInUserId(req) user_id = AuthenticationController.getLoggedInUserId(req)
if user_id? if user_id?
UserGetter.getUser user_id, {signUpDate: 1}, (err, user) -> UserGetter.getUser user_id, {signUpDate: 1}, (err, user) ->
return next(err) if err? return next(err) if err?
currentUser = user currentUser = user
render()
else
render() render()
else
render()
#get to show the recurly.js page #get to show the recurly.js page
paymentPage: (req, res, next) -> paymentPage: (req, res, next) ->