agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-15 06:33:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

v1Subscription -> v1Subscriptions

Browse Source
This commit is contained in:
James Allen
2018-06-12 13:52:47 +01:00
parent 6e2ec2f982
commit a417dc8ff4
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/coffee/Features/Subscription/SubscriptionController.coffee
+3 -3
View File
@@ -101,9 +101,9 @@ module.exports = SubscriptionController =
logger.log user: user, "redirecting to plans" logger.log user: user, "redirecting to plans"
res.redirect "/user/subscription/plans" res.redirect "/user/subscription/plans"
else else
SubscriptionViewModelBuilder.buildUsersSubscriptionViewModel user, (error, subscription, groupSubscriptions, billingDetailsLink, v1Subscription) -> SubscriptionViewModelBuilder.buildUsersSubscriptionViewModel user, (error, subscription, groupSubscriptions, billingDetailsLink, v1Subscriptions) ->
return next(error) if error? 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() plans = SubscriptionViewModelBuilder.buildViewModel()
res.render "subscriptions/dashboard", res.render "subscriptions/dashboard",
title: "your_subscription" title: "your_subscription"
@@ -116,7 +116,7 @@ module.exports = SubscriptionController =
user:user user:user
saved_billing_details: req.query.saved_billing_details? saved_billing_details: req.query.saved_billing_details?
billingDetailsLink: billingDetailsLink billingDetailsLink: billingDetailsLink
v1Subscription: v1Subscription v1Subscriptions: v1Subscriptions
userCustomSubscriptionPage: (req, res, next)-> userCustomSubscriptionPage: (req, res, next)->
user = AuthenticationController.getSessionUser(req) user = AuthenticationController.getSessionUser(req)
services/web/app/views/subscriptions/dashboard.pug
+3 -3
View File
@@ -118,15 +118,15 @@ block content
a(href="/subscription/group").btn.btn-primary !{translate("manage_group")} a(href="/subscription/group").btn.btn-primary !{translate("manage_group")}
hr hr
if v1Subscription.has_subscription if v1Subscriptions.has_subscription
p p
| You are subscribed to Overleaf through Overleaf v1 | You are subscribed to Overleaf through Overleaf v1
p p
a.btn.btn-primary(href=settings.overleaf.host+"/users/edit#status") Manage v1 Subscription a.btn.btn-primary(href=settings.overleaf.host+"/users/edit#status") Manage v1 Subscription
hr hr
if v1Subscription.teams && v1Subscription.teams.length > 0 if v1Subscriptions.teams && v1Subscriptions.teams.length > 0
for team in v1Subscription.teams for team in v1Subscriptions.teams
p p
| You are a member of the Overleaf v1 team: <strong>#{team.name}</strong> | You are a member of the Overleaf v1 team: <strong>#{team.name}</strong>
p p