Commit graph

128 commits

Author SHA1 Message Date
June Kelly
9702346edc Merge pull request #6628 from overleaf/jk-heartbeat-editor-type-metadata
Add editor metadata to editing-session pings

GitOrigin-RevId: f42be772c13f71380d59bae7c447645fe0e16a17
2022-03-02 09:02:34 +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
June Kelly
ef4e137676 Merge pull request #6610 from overleaf/jk-better-editing-heartbeat
[web] CM6: improvements to editor heartbeat

GitOrigin-RevId: b0e5379d221cba76c91d6d21863ca8355749d18e
2022-02-16 11:32:19 +00:00
Miguel Serrano
176ead8983 Primary Email Check (#6471)
* added primary-email-check page, route and controllers
* add `#add-email` internal link in settings to display new email form
* added primary-email-check redirection with split test
* update `lastPrimaryEmailCheck` when the default email address is set
* added `lastPrimaryCheck` to admin panel
* translations for primary-email-check
* acceptance tests for primary-email-check
* [web] multi-submit for primary email check
* Using `confirmedAt` to prevent from displaying primary-email-check page

Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
Co-Authored-By: Miguel Serrano <mserranom@gmail.com>
GitOrigin-RevId: d8e3a280439da08038a4487d8bfd7b3b0596e3b5
2022-02-04 09:03:34 +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
June Kelly
542207b6f9 Merge pull request #6488 from overleaf/ta-survey-future-remove
Remove Product Survey 2021

GitOrigin-RevId: 3db6686a951d192ef86c58ac99e8b3e40947c5b2
2022-01-28 09:03:28 +00:00
Tim Alby
bbac46156b convert price_in_unit to price_in_cents
GitOrigin-RevId: bae030e9c90f8286d6e6550744849984fe81f63d
2022-01-21 09:03:29 +00:00
Tim Alby
3e70546e18 rename price attributes to price_in_cents or price_in_unit
GitOrigin-RevId: 8045472c96862078583fcb522099ad78926281dc
2022-01-21 09:03:23 +00:00
Tim Alby
3dbd913d97 disambiguate between displayPrice and recurlyPrice
GitOrigin-RevId: 38f4c51b9834c417824c0093096767f50e998cb8
2022-01-21 09:03:16 +00:00
Tim Alby
e98084259a renames prices scope var into groupPlans
GitOrigin-RevId: ef53edd8f9b78eb13fb2d4bb488e30ee02858764
2022-01-21 09:03:11 +00:00
Tim Alby
0421fc58f1 remove old angular plans code
GitOrigin-RevId: 84a1173d300ab3ab2e77c0714b7a1315de59876c
2022-01-21 09:03:08 +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
Alf Eaton
50df230846 [web] Upgrade Prettier to match version in monorepo root (#6231)
GitOrigin-RevId: 02f97af1b9704782eee77a0b7dfc477ada23e34d
2022-01-11 09:03:23 +00:00
Timothée Alby
7c3002e608 Merge pull request #6190 from overleaf/ta-survey-future
Add Product Survey 2021

GitOrigin-RevId: 838380993688262f6541101c7ee2f8d85da4323e
2021-12-22 09:03:39 +00:00
Jakob Ackermann
0ee93793e3 Merge pull request #5641 from overleaf/jpa-survey-notification-2
[web] implement institutional leavers survey logic in frontend only

GitOrigin-RevId: e1002ee6f75ba3865c955eefa8482af0c72bb825
2021-11-03 09:03:28 +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
a6f05109a3 Merge pull request #5352 from overleaf/jpa-no-var
[misc] fix eslint violations for `no-var`

GitOrigin-RevId: c52e82f3a8a993b8662cc5aa56e7b95ca3c55832
2021-10-27 08:03:00 +00:00
Jakob Ackermann
2a935d7ab5 Merge pull request #5261 from overleaf/jpa-de-ng-more-complex-pages
[web] de-ng some of the complex pages

GitOrigin-RevId: 6c85bbf2d21cb2e8d3441202dfd299512bf71453
2021-09-30 08:03:53 +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
Timothée Alby
c5f883ad83 Merge pull request #5031 from overleaf/ab-paywall-events
Merge paywall-prompt and paywall-click events

GitOrigin-RevId: d567631d08b89565f9a3049f9b88cc2d14a799c1
2021-09-17 08:03:12 +00:00
Timothée Alby
cfd5a86184 Merge pull request #5045 from overleaf/ab-fix-event-property-errors
Cleanup event properties flagged in Human37 recommendation

GitOrigin-RevId: f09f06b86a38ddb430902ba71df4d1b002eaaec6
2021-09-17 08:03:09 +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
Hugh O'Brien
f7900b474b Merge pull request #4799 from overleaf/hb-eslint-rules
Re-enable some eslint rules

GitOrigin-RevId: 16153adb839bb61784bb40fbc8e43da281fe090d
2021-09-15 08:03:43 +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
June Kelly
8b9d202518 Merge pull request #4655 from overleaf/jel-gallery-event
Fix onclick event propagation

GitOrigin-RevId: bfcc3840e1768ed0f91e5fefbaee1738e36f6752
2021-08-13 12:57:55 +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
Thomas
be73463e35 Merge pull request #4248 from overleaf/tm-ta-new-subscription-currency-fixes
Fix getCurrencyCode behavior and add fallback in frontend for invalid currencies

GitOrigin-RevId: 5cc40b524148f88c0f110d2cf4bb4d3b69844f1b
2021-06-24 02:07:14 +00:00
Jakob Ackermann
41f2974612 Merge pull request #4189 from overleaf/ae-project-id
Fix id for newly-created projects in browser

GitOrigin-RevId: 75e8963163979fa11bbf581c2fcf541697346341
2021-06-15 02:06:00 +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
c634f51eee Merge pull request #4116 from overleaf/ab-paywall-prompt-events
Add paywall prompt events

GitOrigin-RevId: 6b1b3b384590f14828f37210b2e14047e2ee33d6
2021-06-11 02:05:54 +00:00
Eric Mc Sween
568e99ad47 Merge pull request #4125 from overleaf/em-analytics-keepalive
Use keepalive when sending analytics events

GitOrigin-RevId: c4e5884483313cdc67abe98e18852680692ac229
2021-06-04 02:08:19 +00:00
Jessica Lawshe
1b63923f8c Merge pull request #4075 from overleaf/jel-decaf-cleanup-algoliasearch
Decaf cleanup frontend using Algolia search

GitOrigin-RevId: bfe2ccde66c28569ea8d5d63fca9e2081aac3519
2021-05-28 02:08:50 +00:00
Jakob Ackermann
614734c3e1 Merge pull request #4100 from overleaf/ab-sub-page-click-event
Add event on subscription page upgrade button click

GitOrigin-RevId: 964eb6ad2d6ee7eceb3aac54501a61601d4948ac
2021-05-28 02:08:41 +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
70952906c9 Merge pull request #4043 from overleaf/as-clean-up-exposed-settings
Remove `exposedSettings` from `ApplicationContext`

GitOrigin-RevId: 02acd3a7cf36d184560ff6df13acff515da908fa
2021-05-20 02:05:05 +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
Miguel Serrano
bb88af80cf Merge pull request #3947 from overleaf/msm-reenable-eslint-rules
Reenable `eslint` rules

GitOrigin-RevId: a0aa5f941ba1bc49ff758b5256f91d696f442c6d
2021-05-14 02:09:45 +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
Miguel Serrano
f9871103bf Merge pull request #3949 from overleaf/msm-reenable-eslint-const-rule
Reenable eslint `prefer-const` rule

GitOrigin-RevId: 4f3825be8b8dff381095209085a36eaab76260d5
2021-05-06 02:09:14 +00:00
Alf Eaton
e9b93a6ef2 Merge pull request #3979 from overleaf/ae-exposed-settings
Remove exposed-settings.js

GitOrigin-RevId: 056526b6e5fb50c4fd8058338e894eed9a3a50f4
2021-05-05 02:10:00 +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
Alf Eaton
1be43911b4 Merge pull request #3942 from overleaf/prettier-trailing-comma
Set Prettier's "trailingComma" setting to "es5"

GitOrigin-RevId: 9f14150511929a855b27467ad17be6ab262fe5d5
2021-04-28 02:10:01 +00:00
Jakob Ackermann
4f8a905e9b Merge pull request #3909 from overleaf/jel-reconfirm-email-template
Add reconfirm email template

GitOrigin-RevId: 2488c79c25a7148f601e3e3e2021cdbee4be7b4c
2021-04-16 02:05:33 +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
Alf Eaton
1ebc8a79cb Merge pull request #3495 from overleaf/ae-prettier-2
Upgrade Prettier to v2

GitOrigin-RevId: 85aa3fa1acb6332c4f58c46165a43d1a51471f33
2021-04-15 02:05:22 +00:00
Alasdair Smith
93492bb25a Merge pull request #3908 from overleaf/jel-reconfirm-ui-meta-tags
Meta tag migration for reconfirm UI

GitOrigin-RevId: b0bda07acc5389b1d5ef4e9ea3d10688ac26f0a0
2021-04-15 02:05:09 +00:00
Alasdair Smith
2b154e273e Merge pull request #3898 from overleaf/as-fix-angular-service-arrow-function
Refactor Angular service method away from an arrow function

GitOrigin-RevId: a83d90d0d44a28d1b898aef0490084def3089f47
2021-04-15 02:04:57 +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