From 7705acfa1f92ebcae7623ea2cdbf309bbbdcd84f Mon Sep 17 00:00:00 2001 From: Thomas Date: Mon, 18 Jul 2022 09:14:10 +0200 Subject: [PATCH] Merge pull request #8874 from overleaf/tm-revert-personal-price-experiment Revert personal plan discount experiment to original pricing GitOrigin-RevId: 3134a187e4900570580c3717fe0e19077399eb4d --- .../subscriptions/plans-marketing/_mixins.pug | 22 +--------- services/web/frontend/js/main/plans.js | 44 +++++++++---------- .../web/frontend/stylesheets/app/plans.less | 9 +--- services/web/locales/en.json | 1 - 4 files changed, 24 insertions(+), 52 deletions(-) diff --git a/services/web/app/views/subscriptions/plans-marketing/_mixins.pug b/services/web/app/views/subscriptions/plans-marketing/_mixins.pug index 1ca50aa943..1b857ce391 100644 --- a/services/web/app/views/subscriptions/plans-marketing/_mixins.pug +++ b/services/web/app/views/subscriptions/plans-marketing/_mixins.pug @@ -132,13 +132,6 @@ mixin gen_localized_price_for_plan_view(plan, view) data-ol-currencyCode=currencyCode ) #{settings.localizedPlanPricing[currencyCode][plan][view]} -mixin gen_localized_undiscounted_price_for_plan_view_personal(view) - for currencyCode in Object.keys(settings.localizedPlanPricing) - span( - hidden=(currencyCode !== recommendedCurrency) - data-ol-currencyCode=currencyCode - ) #{settings.localizedPlanPricing[currencyCode]['personal']['withoutDiscount'][view]} - mixin gen_localized_undiscounted_price_for_plan_view(plan) for currencyCode in Object.keys(settings.localizedPlanPricing) span( @@ -155,18 +148,6 @@ mixin gen_localized_price_for_plan(plan) +gen_localized_price_for_plan_view(plan, 'annual') span.small /yr -mixin gen_localized_undiscounted_price_for_plan_personal() - div(data-ol-view='monthly') - strike.undiscounted-price.small - span.sr-only Price reduced from - +gen_localized_undiscounted_price_for_plan_view_personal('monthly') - | /mo - div(hidden data-ol-view='annual') - strike.undiscounted-price.small - span.sr-only Price reduced from - +gen_localized_undiscounted_price_for_plan_view_personal('annual') - | /yr - mixin gen_localized_undiscounted_price_for_plan(plan) div(hidden data-ol-view='annual') strike.undiscounted-price.small @@ -178,7 +159,7 @@ mixin gen_localized_undiscounted_price_for_plan(plan) mixin price_personal +gen_localized_price_for_plan('personal') mixin price_personal_undiscounted - +gen_localized_undiscounted_price_for_plan_personal() + +gen_localized_undiscounted_price_for_plan('personal') mixin price_collaborator +gen_localized_price_for_plan('collaborator') mixin price_collaborator_undiscounted @@ -261,7 +242,6 @@ mixin allCardsAndControls(controlsRowSpaced, listLocation) h2 #{translate("personal")} .card-byline h5.tagline #{translate("tagline_personal")} - h5.special-offer #{translate("limited_time_discount")} .circle +price_personal +price_personal_undiscounted diff --git a/services/web/frontend/js/main/plans.js b/services/web/frontend/js/main/plans.js index 4ca0958568..64b6461e58 100644 --- a/services/web/frontend/js/main/plans.js +++ b/services/web/frontend/js/main/plans.js @@ -18,8 +18,8 @@ App.factory('MultiCurrencyPricing', function () { annual: '$80', }, personal: { - monthly: '$5', - annual: '$49', + monthly: '$13', + annual: '$120', }, collaborator: { monthly: '$19', @@ -38,8 +38,8 @@ App.factory('MultiCurrencyPricing', function () { annual: '€70', }, personal: { - monthly: '€5', - annual: '€44', + monthly: '€12', + annual: '€108', }, collaborator: { monthly: '€18', @@ -58,8 +58,8 @@ App.factory('MultiCurrencyPricing', function () { annual: '£60', }, personal: { - monthly: '£4', - annual: '£39', + monthly: '£10', + annual: '£96', }, collaborator: { monthly: '£15', @@ -78,8 +78,8 @@ App.factory('MultiCurrencyPricing', function () { annual: '600 kr', }, personal: { - monthly: '35 kr', - annual: '359 kr', + monthly: '92 kr', + annual: '876 kr', }, collaborator: { monthly: '138 kr', @@ -97,8 +97,8 @@ App.factory('MultiCurrencyPricing', function () { annual: '$90', }, personal: { - monthly: '$5', - annual: '$55', + monthly: '$14', + annual: '$132', }, collaborator: { monthly: '$22', @@ -117,8 +117,8 @@ App.factory('MultiCurrencyPricing', function () { annual: '600 kr', }, personal: { - monthly: '35 kr', - annual: '359 kr', + monthly: '92 kr', + annual: '876 kr', }, collaborator: { monthly: '138 kr', @@ -137,8 +137,8 @@ App.factory('MultiCurrencyPricing', function () { annual: '500 kr', }, personal: { - monthly: '29 kr', - annual: '295 kr', + monthly: '75 kr', + annual: '720 kr', }, collaborator: { monthly: '113 kr', @@ -157,8 +157,8 @@ App.factory('MultiCurrencyPricing', function () { annual: '$100', }, personal: { - monthly: '$6', - annual: '$59', + monthly: '$15', + annual: '$144', }, collaborator: { monthly: '$23', @@ -177,8 +177,8 @@ App.factory('MultiCurrencyPricing', function () { annual: '$100', }, personal: { - monthly: '$6', - annual: '$59', + monthly: '$15', + annual: '$144', }, collaborator: { monthly: '$23', @@ -197,8 +197,8 @@ App.factory('MultiCurrencyPricing', function () { annual: 'Fr 80', }, personal: { - monthly: 'Fr 5', - annual: 'Fr 49', + monthly: 'Fr 13', + annual: 'Fr 120', }, collaborator: { monthly: 'Fr 19', @@ -217,8 +217,8 @@ App.factory('MultiCurrencyPricing', function () { annual: '$120', }, personal: { - monthly: '$7', - annual: '$64', + monthly: '$17', + annual: '$156', }, collaborator: { monthly: '$25', diff --git a/services/web/frontend/stylesheets/app/plans.less b/services/web/frontend/stylesheets/app/plans.less index c591a55abd..f9a2729861 100644 --- a/services/web/frontend/stylesheets/app/plans.less +++ b/services/web/frontend/stylesheets/app/plans.less @@ -64,9 +64,6 @@ .card-header { margin-bottom: 15px; } - .card-byline { - min-height: 58px; - } .circle { font-size: 1.5rem; font-weight: 700; @@ -126,11 +123,7 @@ margin-bottom: @line-height-computed; } .tagline { - margin-bottom: 0px; - } - .special-offer { - margin-top: 6px; - color: @ol-dark-green; + margin-bottom: 20px; } ul.nav-pills { text-align: center; diff --git a/services/web/locales/en.json b/services/web/locales/en.json index 407fa4ae1b..def15faf10 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -543,7 +543,6 @@ "tagline_professional": "For those working with many", "tagline_student_annual": "Save even more", "tagline_student_monthly": "Great for a single term", - "limited_time_discount": "Limited-time discount!", "all_premium_features": "All premium features", "sync_dropbox_github": "Sync with Dropbox and GitHub", "project_synchronisation": "Project Synchronisation",