From a0c87b2ae132a448e21d71f2208cceb50e713f42 Mon Sep 17 00:00:00 2001 From: Thomas Mees Date: Mon, 26 Sep 2022 21:01:23 +0200 Subject: [PATCH] Rename plans-page-layout-v2 to plans-page-layout-v2-annual GitOrigin-RevId: deeec6bde44d8d99e241d54b02248fe6299af4df --- .../Features/Subscription/SubscriptionController.js | 2 +- .../plans-marketing/_group_plan_modal.pug | 4 ++-- .../plans-marketing/v2/_cards_controls_tables.pug | 8 ++++---- .../subscriptions/plans-marketing/v2/_mixins.pug | 4 ++-- .../web/frontend/js/pages/user/subscription/plans.js | 11 ++++++----- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/services/web/app/src/Features/Subscription/SubscriptionController.js b/services/web/app/src/Features/Subscription/SubscriptionController.js index 4b267a2639..238b161e42 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionController.js +++ b/services/web/app/src/Features/Subscription/SubscriptionController.js @@ -59,7 +59,7 @@ async function plansPage(req, res) { await SplitTestHandler.promises.getAssignment( req, res, - 'plans-page-layout-v2' + 'plans-page-layout-v2-annual' ) const newPlansPageVariantV2 = diff --git a/services/web/app/views/subscriptions/plans-marketing/_group_plan_modal.pug b/services/web/app/views/subscriptions/plans-marketing/_group_plan_modal.pug index 28e1d13020..180327540b 100644 --- a/services/web/app/views/subscriptions/plans-marketing/_group_plan_modal.pug +++ b/services/web/app/views/subscriptions/plans-marketing/_group_plan_modal.pug @@ -64,7 +64,7 @@ div.modal.fade(tabindex="-1" role="dialog" data-ol-group-plan-modal) event-tracking-mb="true" event-tracking-trigger="click" event-tracking-element="select" - event-segmentation='{"plans-page-layout-v2": "' + (newPlansPageVariantV2 ? 'new-plans-page' : 'default') + '"}' + event-segmentation='{"plans-page-layout-v2-annual": "' + (newPlansPageVariantV2 ? 'new-plans-page' : 'default') + '"}' ) for size in groupPlanModalOptions.sizes option( @@ -92,7 +92,7 @@ div.modal.fade(tabindex="-1" role="dialog" data-ol-group-plan-modal) event-tracking-mb="true" event-tracking-trigger="click" event-tracking-element="checkbox" - event-segmentation='{"plans-page-layout-v2": "' + (newPlansPageVariantV2 ? 'new-plans-page' : 'default') + '"}' + event-segmentation='{"plans-page-layout-v2-annual": "' + (newPlansPageVariantV2 ? 'new-plans-page' : 'default') + '"}' ) span This license is for educational purposes (applies to students or faculty using Overleaf for teaching) diff --git a/services/web/app/views/subscriptions/plans-marketing/v2/_cards_controls_tables.pug b/services/web/app/views/subscriptions/plans-marketing/v2/_cards_controls_tables.pug index 444959490f..71d5a12cfe 100644 --- a/services/web/app/views/subscriptions/plans-marketing/v2/_cards_controls_tables.pug +++ b/services/web/app/views/subscriptions/plans-marketing/v2/_cards_controls_tables.pug @@ -8,7 +8,7 @@ include ./_mixins event-tracking="plans-page-toggle-plan" event-tracking-mb="true" event-tracking-trigger="click" - event-segmentation='{"button": "individual", "plans-page-layout-v2": "new-plans-page"}' + event-segmentation='{"button": "individual", "plans-page-layout-v2-annual": "new-plans-page"}' ) a.btn.btn-default-outline( href="#" @@ -18,7 +18,7 @@ include ./_mixins event-tracking="plans-page-toggle-plan" event-tracking-mb="true" event-tracking-trigger="click" - event-segmentation='{"button": "group", "plans-page-layout-v2": "new-plans-page"}' + event-segmentation='{"button": "group", "plans-page-layout-v2-annual": "new-plans-page"}' ) a.btn.btn-default-outline( href="#" @@ -30,13 +30,13 @@ include ./_mixins event-tracking="plans-page-toggle-plan" event-tracking-mb="true" event-tracking-trigger="click" - event-segmentation='{"button": "student", "plans-page-layout-v2": "new-plans-page"}' + event-segmentation='{"button": "student", "plans-page-layout-v2-annual": "new-plans-page"}' ) a.btn.btn-default-outline( href="#" ) #{translate("student_plans")} -+monthly_annual_switch("annual", "plans-page-toggle-period", '{"plans-page-layout-v2": "new-plans-page"}') ++monthly_annual_switch("annual", "plans-page-toggle-period", '{"plans-page-layout-v2-annual": "new-plans-page"}') .row(hidden data-ol-plans-v2-license-picker-container) .col-sm-12 diff --git a/services/web/app/views/subscriptions/plans-marketing/v2/_mixins.pug b/services/web/app/views/subscriptions/plans-marketing/v2/_mixins.pug index e7160bfccb..e951b8e0d5 100644 --- a/services/web/app/views/subscriptions/plans-marketing/v2/_mixins.pug +++ b/services/web/app/views/subscriptions/plans-marketing/v2/_mixins.pug @@ -344,7 +344,7 @@ mixin group_plans_license_picker() event-tracking-mb="true" event-tracking-trigger="click" event-tracking-element="select" - event-segmentation='{"plans-page-layout-v2": "new-plans-page"}' + event-segmentation='{"plans-page-layout-v2-annual": "new-plans-page"}' ) option(value="2") 2 option(value="3") 3 @@ -364,7 +364,7 @@ mixin group_plans_license_picker() event-tracking-mb="true" event-tracking-trigger="click" event-tracking-element="checkbox" - event-segmentation='{"plans-page-layout-v2": "new-plans-page"}' + event-segmentation='{"plans-page-layout-v2-annual": "new-plans-page"}' ) span #{translate("apply_educational_discount")} //- will only appear on screen width >= 768px (using CSS) diff --git a/services/web/frontend/js/pages/user/subscription/plans.js b/services/web/frontend/js/pages/user/subscription/plans.js index 7d83afe10b..3e20aa33cd 100644 --- a/services/web/frontend/js/pages/user/subscription/plans.js +++ b/services/web/frontend/js/pages/user/subscription/plans.js @@ -3,7 +3,7 @@ import '../../../features/plans/group-plan-modal' import * as eventTracking from '../../../infrastructure/event-tracking' import getMeta from '../../../utils/meta' -const PLANS_PAGE_LAYOUT_V2 = 'plans-page-layout-v2' +const PLANS_PAGE_LAYOUT_V2_ANNUAL = 'plans-page-layout-v2-annual' let currentView = 'monthly' let currentCurrencyCode = getMeta('ol-recommendedCurrency') @@ -26,14 +26,14 @@ function selectView(view) { function setUpViewSwitching(liEl) { const plansPageV2SplitTestVariant = - getMeta('ol-splitTestVariants')?.[PLANS_PAGE_LAYOUT_V2] ?? 'default' + getMeta('ol-splitTestVariants')?.[PLANS_PAGE_LAYOUT_V2_ANNUAL] ?? 'default' const view = liEl.getAttribute('data-ol-view-tab') liEl.querySelector('a').addEventListener('click', function (e) { e.preventDefault() eventTracking.send('subscription-funnel', 'plans-page', `${view}-prices`) eventTracking.sendMB('plans-page-toggle', { button: view, - PLANS_PAGE_LAYOUT_V2: plansPageV2SplitTestVariant, + PLANS_PAGE_LAYOUT_V2_ANNUAL: plansPageV2SplitTestVariant, }) selectView(view) }) @@ -54,7 +54,7 @@ function setUpCurrencySwitching(linkEl) { function setUpSubscriptionTracking(linkEl) { const plansPageV2SplitTestVariant = - getMeta('ol-splitTestVariants')?.[PLANS_PAGE_LAYOUT_V2] ?? 'default' + getMeta('ol-splitTestVariants')?.[PLANS_PAGE_LAYOUT_V2_ANNUAL] ?? 'default' const plan = linkEl.getAttribute('data-ol-tracking-plan') || linkEl.getAttribute('data-ol-start-new-subscription') @@ -72,7 +72,8 @@ function setUpSubscriptionTracking(linkEl) { } if (eventTrackingKey === DEFAULT_EVENT_TRACKING_KEY) { - eventTrackingSegmentation.PLANS_PAGE_LAYOUT_V2 = plansPageV2SplitTestVariant + eventTrackingSegmentation.PLANS_PAGE_LAYOUT_V2_ANNUAL = + plansPageV2SplitTestVariant } linkEl.addEventListener('click', function () {