diff --git a/services/web/app/views/project/editor/history.pug b/services/web/app/views/project/editor/history.pug index 7b4436af5d..48bef7adfb 100644 --- a/services/web/app/views/project/editor/history.pug +++ b/services/web/app/views/project/editor/history.pug @@ -33,7 +33,6 @@ div#history(ng-show="ui.view == 'history'") href ng-class="buttonClass" ng-click="startFreeTrial('history')" - sixpack-convert="teaser-history" ) #{translate("start_free_trial")} .message(ng-show="project.owner._id != user.id") diff --git a/services/web/app/views/project/editor/pdf.pug b/services/web/app/views/project/editor/pdf.pug index a87b765cf2..a874a0b88b 100644 --- a/services/web/app/views/project/editor/pdf.pug +++ b/services/web/app/views/project/editor/pdf.pug @@ -402,7 +402,6 @@ div.full-size.pdf(ng-controller="PdfController") a.btn.btn-success.row-spaced-small( href ng-class="buttonClass" - sixpack-convert="track_changes_feature_info" ng-click="startFreeTrial('compile-timeout')" ) #{translate("start_free_trial")} diff --git a/services/web/app/views/project/editor/share.pug b/services/web/app/views/project/editor/share.pug index b63038cf86..d2aa1cc173 100644 --- a/services/web/app/views/project/editor/share.pug +++ b/services/web/app/views/project/editor/share.pug @@ -173,7 +173,6 @@ script(type='text/ng-template', id='shareProjectModalTemplate') a.btn.btn-success( href ng-class="buttonClass" - sixpack-convert="track_changes_feature_info" ng-click="startFreeTrial('projectMembers')" ) #{translate("start_free_trial")} diff --git a/services/web/app/views/project/list/side-bar.pug b/services/web/app/views/project/list/side-bar.pug index c4186a01d5..c695dfd30c 100644 --- a/services/web/app/views/project/list/side-bar.pug +++ b/services/web/app/views/project/list/side-bar.pug @@ -10,19 +10,16 @@ li a( href, - sixpack-convert="first_sign_up", ng-click="openCreateProjectModal()" ) #{translate("blank_project")} li a( href, - sixpack-convert="first_sign_up", ng-click="openCreateProjectModal('example')" ) #{translate("example_project")} li a( href, - sixpack-convert="first_sign_up", ng-click="openUploadProjectModal()" ) #{translate("upload_project")} != moduleIncludes("newProjectMenu", locals) @@ -31,7 +28,7 @@ li.dropdown-header #{translate("templates")} each item in templates li - a.menu-indent(href=item.url, sixpack-convert="first_sign_up") #{translate(item.name)} + a.menu-indent(href=item.url) #{translate(item.name)} .row-spaced(ng-if="projects.length > 0", ng-cloak) ul.list-unstyled.folders-menu( @@ -133,7 +130,7 @@ hr p.small #{translate("on_free_sl")} p - a(href="/user/subscription/plans", sixpack-convert="left-menu-upgraed-rotation").btn.btn-primary #{translate("upgrade")} + a(href="/user/subscription/plans").btn.btn-primary #{translate("upgrade")} p.small.text-centered | #{translate("or_unlock_features_bonus")} a(href="/user/bonus") #{translate("sharing_sl")} . diff --git a/services/web/app/views/subscriptions/plans.pug b/services/web/app/views/subscriptions/plans.pug index bafb855ff7..7c40c38a52 100644 --- a/services/web/app/views/subscriptions/plans.pug +++ b/services/web/app/views/subscriptions/plans.pug @@ -76,7 +76,7 @@ block content br a.btn.btn-info( href="/register" - style=(getLoggedInUserId() === undefined ? "" : "visibility: hidden") + style=(getLoggedInUserId() === null ? "" : "visibility: hidden") ) #{translate("sign_up_now")} .col-md-4 .card.card-highlighted @@ -90,10 +90,8 @@ block content | {{plans[currencyCode]['collaborator']['annual']}} span.small /yr ul.list-unstyled - li - strong(ng-show="plansVariant == 'default'") #{translate("collabs_per_proj", {collabcount:10})} - strong(ng-show="plansVariant == 'heron'") #{translate("collabs_per_proj", {collabcount:8})} - strong(ng-show="plansVariant == 'ibis'") #{translate("collabs_per_proj", {collabcount:12})} + li + strong #{translate("collabs_per_proj", {collabcount:10})} li #{translate("full_doc_history")} li #{translate("sync_to_dropbox")} li #{translate("sync_to_github")} @@ -144,7 +142,7 @@ block content br a.btn.btn-info( href="/register" - style=(getLoggedInUserId() === undefined ? "" : "visibility: hidden") + style=(getLoggedInUserId() === null ? "" : "visibility: hidden") ) #{translate("sign_up_now")} .col-md-4 @@ -157,9 +155,7 @@ block content span.small /mo ul.list-unstyled li - strong(ng-show="plansVariant == 'default'") #{translate("collabs_per_proj", {collabcount:6})} - strong(ng-show="plansVariant == 'heron'") #{translate("collabs_per_proj", {collabcount:4})} - strong(ng-show="plansVariant == 'ibis'") #{translate("collabs_per_proj", {collabcount:8})} + strong #{translate("collabs_per_proj", {collabcount:6})} li #{translate("full_doc_history")} li #{translate("sync_to_dropbox")} li #{translate("sync_to_github")} @@ -180,9 +176,7 @@ block content span.small /yr ul.list-unstyled li - strong(ng-show="plansVariant == 'default'") #{translate("collabs_per_proj", {collabcount:6})} - strong(ng-show="plansVariant == 'heron'") #{translate("collabs_per_proj", {collabcount:4})} - strong(ng-show="plansVariant == 'ibis'") #{translate("collabs_per_proj", {collabcount:8})} + strong #{translate("collabs_per_proj", {collabcount:6})} li #{translate("full_doc_history")} li #{translate("sync_to_dropbox")} li #{translate("sync_to_github")} diff --git a/services/web/public/coffee/ide/history/controllers/HistoryListController.coffee b/services/web/public/coffee/ide/history/controllers/HistoryListController.coffee index c736014c8b..f16cace816 100644 --- a/services/web/public/coffee/ide/history/controllers/HistoryListController.coffee +++ b/services/web/public/coffee/ide/history/controllers/HistoryListController.coffee @@ -3,15 +3,6 @@ define [ "ide/history/util/displayNameForUser" ], (App, displayNameForUser) -> - App.controller "HistoryPremiumPopup", ($scope, ide, sixpack)-> - $scope.$watch "ui.view", -> - if $scope.ui.view == "history" - if $scope.project?.features?.versioning - $scope.versioningPopupType = "default" - else if $scope.ui.view == "history" - sixpack.participate 'history-discount', ['default', 'discount'], (chosenVariation, rawResponse)-> - $scope.versioningPopupType = chosenVariation - App.controller "HistoryListController", ["$scope", "ide", ($scope, ide) -> $scope.hoveringOverListSelectors = false diff --git a/services/web/public/coffee/main/account-upgrade.coffee b/services/web/public/coffee/main/account-upgrade.coffee index 0cabc224a0..638371e45e 100644 --- a/services/web/public/coffee/main/account-upgrade.coffee +++ b/services/web/public/coffee/main/account-upgrade.coffee @@ -19,24 +19,8 @@ define [ url = "#{url}&cc=#{couponCode}" $scope.startedFreeTrial = true - switch source - when "dropbox" - sixpack.participate 'teaser-dropbox-text', ['default', 'dropbox-focused'], (variant) -> - event_tracking.sendMB "subscription-start-trial", { source, plan, variant } - - when "history" - sixpack.participate 'teaser-history', ['default', 'focused'], (variant) -> - event_tracking.sendMB "subscription-start-trial", { source, plan, variant } - - else - event_tracking.sendMB "subscription-start-trial", { source, plan } + event_tracking.sendMB "subscription-start-trial", { source, plan } w.location = url - if $scope.shouldABTestPlans - sixpack.participate 'plans-1610', ['default', 'heron', 'ibis'], (chosenVariation, rawResponse)-> - if chosenVariation in ['heron', 'ibis'] - plan = "collaborator_#{chosenVariation}" - go() - else - go() + go() diff --git a/services/web/public/coffee/main/plans.coffee b/services/web/public/coffee/main/plans.coffee index 060517a9d5..b74a4d1da9 100644 --- a/services/web/public/coffee/main/plans.coffee +++ b/services/web/public/coffee/main/plans.coffee @@ -11,164 +11,6 @@ define [ return { currencyCode:currencyCode - heron: - USD: - student: - monthly: "$6" - annual: "$60" - collaborator: - monthly: "$12" - annual: "$144" - EUR: - student: - monthly: "€5" - annual: "€50" - collaborator: - monthly: "€11" - annual: "€132" - GBP: - student: - monthly: "£5" - annual: "£50" - collaborator: - monthly: "£10" - annual: "£120" - SEK: - student: - monthly: "45 kr" - annual: "450 kr" - collaborator: - monthly: "90 kr" - annual: "1080 kr" - CAD: - student: - monthly: "$7" - annual: "$70" - collaborator: - monthly: "$14" - annual: "$168" - NOK: - student: - monthly: "45 kr" - annual: "450 kr" - collaborator: - monthly: "90 kr" - annual: "1080 kr" - DKK: - student: - monthly: "40 kr" - annual: "400 kr" - collaborator: - monthly: "70 kr" - annual: "840 kr" - AUD: - student: - monthly: "$8" - annual: "$80" - collaborator: - monthly: "$15" - annual: "$180" - NZD: - student: - monthly: "$8" - annual: "$80" - collaborator: - monthly: "$15" - annual: "$180" - CHF: - student: - monthly: "Fr 6" - annual: "Fr 60" - collaborator: - monthly: "Fr 12" - annual: "Fr 144" - SGD: - student: - monthly: "$8" - annual: "$80" - collaborator: - monthly: "$16" - annual: "$192" - - ibis: - USD: - student: - monthly: "$10" - annual: "$100" - collaborator: - monthly: "$18" - annual: "$216" - EUR: - student: - monthly: "€9" - annual: "€90" - collaborator: - monthly: "€17" - annual: "€204" - GBP: - student: - monthly: "£7" - annual: "£70" - collaborator: - monthly: "£14" - annual: "£168" - SEK: - student: - monthly: "75 kr" - annual: "750 kr" - collaborator: - monthly: "140 kr" - annual: "1680 kr" - CAD: - student: - monthly: "$12" - annual: "$120" - collaborator: - monthly: "$22" - annual: "$264" - NOK: - student: - monthly: "75 kr" - annual: "750 kr" - collaborator: - monthly: "140 kr" - annual: "1680 kr" - DKK: - student: - monthly: "68 kr" - annual: "680 kr" - collaborator: - monthly: "110 kr" - annual: "1320 kr" - AUD: - student: - monthly: "$13" - annual: "$130" - collaborator: - monthly: "$22" - annual: "$264" - NZD: - student: - monthly: "$14" - annual: "$140" - collaborator: - monthly: "$22" - annual: "$264" - CHF: - student: - monthly: "Fr 10" - annual: "Fr 100" - collaborator: - monthly: "Fr 18" - annual: "Fr 216" - SGD: - student: - monthly: "$14" - annual: "$140" - collaborator: - monthly: "$25" - annual: "$300" - plans: USD: symbol: "$" @@ -312,14 +154,6 @@ define [ $scope.shouldABTestPlans = window.shouldABTestPlans if $scope.shouldABTestPlans - sixpack.participate 'plans-1610', ['default', 'heron', 'ibis'], (chosenVariation, rawResponse)-> - $scope.plansVariant = chosenVariation - event_tracking.sendMB 'plans-page', {plans_variant: chosenVariation} - if chosenVariation in ['heron', 'ibis'] - # overwrite student plans with alternative - for currency, _v of $scope.plans - $scope.plans[currency]['student'] = MultiCurrencyPricing[chosenVariation][currency]['student'] - $scope.plans[currency]['collaborator'] = MultiCurrencyPricing[chosenVariation][currency]['collaborator'] $scope.showPlans = true else $scope.showPlans = true diff --git a/services/web/public/coffee/main/subscription-dashboard.coffee b/services/web/public/coffee/main/subscription-dashboard.coffee index c971b9712a..28d5af013b 100644 --- a/services/web/public/coffee/main/subscription-dashboard.coffee +++ b/services/web/public/coffee/main/subscription-dashboard.coffee @@ -3,8 +3,6 @@ define [ ], (App)-> App.controller 'SuccessfulSubscriptionController', ($scope, sixpack) -> - sixpack.convert 'plans-1610', () -> - SUBSCRIPTION_URL = "/user/subscription/update"