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

Merge branch 'master' of github.com:sharelatex/web-sharelatex

Browse source
This commit is contained in:
James Allen 2015-12-11 11:30:20 +00:00
commit c40b882ee2
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/views/sentry.jade
View file

@ -57,7 +57,7 @@
], ],
shouldSendCallback: function(data) { shouldSendCallback: function(data) {
// only send a fraction of errors // only send a fraction of errors
var sampleRate = 0.05; var sampleRate = 0.01;
return (Math.random() <= sampleRate); return (Math.random() <= sampleRate);
}, },
dataCallback: function(data) { dataCallback: function(data) {

15
services/web/app/views/subscriptions/dashboard.jade
View file

@ -111,7 +111,7 @@ block content
span(ng-if="sixpackOpt == 'downgrade-options'") span(ng-if="sixpackOpt == 'downgrade-options'")
div(ng-show="isMonthlyCollab && stillInFreeTrial", style="text-align: center") div(ng-show="showExtendFreeTrial", style="text-align: center")
p !{translate("have_more_days_to_try", {days:14})} p !{translate("have_more_days_to_try", {days:14})}
button(type="submit", ng-click="exendTrial()", ng-disabled='inflight').btn.btn-success #{translate("ill_take_it")} button(type="submit", ng-click="exendTrial()", ng-disabled='inflight').btn.btn-success #{translate("ill_take_it")}
p p
@ -120,7 +120,7 @@ block content
a(href, ng-click="cancelSubscription()", ng-disabled='inflight') #{translate("no_thanks_cancel_now")} a(href, ng-click="cancelSubscription()", ng-disabled='inflight') #{translate("no_thanks_cancel_now")}
div(ng-show="isMonthlyCollab && !stillInFreeTrial", style="text-align: center") div(ng-show="showDowngradeToStudent", style="text-align: center")
span(ng-controller="ChangePlanFormController") span(ng-controller="ChangePlanFormController")
p p
!{translate("interested_in_cheaper_plan",{price:'{{studentPrice}}'})} !{translate("interested_in_cheaper_plan",{price:'{{studentPrice}}'})}
@ -130,18 +130,17 @@ block content
p p
a(href, ng-click="cancelSubscription()", ng-disabled='inflight') #{translate("no_thanks_cancel_now")} a(href, ng-click="cancelSubscription()", ng-disabled='inflight') #{translate("no_thanks_cancel_now")}
div(ng-show="!isMonthlyCollab && !stillInFreeTrial") div(ng-show="showBasicCancel")
p #{translate("sure_you_want_to_cancel")} p #{translate("sure_you_want_to_cancel")}
a(href="/project").btn.btn-info #{translate("i_want_to_stay")} a(href="/project").btn.btn-info #{translate("i_want_to_stay")}
| &nbsp; | &nbsp;
a(ng-click="cancelSubscription()", ng-disabled='inflight').btn.btn-primary #{translate("cancel_my_account")} a(ng-click="cancelSubscription()", ng-disabled='inflight').btn.btn-primary #{translate("cancel_my_account")}
span(ng-if="sixpackOpt == 'basic'") span(ng-if="sixpackOpt == 'basic'")
div(ng-show="!isMonthlyCollab && !stillInFreeTrial") p #{translate("sure_you_want_to_cancel")}
p #{translate("sure_you_want_to_cancel")} a(href="/project").btn.btn-info #{translate("i_want_to_stay")}
a(href="/project").btn.btn-info #{translate("i_want_to_stay")} | &nbsp;
| &nbsp; a(ng-click="cancelSubscription()", ng-disabled='inflight').btn.btn-primary #{translate("cancel_my_account")}
a(ng-click="cancelSubscription()", ng-disabled='inflight').btn.btn-primary #{translate("cancel_my_account")}
script(type="text/javascript"). script(type="text/javascript").
$('#cancelSubscription').on("click", function() { $('#cancelSubscription').on("click", function() {

11
services/web/public/coffee/main/subscription-dashboard.coffee
View file

@ -85,8 +85,15 @@ define [
freeTrialExpiresUnderSevenDays = freeTrialEndDate < sevenDaysTime freeTrialExpiresUnderSevenDays = freeTrialEndDate < sevenDaysTime
$scope.view = 'overview' $scope.view = 'overview'
$scope.isMonthlyCollab = subscription?.planCode?.indexOf("collaborator") != -1 and subscription?.planCode?.indexOf("ann") == -1 isMonthlyCollab = subscription?.planCode?.indexOf("collaborator") != -1 and subscription?.planCode?.indexOf("ann") == -1
$scope.stillInFreeTrial = freeTrialInFuture and freeTrialExpiresUnderSevenDays stillInFreeTrial = freeTrialInFuture and freeTrialExpiresUnderSevenDays
if isMonthlyCollab and stillInFreeTrial
$scope.showExtendFreeTrial = true
else if isMonthlyCollab and !stillInFreeTrial
$scope.showDowngradeToStudent = true
else
$scope.showBasicCancel = true
setupReturly() setupReturly()