diff --git a/services/web/app/coffee/Features/Subscription/SubscriptionController.coffee b/services/web/app/coffee/Features/Subscription/SubscriptionController.coffee index 530f41e2c0..7cebfdf535 100644 --- a/services/web/app/coffee/Features/Subscription/SubscriptionController.coffee +++ b/services/web/app/coffee/Features/Subscription/SubscriptionController.coffee @@ -57,6 +57,7 @@ module.exports = SubscriptionController = plan_code: req.query.planCode currency: currency plan:plan + showStudentPlan: req.query.ssp recurlyConfig: JSON.stringify currency: currency subdomain: Settings.apis.recurly.subdomain diff --git a/services/web/app/views/subscriptions/new.jade b/services/web/app/views/subscriptions/new.jade index d954f32f2b..470fefb9a8 100644 --- a/services/web/app/views/subscriptions/new.jade +++ b/services/web/app/views/subscriptions/new.jade @@ -34,6 +34,12 @@ block content .col-md-3.col-md-pull-6 + if showStudentPlan == 'true' + a.btn-primary.btn.plansPageStudentLink( + href, + ng-click="switchToStudent()" + ) #{translate("half_price_student")} + .card.card-first .paymentPageFeatures .page-header diff --git a/services/web/app/views/subscriptions/successful_subscription.jade b/services/web/app/views/subscriptions/successful_subscription.jade index a9c4699b10..8b66dec6c9 100644 --- a/services/web/app/views/subscriptions/successful_subscription.jade +++ b/services/web/app/views/subscriptions/successful_subscription.jade @@ -35,11 +35,6 @@ block content script(type="text/javascript"). window.ab = [ - {step:2, bucket:"eu-eu", testName:"multi_currency"}, - {step:2, bucket:"eu-usd", testName:"multi_currency"}, - - {step:1, bucket:"eu-eu", testName:"multi_currency_editor"}, - {step:1, bucket:"eu-usd", testName:"multi_currency_editor"} - - + {step:1, bucket:"student_control", testName:"editor_plan"}, + {step:1, bucket:"collab_test", testName:"editor_plan"}, ] \ No newline at end of file diff --git a/services/web/public/coffee/ide.coffee b/services/web/public/coffee/ide.coffee index 17142eb51d..9639af07c9 100644 --- a/services/web/public/coffee/ide.coffee +++ b/services/web/public/coffee/ide.coffee @@ -65,10 +65,17 @@ define [ $scope.chat = {} $scope.startFreeTrial = (source) -> - ga?('send', 'event', 'subscription-funnel', 'upgraded-free-trial', source) - window.open("/user/subscription/new?planCode=student_free_trial_7_days") - $scope.startedFreeTrial = true + testBuckets = [ + { bucketName:"student_control", planName:"student"} + { bucketName:"collab_test", planName:"collaborator"} + ] + editorPlanBucket = abTestManager.getABTestBucket "editor_plan", testBuckets + abTestManager.processTestWithStep("editor_plan", editorPlanBucket.bucketName, 0) + ga?('send', 'event', 'subscription-funnel', 'upgraded-free-trial', source) + window.open("/user/subscription/new?planCode=#{editorPlanBucket.planName}_free_trial_7_days&ssp=#{editorPlanBucket.planName == 'collaborator'}") + $scope.startedFreeTrial = true + window._ide = ide ide.project_id = $scope.project_id = window.project_id diff --git a/services/web/public/coffee/main/new-subscription.coffee b/services/web/public/coffee/main/new-subscription.coffee index 2d4756f624..f607cd3435 100644 --- a/services/web/public/coffee/main/new-subscription.coffee +++ b/services/web/public/coffee/main/new-subscription.coffee @@ -8,4 +8,7 @@ define [ $scope.plans = MultiCurrencyPricing.plans $scope.changeCurrency = (newCurrency)-> - window.location = "/user/subscription/new?planCode=#{window.plan_code}¤cy=#{newCurrency}" \ No newline at end of file + window.location = "/user/subscription/new?planCode=#{window.plan_code}¤cy=#{newCurrency}" + + $scope.switchToStudent = ()-> + window.location = "/user/subscription/new?planCode=student¤cy=#{$scope.currencyCode}" \ No newline at end of file diff --git a/services/web/public/stylesheets/app/plans.less b/services/web/public/stylesheets/app/plans.less index 9324393bda..777a4400c3 100644 --- a/services/web/public/stylesheets/app/plans.less +++ b/services/web/public/stylesheets/app/plans.less @@ -91,6 +91,11 @@ } } +.plansPageStudentLink { + margin-left: 20px; + margin-top: 20px; +} +