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

Merge pull request #9652 from overleaf/tm-plans-v2-default-monthly

Browse source 
Default to showing Annual plans when rendering the V2 plans variant

GitOrigin-RevId: a709e81de3672959c67f6afd0234fb9277400d9d
This commit is contained in:
Thomas 2022-09-20 12:06:07 +02:00 committed by Copybot
parent 5870f4ce0a
commit e84c1740bc
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/views/subscriptions/interstitial-payment.pug
View file

@ -23,7 +23,7 @@ block content
.page-header.centered.plans-header.text-centered.top-page-header .page-header.centered.plans-header.text-centered.top-page-header
h1.text-capitalize #{translate('choose_your_plan')} h1.text-capitalize #{translate('choose_your_plan')}
+monthly_annual_switch("paywall-plans-page-toggle", '{}') +monthly_annual_switch("monthly", "paywall-plans-page-toggle", '{}')
+plans_v2_table_sticky_header(true, interstitialPaymentConfig) +plans_v2_table_sticky_header(true, interstitialPaymentConfig)

6
services/web/app/views/subscriptions/plans-marketing/v2/_cards_controls_tables.pug
View file

@ -36,7 +36,7 @@ include ./_mixins
href="#" href="#"
) #{translate("student_plans")} ) #{translate("student_plans")}
+monthly_annual_switch("plans-page-toggle-period", '{"plans-page-layout-v2": "new-plans-page"}') +monthly_annual_switch("annual", "plans-page-toggle-period", '{"plans-page-layout-v2": "new-plans-page"}')
.row(hidden data-ol-plans-v2-license-picker-container) .row(hidden data-ol-plans-v2-license-picker-container)
.col-sm-12 .col-sm-12
@ -44,7 +44,7 @@ include ./_mixins
+table_sticky_header_all(plansV2Config) +table_sticky_header_all(plansV2Config)
.row.plans-v2-table-container(data-ol-plans-v2-period='monthly') .row.plans-v2-table-container(hidden data-ol-plans-v2-period='monthly')
.col-sm-12(data-ol-plans-v2-view='individual') .col-sm-12(data-ol-plans-v2-view='individual')
.row .row
+table_individual('monthly') +table_individual('monthly')
@ -52,7 +52,7 @@ include ./_mixins
.row .row
+table_student('monthly') +table_student('monthly')
.row.plans-v2-table-container(hidden data-ol-plans-v2-period='annual') .row.plans-v2-table-container(data-ol-plans-v2-period='annual')
.col-sm-12(data-ol-plans-v2-view='individual') .col-sm-12(data-ol-plans-v2-view='individual')
.row .row
+table_individual('annual') +table_individual('annual')

9
services/web/app/views/subscriptions/plans-marketing/v2/_mixins.pug
View file

@ -567,13 +567,15 @@ mixin table_sticky_header_all(plansV2Config)
) )
+plans_v2_table_sticky_header(true, plansV2Config.student) +plans_v2_table_sticky_header(true, plansV2Config.student)
mixin monthly_annual_switch(eventTracking, eventSegmentation) mixin monthly_annual_switch(initialState, eventTracking, eventSegmentation)
- var monthlyAnnualToggleChecked = initialState === 'annual'
.row .row
.col-md-4.col-md-offset-4.text-centered.plans-v2-m-a-switch-container(data-ol-plans-v2-m-a-switch-container) .col-md-4.col-md-offset-4.text-centered.plans-v2-m-a-switch-container(data-ol-plans-v2-m-a-switch-container)
span.underline(data-ol-plans-v2-m-a-switch-text='monthly') #{translate("monthly")} span.underline(data-ol-plans-v2-m-a-switch-text='monthly') #{translate("monthly")}
label.plans-v2-m-a-switch(data-ol-plans-v2-m-a-switch) label.plans-v2-m-a-switch(data-ol-plans-v2-m-a-switch)
input( input(
type="checkbox" type="checkbox"
checked=monthlyAnnualToggleChecked
role="switch" role="switch"
autocomplete="off" autocomplete="off"
event-tracking=eventTracking event-tracking=eventTracking
@ -588,8 +590,9 @@ mixin monthly_annual_switch(eventTracking, eventSegmentation)
.tooltip.in.right.plans-v2-m-a-tooltip( .tooltip.in.right.plans-v2-m-a-tooltip(
role="tooltip" role="tooltip"
data-ol-plans-v2-m-a-tooltip data-ol-plans-v2-m-a-tooltip
class=monthlyAnnualToggleChecked ? 'plans-v2-m-a-tooltip-annual-selected' : ''
) )
.tooltip-arrow .tooltip-arrow
.tooltip-inner .tooltip-inner
span(data-ol-tooltip-period='monthly') #{translate("save_20_percent_by_paying_annually")} span(hidden=monthlyAnnualToggleChecked data-ol-tooltip-period='monthly') #{translate("save_20_percent_by_paying_annually")}
span(hidden data-ol-tooltip-period='annual') #{translate("saving_20_percent")} span(hidden=!monthlyAnnualToggleChecked data-ol-tooltip-period='annual') #{translate("saving_20_percent")}