Commit Graph

241 Commits

Author SHA1 Message Date
Liangjun Song
f2f238be99 Merge pull request #23060 from overleaf/ls-support-new-group-plan-in-redesigned-checkout-page
Support new group plan in the redesigned checkout page

GitOrigin-RevId: 2564477b36ee93ca4b4b6dd8210f140a3104c6ed
2025-01-29 09:05:09 +00:00
Kristina
8dd88c6668 [web] show monthly rates on group plans (#23019)
GitOrigin-RevId: e500869be9def2c150b4773f2f18883021ab356b
2025-01-24 09:05:26 +00:00
roo hutton
c1b8bfd73c Merge pull request #21905 from overleaf/rh-pause-sub
Add support for pausing subscription

GitOrigin-RevId: f939ea4e7f3c2b1fa16dcb8aff1b2460d091d4e2
2025-01-23 09:06:04 +00:00
M Fahru
39fdc71cf5 Merge pull request #22821 from overleaf/kh-cop-on-upgrade-modal
[web] limit COP group plans to 20 seats in upgrade modal

GitOrigin-RevId: b1d2713b978d0269892d8f547eeccc5ab702ea77
2025-01-16 09:06:37 +00:00
M Fahru
c6ed326b28 Merge pull request #22540 from overleaf/mf-remove-plans-page-default-variant-code
[web] Remove dead backend (include pug template) code after `website-redesign-plans` test has been concluded and `new-design` variant is fully activated

GitOrigin-RevId: 143129da71d43b88535f971b13e9e72c98bad798
2025-01-15 09:05:06 +00:00
M Fahru
b5ba545402 Merge pull request #22539 from overleaf/mf-move-plansbanners-helper-to-module
[web] Move "plansBanners" function (along with its tests) to subscription module

GitOrigin-RevId: a231ecd862e7f052ca2597eb07d6612b23f2c7d3
2025-01-15 09:05:01 +00:00
M Fahru
9ffcb9eaee Merge pull request #22493 from overleaf/mf-remove-website-redesign-plans-test-config
[web] Remove `website-redesign-plans` test config from acceptance test and redirection tests from unit tests

GitOrigin-RevId: f1b30231be06748726ec2921fe23deadf2a701b6
2025-01-15 09:04:57 +00:00
M Fahru
8f21f58ad5 Merge pull request #22340 from overleaf/mf-clean-up-currency-format-test
[web] Clean up localized currency format test (`local-ccy-format-v2`)

GitOrigin-RevId: 30d671479522b87ee9205994508b745d2b0ae4c3
2025-01-14 09:05:49 +00:00
Miguel Serrano
59272a1c4a Merge pull request #21677 from overleaf/msm-register-hide-sso-login
[web] Hide 'Login with SSO' when accepting SSO group invite

GitOrigin-RevId: fd4c327bbb838209773b4e7b1c41f6e3a355ad8b
2025-01-10 09:06:00 +00:00
ilkin-overleaf
663785ac6f Merge pull request #22578 from overleaf/ii-fl-add-seats-upgrade-plan-link
[web] Add seats "Upgrade my plan" link

GitOrigin-RevId: 7c72101be6b22feee9e3fb2ec119336e0e092ca9
2024-12-19 09:05:01 +00:00
Liangjun Song
d51b8f7fd1 Merge pull request #22584 from overleaf/ls-test-for-group-subscription-upgrade
Add tests for group subscription upgrade

GitOrigin-RevId: 0718dd420930d56602831f127494102045cb6cfc
2024-12-19 09:04:56 +00:00
ilkin-overleaf
1be593f612 Merge pull request #22448 from overleaf/ii-flexible-group-licensing-add-seats-tests
[web] Add seats tests

GitOrigin-RevId: 76fb5edc6eba5579fac2d3e05cd1f64fba16046c
2024-12-18 09:05:12 +00:00
Eric Mc Sween
060d952858 Merge pull request #22386 from overleaf/em-remove-v1-subscription-checks
Remove v1 subscription checks

GitOrigin-RevId: 32962e8a88e98c120c5c58a061f293205c14dc3a
2024-12-11 09:04:31 +00:00
M Fahru
ff7bd5718b Merge pull request #22304 from overleaf/mf-clean-up-latam-v2-test
[web] Tear down LATAM geo-pricing v2 split test

GitOrigin-RevId: ca379c7ace5600aa31559c82e166c7ea67c6c26d
2024-12-10 09:05:22 +00:00
ilkin-overleaf
adb6ccf463 Merge pull request #22379 from overleaf/ls-sync-with-recurly-after-mutation
sync with recurly after mutate subscription

GitOrigin-RevId: 451914f7bde344f82ad4523bee20f1af2297cbd8
2024-12-10 09:04:55 +00:00
Liangjun Song
046c70c01c Merge pull request #22146 from overleaf/ls-consider-flexible-licensing-on-payment-page
support new group plans in checkout flow

GitOrigin-RevId: ec6aff363e0eeb5d82067cea44479b5045258490
2024-12-06 09:05:43 +00:00
Liangjun Song
3351ac3dc8 Merge pull request #22184 from overleaf/ls-group-plan-upgrade-page
Group plan upgrade page

GitOrigin-RevId: 6c99173c013d84943276dbd43f468026c4d44558
2024-12-06 09:05:38 +00:00
ilkin-overleaf
450b38bfd5 Merge pull request #21841 from overleaf/ii-flexible-group-licensing-add-seats
[web] Add seats to a group plan

GitOrigin-RevId: 53497d2cb7aa7d1e7dc8291e391b24f7a32eeece
2024-12-06 09:05:13 +00:00
M Fahru
5b3500f978 Merge pull request #22027 from overleaf/mf-activate-plans-page-new-design-variant
[web] Activate plans page new-design variant for all users

GitOrigin-RevId: 7da3c973cded8597cadd691f5d6e928d31e8d26f
2024-12-05 09:05:18 +00:00
Eric Mc Sween
490c79791e Merge pull request #22224 from overleaf/em-group-ai-add-on
Give the Error Assistant to group admins with Error Assist

GitOrigin-RevId: 832d78968977a7c6f17a3a3c8409c506d96fdd48
2024-12-05 09:05:03 +00:00
Liangjun Song
b691c26e59 Merge pull request #21957 from overleaf/ls-compute-immediate-charge-for-subscription-update
compute immediate charge for subscription update

GitOrigin-RevId: 4e5162660b26e6e9db69827a59aa8e0048fa7d5d
2024-11-22 09:05:12 +00:00
Eric Mc Sween
63c20826da Merge pull request #21959 from overleaf/em-redeploy-ai-add-on-prs
Redeploy AI add-on PRs

GitOrigin-RevId: d234ac0862947e9ea8926055ad205e32a456dd2e
2024-11-21 09:04:57 +00:00
Eric Mc Sween
473b07c3f2 Merge pull request #21935 from overleaf/em-recurly-event-ai-add-on
Add an hasAiAddOn property to Recurly events sent to analytics

GitOrigin-RevId: a3cfc706001bab3ef06bfaf64d69533b1bc9840a
2024-11-21 09:04:53 +00:00
Eric Mc Sween
bf073279f7 Merge pull request #21954 from overleaf/em-revert-ai-add-on-deploy
Revert faulty AI add-on deploy

GitOrigin-RevId: 923ec89f01d4951596f83fcf58b820c39db1e54a
2024-11-19 09:05:27 +00:00
Eric Mc Sween
db1dd8762a Merge pull request #21869 from overleaf/em-repurchase-add-on
Repurchase the AI add-on when changing plans

GitOrigin-RevId: 1035e57af4c254fc73464f14010e4ba7e18cfe80
2024-11-19 09:05:18 +00:00
Miguel Serrano
9d46335825 Revert "[web] Send email to support when skipping deleting pro group subscrip…" (#21780)
This reverts commit 8a4abe0742ab6a1c6b15bb17b5cc4863a11010b2.

GitOrigin-RevId: 2b91b8a127d195f4297fe99653fb69664b2a91a7
2024-11-12 09:05:18 +00:00
Miguel Serrano
acb6f0b049 Revert "[web] Prevent subscription downgrades (#19895)" (#21779)
This reverts commit b0ff548b4e1bf5843a96885b3176fdf11a49a2e1.

GitOrigin-RevId: b01c0800c62b83da8db2e01fc1fb6ca09e099c4d
2024-11-12 09:05:14 +00:00
Miguel Serrano
cfcf3605f2 [web] Prevent subscription downgrades (#19895)
* Notify support when subscription deletion skipped

GitOrigin-RevId: b0ff548b4e1bf5843a96885b3176fdf11a49a2e1
2024-11-12 09:05:00 +00:00
Jessica Lawshe
9eb50e2e99 [web] Send email to support when skipping deleting pro group subscription (#19971)
* Move group SSO enabled check up

So that we have this available when managed users is enabled. This will be useful in the following commit.

* Notify support when subscription deletion skipped

* Fix rebase conflicts

---------

Co-authored-by: mserranom <mserranom@gmail.com>
GitOrigin-RevId: 8a4abe0742ab6a1c6b15bb17b5cc4863a11010b2
2024-11-12 09:04:48 +00:00
ilkin-overleaf
e7938e935c Merge pull request #21712 from overleaf/ii-flexible-group-licensing-confirmation-page
[web] Request confirmation page for flexible licensing

GitOrigin-RevId: 855dcbd46c645da75b8c641f0c49670b2e04df3f
2024-11-12 09:04:35 +00:00
Antoine Clausse
6b147c3775 [web] Set layout-react in Subscription pages (#21529)
* Update `User` type

* Set `layout-react`: `subscriptions/successful-subscription-react`

* Set `layout-react`: `subscriptions/canceled-subscription-react`

* Set `layout-react`: `subscriptions/dashboard-react`

* Set `layout-react`: `subscriptions/team/invite-managed`, `subscriptions/team/invite`, `subscriptions/team/invite_logged_out`

* Set `layout-react`: `subscriptions/team/group-invites`

* Add `header-footer-react` to subscription/base.js

* Fix: Replace `date-type` by `data-type`

* Fix SubscriptionControllerTests

GitOrigin-RevId: b9049a9093a700b3be1bf33809e3a1494022350a
2024-11-11 09:04:32 +00:00
Eric Mc Sween
697cea029c Merge pull request #21556 from overleaf/em-subscription-change-interstitial
Add-on purchase preview page

GitOrigin-RevId: 660e39a94e6112af020ea783d6acf01a19432605
2024-11-07 09:04:49 +00:00
M Fahru
cb6ff77fe0 Merge pull request #21377 from overleaf/mf-add-countryCode-to-view-plans-and-interstitial-page-new
[web] Add missing `countryCode` in new-design plans page and all variants of the interstitial payment page

GitOrigin-RevId: e3a410e89a6745d042f9747a01960618eb622733
2024-11-01 09:05:36 +00:00
Eric Mc Sween
5c7ba98c6b Merge pull request #21274 from overleaf/em-recurly-client
Separate Recurly business logic

GitOrigin-RevId: 9c3b5ce61bdc7a6a5d3f507a31dc8919c882e476
2024-10-31 09:05:00 +00:00
Andrew Rumble
46e22c2021 Update tests
GitOrigin-RevId: 9272720e0f6865c54257c43bd98d8e6003251aa2
2024-10-17 08:06:17 +00:00
andrew rumble
9c2bbb39ad Allow ESM OL modules to be loaded
Lots of changes to async/await required to allow this. We have to make
some changes to handle the fact that modules are loaded async in stages
rather than sync (so we can't control when top-level functionality is
run in a fine grained way)

GitOrigin-RevId: 0127b15bfc4f228a267df3af8519c675e900654e
2024-10-14 11:04:32 +00:00
Jakob Ackermann
21e1b1e87a Merge pull request #20348 from overleaf/jpa-disable-bull-pro
[web] provide stub interface for bull queues in Server Pro/CE

GitOrigin-RevId: 014cf1a87c266fd760ff3c2bd493689bbf16e637
2024-09-26 08:04:51 +00:00
andrew rumble
08879f8f45 Fix use of fake ObjectIds in tests
12 character strings are no longer valid see:
https://github.com/mongodb/js-bson/releases/tag/v6.0.0 (Strings of
length 12 can no longer make an ObjectId)

GitOrigin-RevId: 2590c10915c50b951f991b2cf161d80235e445ca
2024-09-24 08:06:23 +00:00
Jessica Lawshe
1c45d444bf Merge pull request #20288 from overleaf/jel-plans-query-params
[web] Redirect to plans variants with query params

GitOrigin-RevId: cdfb4cd02bd5aca01c0912196badf3fe38e12a38
2024-09-06 08:05:48 +00:00
Thomas
d78bffcf2b Merge pull request #20034 from overleaf/tm-collab-limit-edit-invites
Enforce collaborator limit when accepting project invites

GitOrigin-RevId: 94f281113fe7c7b6d0a5ef43e11ab579400d9e56
2024-08-22 14:01:30 +00:00
Jessica Lawshe
e4b93e87b8 Merge pull request #20004 from overleaf/jel-plans-tests
[web] Add unit tests for new plans page

GitOrigin-RevId: 8e5978d901d9faf123efbdd21ece65aad373cd94
2024-08-22 08:05:35 +00:00
andrew rumble
b00d1336d4 Switch to mongodb-legacy
GitOrigin-RevId: 11e09528c153de6b7766d18c3c90d94962190371
2024-08-21 08:04:24 +00:00
Jessica Lawshe
bb9c0c533b Merge pull request #19822 from overleaf/jel-plans-notifications
[web] Show geo banners on light touch redesign of plans page

GitOrigin-RevId: 08ee6827cc16ec9326e5dbb1a165602be9cfe86d
2024-08-13 08:04:38 +00:00
Thomas
e4620cc414 Implement free trial limits (#19507)
* Add additional validations for subscription trials

GitOrigin-RevId: 1cb821c62e02d3eaa5b2bcacaee63b6bc7a63311
2024-08-08 08:05:05 +00:00
andrew rumble
48e9954686 Upper-case for all methods
This is required by the fetch-api.

GitOrigin-RevId: 641c63ad2fe6b9d01c48c28faf669051de8f3271
2024-08-01 08:05:11 +00:00
andrew rumble
d3561ec3cd Upper case PUT for consistency
GitOrigin-RevId: e3ce6b652ee9cee8a719b56d0dddda2faf575968
2024-08-01 08:05:06 +00:00
andrew rumble
7ed9196420 Fix typos
GitOrigin-RevId: 69477e3d95db2862f745f43d97a6f98430a1973c
2024-08-01 08:05:01 +00:00
andrew rumble
63cb44a4e7 Switch request out for fetch
GitOrigin-RevId: b011976084d113c250b002c1bae23f6b38a3281c
2024-08-01 08:04:52 +00:00
andrew rumble
ffe6d63c22 Switch to using status over statusCode
This is a difference in the request/fetch APIs.

GitOrigin-RevId: bde9adcf4de2ceaabfd9baae7a93bf2b0b5e5a1e
2024-08-01 08:04:47 +00:00
andrew rumble
08a08c0905 Fix typo in name of method
GitOrigin-RevId: fe8a2bcf5e577c001c4508b7bb010e1738ccc903
2024-08-01 08:04:42 +00:00