Commit graph

483 commits

Author SHA1 Message Date
Thomas
281f222d82 Merge pull request #9612 from overleaf/tm-onboarding-upgrade-prompt-analytics-fix
Fix event tracking for onboarding upgrade prompt page

GitOrigin-RevId: 8122cc7f290cc0ba07c8d38c71d8b762bb760f32
2022-09-15 08:04:27 +00:00
Thomas
db9fad7cf8 Merge onboarding experiments integration branch (#9571)
* Add onboarding survey page

* Add onboarding new analytics events to mixpanel allowlist

* [web] Try Premium prompt

* moved try-premium code to overleaf-integration

* fixed sheet styling

* Add onboarding flow redirect handling to registration handlers (#9462)

* Add redirect logic for onboarding flow after registration

* Update UPGRADE_PROMPT_URL

* Cleanup style of OverleafAuthenticationController

* Refactor finishLogin calls to call wrapped function in OverleafAuthenticationController

* Refactor user properties/onboarding flow redirect into finishLogin wrapper

* Fix async/await calls after refactoring

* Update tests for finishLogin refactoring

* Don't redirect to upgrade prompt if user has premium via commons

Co-authored-by: Miguel Serrano <mserranom@users.noreply.github.com>
GitOrigin-RevId: 7c392aa6949f99fa909f9ca4e4baad4c4d4ff6be
2022-09-15 08:04:06 +00:00
Thomas
0919f081a7 Merge pull request #9540 from overleaf/tm-back-to-school-2022-banners
Add back to school 2022 banners to project dash and plans

GitOrigin-RevId: 40893bad0b6a90bb25f671949b7b8837ead54053
2022-09-13 08:05:31 +00:00
Thomas
d1a2868fab Implement checkout page 'refreshed' split test with Recurly Elements (#8320)
* Implement checkout page 'refreshed' split test with Recurly Elements

Co-authored-by: Timothée Alby <timothee.alby@gmail.com>
GitOrigin-RevId: 586a94c7969530f4d2246e9105ef48e868e9510e
2022-09-05 08:03:51 +00:00
M Fahru
37c69fc6b7 Fix interstitial payment monthly annual switch doesn't show the correct table
GitOrigin-RevId: ad88867922aafd65f245ff04d13203acbcf21b94
2022-07-28 08:03:43 +00:00
Thomas
7705acfa1f Merge pull request #8874 from overleaf/tm-revert-personal-price-experiment
Revert personal plan discount experiment to original pricing

GitOrigin-RevId: 3134a187e4900570580c3717fe0e19077399eb4d
2022-07-18 08:05:15 +00:00
M Fahru
b07afa563f Change URL in new plans page contact us buttons
GitOrigin-RevId: 251894d41080a759ac24cdc3cebe67c664dce9f4
2022-07-15 08:03:53 +00:00
M Fahru
4dbabe3a8d Only show university info box on new plans page student tab (#8823)
GitOrigin-RevId: 057baae295443d9a924b4b0754cdb12ebe330976
2022-07-13 08:05:54 +00:00
M Fahru
cc92f264d2 Improve new plans page university info styling and change its copy (#8822)
GitOrigin-RevId: ebb0e3677cce862f22757a5a7236591d98f39078
2022-07-13 08:05:47 +00:00
M Fahru
e1399cc10d Remove discount banner from the new plans page (#8814)
GitOrigin-RevId: 091de891bf7eeb357aabcb2253ec9fbfd64fd38b
2022-07-13 08:05:40 +00:00
M Fahru
3b4968e263 Change number of users in group plan to have a dynamic value in the new plans page (#8592)
GitOrigin-RevId: 008c0a1120e5b99945f18f0b4eee60bfcb08a331
2022-07-13 08:05:33 +00:00
M Fahru
8603fcac6c Add correct link to the university support button (#8797)
GitOrigin-RevId: 1ecb591ff9dd99d195eed0fa2ae4b5702ef53b7e
2022-07-13 08:05:27 +00:00
M Fahru
6c7fd1dad0 Add new university info card in the new plans page (#8676)
GitOrigin-RevId: 7d9ec211930afc2536df36665d6cfc6f2cd7b46b
2022-07-13 08:05:13 +00:00
M Fahru
f3118771fe Add new limited discount information on personal plan in the new plans page (#8715)
GitOrigin-RevId: 7f4e91179ba767ff8b88df7787eaf9d4fe6a5f05
2022-07-13 08:05:06 +00:00
M Fahru
ebbe14e1a7 Remove university section from the Student Plans in the new plans page
GitOrigin-RevId: 00917ab8cd5190721036baab9ea8ab5fca9a3665
2022-07-13 08:04:59 +00:00
Thomas Mees
0cb51a3d52 Remove unused allCardsAndControls from v2 plans page
GitOrigin-RevId: 9b31299ba504bd3f39ca6a3030e32f8bc1e29aa1
2022-07-13 08:04:52 +00:00
Timothée Alby
e48c23546e Merge pull request #8724 from overleaf/ta-subscription-contact-link
Link to Contact Page in Subscription Translations

GitOrigin-RevId: f255b0408cf4cf1e6e19cf8d3eebbe996327a598
2022-07-08 08:03:18 +00:00
M Fahru
8488068a82 Fix itm_campaign for "buy now" links has wrong value on interstitial payment page (#8632)
GitOrigin-RevId: 58ca6d4453f3cdfcb4f2dea8ddb3f6bc1b73a4fe
2022-07-06 08:03:19 +00:00
M Fahru
bbaac83b82 Refactor plans v2 sticky header to use dedicated config instead of hardcode (#8659)
GitOrigin-RevId: 3ea56ad5c6b9b5f6556e97429cf3e67a0b0d56bc
2022-07-06 08:03:02 +00:00
M Fahru
d00d40464f Implement interstitial payment page analytics (#8512)
GitOrigin-RevId: 927e85df0a933d3da2378443c38d852e1970b574
2022-06-29 08:05:01 +00:00
M Fahru
df93eaef1c Change copy for premium features discoverability on thank you for subscribing page (#8531)
GitOrigin-RevId: faab715bc86bced4b33deb7493b8fe7743359573
2022-06-23 08:03:01 +00:00
M Fahru
d8fee0d91a Implement premium features discoverability for user subscription page with split test (#8355)
GitOrigin-RevId: c4bc01361a2d627f0a87f4ddeb8be8ed40f9acab
2022-06-23 08:02:58 +00:00
M Fahru
361f6f245a Refactor new plans page (#8493)
* [web] hide the monthly/annual switch for small screens via css

Co-Authored-By: Jakob Ackermann <jakob.ackermann@overleaf.com>

* [web] merge logic for hiding elements shown in a subset of view

Co-Authored-By: M Fahru <m.fahru@overleaf.com>

* [web] hide the monthly/annual switch for small screens via css

Co-Authored-By: M Fahru <m.fahru@overleaf.com>

* [web] merge logic for hiding elements shown in a subset of view

Co-Authored-By: M Fahru <m.fahru@overleaf.com>

* fix inverted logic on monthly annual checking

* delete some duplicated logic and refactor

* merge switch functions

* move global variable into the main module

* simplify the enable and disable switch

* remove unused parseFloat

* simplify group plan pricing calculation

* simplify discount group plan logic

* simplify sticky header logic

* merge view and period switching

* fix underlining of switch text

* simplify class list toggling

* merging two function of the group plan

Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
GitOrigin-RevId: 5e51690514bbf1dee2639011748c6a8470e1c19a
2022-06-23 08:02:56 +00:00
Thomas
3a1bba07f7 Merge pull request #8436 from overleaf/tm-update-wording-subscription-dashboard
Update wording on subscription dashboard

GitOrigin-RevId: 4739677fcf46e5de4db3e3fe2411f6ed9898aa2c
2022-06-21 08:03:08 +00:00
M Fahru
4c37d47daf Change British spelling for "customise" and "personalise" to American spelling (#8475)
GitOrigin-RevId: fe5754f08ff337148d8e8717a7495ad1e855fdbf
2022-06-21 08:03:04 +00:00
M Fahru
66c27ae153 Fix interstitial page student plans have wrong button background color (#8489)
GitOrigin-RevId: f9f3ec239c06c9ecc7e608aaf879d69041c0a9a3
2022-06-21 08:02:58 +00:00
M Fahru
c54c048e35 Implement premium features discoverability on successful subscription page with split test (#8336)
GitOrigin-RevId: 362fa289fa6e009e316dcaceae0587f5fc18162c
2022-06-20 08:04:06 +00:00
M Fahru
1070dd53f3 Remove footer and rightside of the navbar on the interstitial payment page (#8407)
Co-authored with Thomas Mees (thomas.mees@overleaf.com)

GitOrigin-RevId: 270e11f0cfd09830e5c7600d636b8ebbfc6049a2
2022-06-15 08:05:00 +00:00
M Fahru
73cf4116b6 Interstitial Payment Page UI + Route (#8305)
GitOrigin-RevId: a31f7094db819e0dad4ff3f09c17544d40260dd4
2022-06-14 08:02:16 +00:00
M Fahru
61e57e8a6a [web] fix new plans page table header additional link URL (#8302)
GitOrigin-RevId: a377e8012884297e4c555bad465112d575621133
2022-06-10 08:03:37 +00:00
M Fahru
199360afb8 Extract monthly annual switch on new plans page as mixin (#8292)
GitOrigin-RevId: 4634557dff55a747206d3fb355b9924ca769e98c
2022-06-06 08:04:07 +00:00
M Fahru
b12c108522 [web] Extract reusable table mixin on plans page v2 tables (#8262)
GitOrigin-RevId: 7d8dcff5fd3f0c450de6cca57b428759d44dec7d
2022-06-06 08:03:45 +00:00
M Fahru
df35a67707 fix typo, change recomendedCurrency to recommendedCurrency (#8245)
GitOrigin-RevId: 16d40113d73de10082c3cc7fcb9bd54bbaf5a274
2022-06-02 08:02:40 +00:00
M Fahru
b4bb9f2b0f Change divider label in new plans page table to bold using <b> tag (#8120)
GitOrigin-RevId: 8cc1551822f4288302ea01b9a20ab208152b0644
2022-05-26 08:04:44 +00:00
Thomas
6564147b0a Merge pull request #8142 from overleaf/tm-fix-recurly-double-submission
Fix plan change buttons not being disabled while request inflight

GitOrigin-RevId: a87c89ce6c9642a7988e2dfcc7ee6e3673c6128d
2022-05-26 08:04:12 +00:00
Thomas
35073d49dc Add error message on subscription dashboard if v1 is down (instead of returning a 500 error page) (#7947)
* Add error message on subscription dashboard if v1 is down

GitOrigin-RevId: 8c8b5ac4d44cfd2c42101efe1d55a5993ca21eea
2022-05-20 08:04:43 +00:00
Alf Eaton
a59a1bec4d Merge pull request #8012 from overleaf/jel-subscription-dash
[web] Add missing group contact modal for subscription dash

GitOrigin-RevId: 45f0a19fefccd4ebc5838494d00650557cc5b8fe
2022-05-20 08:04:26 +00:00
M Fahru
68df9e9325 new plans page: Update wrong text on various places + reuse translation key (#7950)
* change wrong description on individual standard (collaborator) plan on the new plans page

* reuse old "one_collaborator" translation key and fix individual professional description

* fix wrong descriptions on student table

* new plans page: remove buy button exclamation mark

* change "Buy Now" to "buy now"

GitOrigin-RevId: 274bca246b5f3d877b795e67036b93ab3494a1c3
2022-05-20 08:03:27 +00:00
M Fahru
1b2cefa63e Add new analytics events in the new plans page and update analytics event in the current plans page (#7639)
GitOrigin-RevId: 71a4e7b0b041bbe7ea6df11cad28857978c77e4e
2022-05-20 08:03:21 +00:00
M Fahru
dceb6910c9 New plans page: Show initial price value upon first render for group price data (#7974)
* New plans page: Show initial price value upon first render

* fix wrong test on SubscriptionController and add new tests on SubscriptionHelper

GitOrigin-RevId: a339a97cff2df0728ba35885af8953c8a0e0b7c8
2022-05-20 08:03:16 +00:00
M Fahru
22b1797c18 change button text on non-trial monthly plan on payment page (#7973)
GitOrigin-RevId: 83378ea13d16d3add31ed6a93f1a13fdc3860431
2022-05-18 08:04:12 +00:00
M Fahru
4d25132a5f new plans page: refactor custom tooltip to bootstrap tooltip (#7972)
GitOrigin-RevId: d3552867a9e9176288803cadffacb5f3dab24895
2022-05-18 08:04:06 +00:00
M Fahru
5050493827 Add close button to group plan modal (#7959)
* add close button to group plan modal

* change hardcoded string to translation key

GitOrigin-RevId: fa259745cad1a6214d06a1379fc5c3ffb8377557
2022-05-18 08:04:00 +00:00
M Fahru
e2fe475116 change copy on group plans and remove the bold font on checkbox label (#7943)
GitOrigin-RevId: 31acc96cf3f6d85d44388497d6bba52bb5ae9667
2022-05-18 08:03:53 +00:00
M Fahru
5fdcd74a0e update FAQ on new plans page (#7937)
GitOrigin-RevId: 632b507217fb13c1de7c364a11244e49d85cac58
2022-05-18 08:03:41 +00:00
M Fahru
8157616f85 [web] New Plans Page for A/B Test (#7330)
GitOrigin-RevId: 4e4629583c6e86bd2bc6165d123224734c133df7
2022-05-13 08:03:30 +00:00
M Fahru
cf0b46ecf2 Add annual saving tooltip & add a striked-through text on the annual price to current plans page
Co-authored-by: Thomas Mees <thomas.mees@overleaf.com>
GitOrigin-RevId: 25a9b7b12ddd00588a8e4c43b55f2d7c57048818
2022-05-12 10:41:11 +00:00
Tim Down
f4b5d1ca81 Merge pull request #7888 from overleaf/td-em-let-us-know-link
Fix "Let us know" link to open modal dialog

GitOrigin-RevId: a95433d0cfc93e3720da7b6cbc43798e1348e8a8
2022-05-12 08:04:55 +00:00
Thomas
35e0d83343 Refactor undiscounted price display to fix comparison tables (#7807)
* Refactor undiscounted price display to fix comparison tables

GitOrigin-RevId: 4345757c80f5a647596270d60f9e0a1546584640
2022-04-29 08:03:29 +00:00
Thomas
8352bada7b Add copy for personal plan discount, and include old undiscounted price on plans page (#7770)
* Add copy for personal plan discount, and include old undiscounted price on plans page

GitOrigin-RevId: 34d1361d8257e0ed1923bc6f8950167657e44055
2022-04-28 08:04:15 +00:00
M Fahru
bce02b25e4 Merge pull request #7358 from overleaf/mf-fix-tooltip-plans-page
[web] Fix tooltip on plans table for plans & pricing page

GitOrigin-RevId: a1e284956e2dc359eec31c6348e5ebffe46697be
2022-04-08 08:04:39 +00:00
M Fahru
f23accc572 Merge pull request #7292 from overleaf/tm-plans-page-layout-teardown
Tear down plans page split test variant with new layout

GitOrigin-RevId: ab09066f05d17ca17a19ab8895fac141e1e89bff
2022-04-08 08:04:32 +00:00
M Fahru
4221825a18 Merge pull request #7240 from overleaf/mf-subscribe-survey-link
[web] Add a new survey link after user successfully subscribed

GitOrigin-RevId: d9b260e3727dbbdfd93ccc118be10be7aed246f2
2022-04-05 12:17:11 +00:00
Thomas
cc6a9519e2 Merge pull request #7074 from overleaf/tm-collaborator-to-standard-split-test
Add split test for 'Collaborator' to 'Standard' name change

GitOrigin-RevId: 549c5ac566f622f52218adc571a427e6241a53ee
2022-03-18 09:03:17 +00:00
Davinder Singh
726a47421e Merge pull request #6754 from overleaf/ds-subscription-address-length
Updated maxlength of subscription address field

GitOrigin-RevId: b08717a4e0e052e1c2fa92308767dfea56d8ea4d
2022-02-23 09:04:44 +00:00
Timothée Alby
0a27b3711f Merge pull request #6599 from overleaf/ta-new-subscription-split-test
Payment Page Split Test

GitOrigin-RevId: bb43cbf4e5722bd18076f2f8bf1014816bce1df0
2022-02-16 11:34:44 +00:00
Timothée Alby
62b662f07a Merge pull request #6561 from overleaf/tm-subscription-cancel-button-split-test
Update copy for subscription cancellation, in split test variant

GitOrigin-RevId: ab5847238b950099bf41b9d4c08f325ffce1051d
2022-02-16 11:34:08 +00:00
Thomas
bbb97bed26 Merge pull request #6558 from overleaf/tm-wfh2021-ended
Remove notifications for WFH2021 offer, revert side-bar to old Upgrade notice

GitOrigin-RevId: d5f0bb34b40605a335d48b1d2db54df8fab9224a
2022-02-02 09:03:14 +00:00
Thomas
635a478f36 Add plans page split test variant with new layout (#6450)
* Add plans page split test variant with new layout

* Set itm_content to toggle if group modal clicked through via variant view toggle button

* Change split test name to be more specific

GitOrigin-RevId: 0fa48b1b74eea84f15e630e3a62b36be5549da9e
2022-02-02 09:03:11 +00:00
Thomas
1777c075ea Merge pull request #6423 from overleaf/tm-plans-new-events
Add new analytics events to plans page/subscription flow

GitOrigin-RevId: 7b70ee30749ebc671cf2445f3cbdae91a7278b01
2022-02-02 09:03:07 +00:00
Tim Alby
3dbd913d97 disambiguate between displayPrice and recurlyPrice
GitOrigin-RevId: 38f4c51b9834c417824c0093096767f50e998cb8
2022-01-21 09:03:16 +00:00
Eric Mc Sween
7446523205 Merge pull request #6358 from overleaf/jel-fix-de-ng-link
[web] Fix modal link in plans FAQ

GitOrigin-RevId: 29137e71f5f0930443660086fb3a1cc3d87b05dd
2022-01-20 09:04:09 +00:00
Alf Eaton
ee00ff3c44 [web] Add the meta[viewport] tag to all pages (#6301)
* Always add the meta[viewport] tag
* Set metadata.viewport to false on projects list page
* Remove setting metadata.viewport = true
* Add viewport: false to editor page

GitOrigin-RevId: 6f9d4c1972e3e6fdf1b6c23cd17d57ba866fcaeb
2022-01-20 09:03:48 +00:00
Thomas
4792208ed2 Merge pull request #6329 from overleaf/tm-wfh2021-ending-soon
Update WFH offer notification text with offer end date

GitOrigin-RevId: f50b7f7f1b0c04ce20bd4ea45af6d8684f91fc2b
2022-01-13 09:03:52 +00:00
Thomas
a3ab9468a4 Merge pull request #6169 from overleaf/tm-group-plan-upgrade-ui-changes
Tweak group plan upgrade modal to match UI changes of marketing page group plans purchase modal

GitOrigin-RevId: 91db5de38fa4d273ae50924eec5db2b8e12ed7f9
2022-01-12 09:03:41 +00:00
Thomas
5e61fce3b4 Enable additional currencies when purchasing (or upgrading to) a group plan (#4884)
* Add script to fetch group data pricing from Recurly

* Update groups pricing data using script to fetch prices from Recurly

* Add additional currencies to saas settings

* Refactor group plans upgrade modal to use shared options from settings

GitOrigin-RevId: 6d13d5b152d01e0399f9d2b8f6f8bf99784589e8
2022-01-12 09:03:21 +00:00
Miguel Serrano
2667e9a11c Unified Navigation Bar + Split Test (#5972)
GitOrigin-RevId: 9fbde79aba1395956d591989b6161290777cc28f
2021-12-03 09:03:27 +00:00
Hugh O'Brien
7d932f0b92 Merge pull request #5722 from overleaf/hb-improve-group-buy-ux
Update the UX for the group subscription modal

GitOrigin-RevId: 6700a5c4907e0c966ee3b2954b6417ccf9edf37e
2021-11-17 09:04:06 +00:00
Alexandre Bourdin
c881909258 Merge pull request #5716 from overleaf/ab-tear-down-de-ng-plans-page-test
Tear down de-ng split test and cleanup old version

GitOrigin-RevId: 02438bbb2e530dfe72f046dd91c547d97c39c96e
2021-11-09 09:04:51 +00:00
Thomas
ffdafb9700 Show prices including VAT in the upgrade to group subscription modal (#5463)
* Add VAT calculation (with details) to the group upgrade modal

* Move 'per year' to seperate line to prevent text overflow

* Rename taxAmmount to taxAmount

GitOrigin-RevId: 37b7d471a704192d9cc4b96765f7449e747b2add
2021-10-29 08:04:01 +00:00
Jakob Ackermann
59d83c4b88 Merge pull request #5117 from overleaf/jpa-plans-de-ng
[web] de-ng plans page

GitOrigin-RevId: b902b10b45ab3fd46e71545c94f65e8f079c4564
2021-09-23 08:03:23 +00:00
Thomas
895f52d41a Let users upgrade to group plans via subscription dashboard (#5100)
* Let users upgrade to group plans via subscription dashboard

Users on an individual plan don't have a way to upgrade to a group
subscription without contacting support. As a temporary measure, we're
adding a way to do this by re-using the existing group plan modal from
the plans pages, to allow users to configure and upgrade to a group plan
directly.

This is currently only available for USD, EUR, and GBP - since although
we now support other currencies in Recurly, the group plans modal does
not yet support them. The user however can not change currency here,
their group subscription will be in the same currency as their current
individual subscription.

The group plan modal has been duplicated rather than extended, to keep
this code seperate as it is potentially only a stopgap measure - and we
don't want to be untangling the additional logic from the existing
modal/template later down the line.

GitOrigin-RevId: 10664bd19af2c3870dfe7e19fd0f9c5b7c877cc6
2021-09-15 08:04:00 +00:00
Thomas
8ec01f59da Revert "Let users upgrade to group plans via subscription dashboard (#4704)" (#5047)
This reverts commit f310eb10ef00d43076981589ee45893e7d9ab881.

GitOrigin-RevId: 63d884d60d63b9ad47ffc15f688dc81fc7c3d77a
2021-09-10 08:04:24 +00:00
Thomas
5f550b0a11 Let users upgrade to group plans via subscription dashboard (#4704)
Users on an individual plan don't have a way to upgrade to a group
subscription without contacting support. As a temporary measure, we're
adding a way to do this by re-using the existing group plan modal from
the plans pages, to allow users to configure and upgrade to a group plan
directly.

This is currently only available for USD, EUR, and GBP - since although
we now support other currencies in Recurly, the group plans modal does
not yet support them. The user however can not change currency here,
their group subscription will be in the same currency as their current
individual subscription.

The group plan modal has been duplicated rather than extended, to keep
this code seperate as it is potentially only a stopgap measure - and we
don't want to be untangling the additional logic from the existing
modal/template later down the line.

GitOrigin-RevId: f310eb10ef00d43076981589ee45893e7d9ab881
2021-09-10 08:04:18 +00:00
Alexandre Bourdin
ffb30435d8 Merge pull request #4825 from overleaf/ab-cleanup-sub-page-split-test
Cleanup subscription page split test and set variant as new copy

GitOrigin-RevId: b7a19cf5f744d9181b71200351dc5a92db939e92
2021-09-01 08:03:01 +00:00
Jessica Lawshe
379d9ac41c Merge pull request #4659 from overleaf/jel-em-duplicate-subscription-message
One Pro message per current commons institutions

GitOrigin-RevId: 21b74af8b9da1b6647a0384115f5d268b80e4bdf
2021-08-17 08:03:44 +00:00
Jessica Lawshe
bb882c697c Merge pull request #4288 from overleaf/jel-skip-to-content
Add "Skip to content" to improve accessibility

GitOrigin-RevId: 43368a65057656bdea10b6be3c598d68bd8e2d40
2021-07-28 02:06:54 +00:00
Jakob Ackermann
41471ec60f Merge pull request #4292 from overleaf/tm-handle-recurly-pricing-errors
Handle Recurly pricing API errors and add coupon code error display

GitOrigin-RevId: b86a42a059984a7efa596db85bbcedb93c0e7376
2021-07-28 02:05:54 +00:00
Alexandre Bourdin
3d5687a1f4 Merge pull request #4171 from overleaf/ta-remove-payment-page-form-fill
Remove payment-page-form-fill Event

GitOrigin-RevId: 4befa04b9dd11906c93dd42693e08373f14b8cf0
2021-06-11 02:06:09 +00:00
Alexandre Bourdin
551e2bfb5c Merge pull request #4084 from overleaf/ab-subscription-flow-events
Subscription flow analytics events

GitOrigin-RevId: c74121031ba8623244657c607a76a513380e96f5
2021-05-27 02:06:07 +00:00
Timothée Alby
88d00424cc Merge pull request #4002 from overleaf/cmg-subscriptions-new-validation
Add missing validation messages on subscriptions new

GitOrigin-RevId: 451b75d4adb0d92911579f0ea728625c561b767f
2021-05-20 02:05:11 +00:00
Timothée Alby
03b2d184b5 Merge pull request #4052 from overleaf/ab-subscription-page-split-test-2
Subscription page split test

GitOrigin-RevId: 022a91d97f20d584e47e1f6b5575e689983df129
2021-05-20 02:05:00 +00:00
Thomas
682abe9ca5 Merge pull request #3980 from overleaf/tm-show-error-if-plan-change-fails
Show error in plan change modal if plan change fails

GitOrigin-RevId: 698aab43feacdb5ced41f239167c5d132f7ca8de
2021-05-18 02:08:20 +00:00
Thomas
f7b96e86a7 Merge pull request #4034 from overleaf/tm-pending-subscription-addons
Display correct information when pending subscription has addons

GitOrigin-RevId: 7634ccf24788951507963b6d421fdb86e0dc38d5
2021-05-18 02:08:16 +00:00
Thomas
d2dad0d802 Merge pull request #4011 from overleaf/tm-fix-group-plan-educational-discount-text
Lowercase 'educational' for consistency in group plan modal text

GitOrigin-RevId: 139549dc96e71295f1eb5949fad66af1b4df4e16
2021-05-08 02:10:15 +00:00
Miguel Serrano
a5e905f730 Merge pull request #3975 from overleaf/tm-change-default-group-subscription
Make Enterprise the default group pricing and clarify related text

GitOrigin-RevId: c723c87fa97ca0f8e9a03039f05cb397e1213de3
2021-05-06 02:09:32 +00:00
Thomas
72af966c9c Schedule subscription downgrades to occur at the current term end (#3801)
* Schedule subscription downgrades to occur at the current term end.

If the plan is a downgrade, schedule the subscription change for term
end. Use Recurly v3 API subscription change event instead of v2 update
subscription.

* Add ability for user to revert a pending subscription change

In the case where a user has downgraded, but has since decided they'd
rather stay on their current plan, we need a way to let them revert. It
isn't enough to re-use a subscription change, because Recurly sees it as
an attempt to make a change from the current plan to itself.

Instead, we use a new dialog and call a new endpoint that has the
specific intent of reverting the pending plan change, by calling the
removeSubscriptionChange recurly client method.

* Add message prompting users to contact support for immediate changes

We're showing this in the confirmation modal for a plan change that
would occur in the future, and and on the subscription page if a pending
change is due.

Most users shouldn't need this, but it should help them out if they find
an edge case like moving from eg. Student (Annual) to Professional
(Monthly) and were expecting to be "upgraded" immediately.

GitOrigin-RevId: c5be0efbeb8568ed9caa941aadcef6f6db65c420
2021-04-28 02:10:31 +00:00
Jakob Ackermann
d2e6449e79 Merge pull request #3897 from overleaf/tm-meta-tags-billing
[views] migrate subscription templates to meta tags, re-issue

GitOrigin-RevId: c18bb7c96186cc8c34344ecf7cee35f9da19698e
2021-04-16 02:05:27 +00:00
Shane Kilkelly
16d02c9d8b Merge pull request #3882 from overleaf/ab-wfh-ga-events
Add new GA events to WFH2021 links

GitOrigin-RevId: 939f589c359a97b794eceb8e493cccd95ec1913a
2021-04-10 02:05:09 +00:00
Jessica Lawshe
2fca78eaf0 Merge pull request #3896 from overleaf/revert-3834-tm-meta-tags-billing
Revert "[views] migrate subscription templates to meta tags"

GitOrigin-RevId: 8ab3dae6e3aa359b6d7aa69df70a1b1eb2405dfd
2021-04-09 02:05:33 +00:00
Jessica Lawshe
e697064f16 Merge pull request #3834 from overleaf/tm-meta-tags-billing
[views] migrate subscription templates to meta tags

GitOrigin-RevId: 4e81e81380048436a011467c230cc54c02e0c423
2021-04-09 02:05:29 +00:00
Eric Mc Sween
5587de9cf5 Merge pull request #3833 from overleaf/em-meta-tags
Pass values to JS through meta tags

GitOrigin-RevId: f663a1b7fef4544b560574d21f59fdabaf617830
2021-04-01 02:05:44 +00:00
Simon Detheridge
3d48e1e027 Merge pull request #3799 from overleaf/tm-past-due-invoice-warning
Show warning if users Recurly account has past due invoices.

GitOrigin-RevId: 8c501e7e561b201a3a184923c0681d67049464a9
2021-03-31 02:05:33 +00:00
Alf Eaton
a5637651b5 Add Content-Security-Policy header (#3783)
* Add Content-Security-Policy header
* Add nonce attribute to script tags
* Use source-map for webpack devtool
* Add ng-csp attribute when CSP is enabled
* Allow overriding CSP settings with environment variables
* Hook into render and allow routes to disable the CSP header

GitOrigin-RevId: a873736a3514198165f1b2f1e18d002b65f20d30
2021-03-26 03:04:55 +00:00
Alf Eaton
974fe8fd39 Remove optional hyphens from pug templates (#3788)
GitOrigin-RevId: 2d31719a6aaefb85bba323d65ed66bdb06ec8928
2021-03-25 03:05:05 +00:00
Jakob Ackermann
58841ecbe9 Merge pull request #3765 from overleaf/jpa-xss-6
[views] mitigate Angular XSS in subscription dashboard

GitOrigin-RevId: 4ac0c431d520957aabd53436ae29a30c2aef3870
2021-03-18 03:04:34 +00:00
Jakob Ackermann
18eea6d024 Merge pull request #3763 from overleaf/jpa-xss-7
[views] mitigate XSS on new subscription page

GitOrigin-RevId: 74baa58527aa9b2f9e434c280885b627f73898b6
2021-03-13 03:05:14 +00:00
Thomas
2d8167fa0a Merge pull request #3675 from overleaf/tm-main-landmarks-a11y
Add main landmark roles to multiple templates

GitOrigin-RevId: 80ae851fae015b21a3210d71d04287c0c9a3024d
2021-03-05 03:05:00 +00:00
Alasdair Smith
dc9841cb69 Merge pull request #3723 from overleaf/as-fix-team-invite-xss
Prevent stored XSS on team invite page

GitOrigin-RevId: 0f79b96efcb86d121654a95da52da1c40550d3ae
2021-03-05 03:04:42 +00:00
Eric Mc Sween
e5c49ea19a Merge pull request #3681 from overleaf/em-group-plans
Configure group plans for additional licenses

GitOrigin-RevId: 57822de9f490505c4b083afa80220e4d5b4c7d23
2021-02-23 03:04:43 +00:00