github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

v1Subscription -> v1Subscriptions

Browse source
This commit is contained in:
James Allen 2018-06-07 17:18:21 +01:00
parent 6e2ec2f982
commit a417dc8ff4
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/web/app/coffee/Features/Subscription/SubscriptionController.coffee
View file

@ -101,9 +101,9 @@ module.exports = SubscriptionController =
logger.log user: user, "redirecting to plans"
res.redirect "/user/subscription/plans"
else
SubscriptionViewModelBuilder.buildUsersSubscriptionViewModel user, (error, subscription, groupSubscriptions, billingDetailsLink, v1Subscription) ->
SubscriptionViewModelBuilder.buildUsersSubscriptionViewModel user, (error, subscription, groupSubscriptions, billingDetailsLink, v1Subscriptions) ->
return next(error) if error?
logger.log {user, subscription, hasSubOrIsGroupMember, groupSubscriptions, billingDetailsLink, v1Subscription}, "showing subscription dashboard"
logger.log {user, subscription, hasSubOrIsGroupMember, groupSubscriptions, billingDetailsLink, v1Subscriptions}, "showing subscription dashboard"
plans = SubscriptionViewModelBuilder.buildViewModel()
res.render "subscriptions/dashboard",
title: "your_subscription"
@ -116,7 +116,7 @@ module.exports = SubscriptionController =
user:user
saved_billing_details: req.query.saved_billing_details?
billingDetailsLink: billingDetailsLink
v1Subscription: v1Subscription
v1Subscriptions: v1Subscriptions
userCustomSubscriptionPage: (req, res, next)->
user = AuthenticationController.getSessionUser(req)

6
services/web/app/views/subscriptions/dashboard.pug
View file

@ -118,15 +118,15 @@ block content
a(href="/subscription/group").btn.btn-primary !{translate("manage_group")}
hr
if v1Subscription.has_subscription
if v1Subscriptions.has_subscription
p
| You are subscribed to Overleaf through Overleaf v1
p
a.btn.btn-primary(href=settings.overleaf.host+"/users/edit#status") Manage v1 Subscription
hr
if v1Subscription.teams && v1Subscription.teams.length > 0
for team in v1Subscription.teams
if v1Subscriptions.teams && v1Subscriptions.teams.length > 0
for team in v1Subscriptions.teams
p
| You are a member of the Overleaf v1 team: <strong>#{team.name}</strong>
p