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

if user is already annual tell them so on the annual upgrade page

Browse source
This commit is contained in:
Henry Oswald 2014-08-29 14:13:05 +01:00
parent cffcdbae18
commit e740e4913d
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -164,7 +164,9 @@ module.exports = SubscriptionController =
SecurityManager.getCurrentUser req, (error, user) ->
LimitationsManager.userHasSubscription user, (err, hasSubscription, subscription)->
planCode = subscription?.planCode.toLowerCase()
if planCode?.indexOf("student") != -1
if planCode?.indexOf("annual") != -1
planName = "annual"
else if planCode?.indexOf("student") != -1
planName = "student"
else if planCode?.indexOf("collaborator") != -1
planName = "collaborator"

3
services/web/public/coffee/main/annual-upgrade.coffee
View file

@ -11,7 +11,8 @@ define [
collaborator:"36"
$scope.$watch $scope.planName, ->
$scope.yearlySaving = savings[$scope.planName]
if $scope.planName == "annual"
$scope.upgradeComplete = true
$scope.completeAnnualUpgrade = ->
body =
planName: $scope.planName

9
services/web/test/UnitTests/coffee/Subscription/SubscriptionControllerTests.coffee
View file

@ -323,6 +323,15 @@ describe "SubscriptionController sanboxed", ->
done()
@SubscriptionController.renderUpgradeToAnnualPlanPage @req, @res
it "should pass annual as the plan name if the user is already on an annual plan", (done)->
@LimitationsManager.userHasSubscription.callsArgWith(1, null, true, {planCode:"student annual with free trial"})
@res.render = (view, opts)->
opts.planName.should.equal "annual"
done()
@SubscriptionController.renderUpgradeToAnnualPlanPage @req, @res
describe "processUpgradeToAnnualPlan", ->
beforeEach ->