eb5417fad5
Merge pull request #23462 from overleaf/ls-update-pricing-logic-for-small-educational-plans
...
Update pricing logic for small educational plans
GitOrigin-RevId: 0051f238ce50b2067b7dc75d08f55dc1c7ac3502
2025-02-10 09:05:11 +00:00
735fd761cd
Merge pull request #23372 from overleaf/ls-update-pricing-logic-for-seats-adding
...
Update pricing logic for seats adding
GitOrigin-RevId: 8312941c88ade2e5ee83c806939628714880b416
2025-02-07 09:05:55 +00:00
8421bcc5d2
Merge pull request #23415 from overleaf/ii-flexible-group-licensing-manually-collected
...
[web] Manually collected subscriptions with flexible licensing
GitOrigin-RevId: ca7cf2abf5cfa1d873614bf3407fb5a259a78a76
2025-02-07 09:05:28 +00:00
4a927e45a6
Merge pull request #23117 from overleaf/ii-flexible-group-licensing-subscription-page
...
[web] Subscription page for flexible licensing
GitOrigin-RevId: 8f2fab1fc01e27063d716a86add66b1b9a72cbe6
2025-02-05 09:05:54 +00:00
16130b79db
Merge pull request #23203 from overleaf/ii-flexible-group-licensing-no-billing-details
...
[web] FL handle subscriptions with missing billing info
GitOrigin-RevId: 34209299c039992a80da5739e086beb5d0ede7b0
2025-02-05 09:05:50 +00:00
72be034435
Merge pull request #23263 from overleaf/ii-flexible-licensing-subscription-group-handler
...
[web] FL check subscription existence
GitOrigin-RevId: b564d681245137955a8f1e7367b9bd1a6b404268
2025-02-05 09:05:45 +00:00
fb8794921e
Merge pull request #23314 from overleaf/ls-update-group-plan-upgrade-mapping
...
Update group plan upgrade mapping
GitOrigin-RevId: aca3d986477dbcf0561635dfd771413a2ba1ef15
2025-02-05 09:05:41 +00:00
667b97664c
Merge pull request #23366 from overleaf/ii-flexible-licensing-add-seats-for-all-legacy-plans
...
[web] Add seats feature for smaller groups
GitOrigin-RevId: 7b0d1ea61eaaf603610d5fd8df399c00d328be70
2025-02-05 09:05:32 +00:00
229cae771e
Merge pull request #23259 from overleaf/kh-rm-dead-manager-code
...
[web] remove unused functions to support legacy read/write link sharing
GitOrigin-RevId: 504c1eb721caa7131ed685b1e0fa5e0d0b460888
2025-02-04 09:04:29 +00:00
347cade55f
Merge pull request #23177 from overleaf/rh-pause-tracking
...
Add tracking for subscription-pause-scheduled event
GitOrigin-RevId: 802899e53d22f2be49f2d20adb45a4a47d0f6beb
2025-01-31 09:04:53 +00:00
6245e81f42
Merge pull request #22518 from overleaf/ii-flexible-group-licensing-add-seats-legacy
...
[web] Unlock self-served license purchasing for legacy plans
GitOrigin-RevId: bf3083d00a77417f0e78d2145f6192c57b163273
2025-01-29 09:05:25 +00:00
d893bb76cf
Merge pull request #22816 from overleaf/enable-group-plan-upgrade-for-legacy-plans
...
Enable group plan upgrade for legacy plans
GitOrigin-RevId: 9dde0371eeb791a6331ab50733fd457e28837ba9
2025-01-29 09:05:13 +00:00
eba4418672
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
0bbe4b2e5a
[web] show monthly rates on group plans ( #23019 )
...
GitOrigin-RevId: e500869be9def2c150b4773f2f18883021ab356b
2025-01-24 09:05:26 +00:00
ad096f82bf
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
da6f332269
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
292308d546
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
4150baefcb
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
ef5a52b29d
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
2ef5db2938
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
84413c991d
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
48c0aaf940
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
7a48061d31
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
8e7f1d5e89
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
5f11200f67
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
c898e3f323
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
bd967ce1df
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
dfea9dacab
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
932f395932
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
ab4d8fe168
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
c4e0294d36
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
e2478d14f1
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
ac8d8d6edc
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
6e39885fde
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
58e34617bc
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
ab36c80a26
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
087b612e16
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
53d84efb3a
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
a6deee4961
Revert "[web] Prevent subscription downgrades ( #19895 )" ( #21779 )
...
This reverts commit b0ff548b4e1bf5843a96885b3176fdf11a49a2e1.
GitOrigin-RevId: b01c0800c62b83da8db2e01fc1fb6ca09e099c4d
2024-11-12 09:05:14 +00:00
1b80f172d7
[web] Prevent subscription downgrades ( #19895 )
...
* Notify support when subscription deletion skipped
GitOrigin-RevId: b0ff548b4e1bf5843a96885b3176fdf11a49a2e1
2024-11-12 09:05:00 +00:00
4d8a6c5c9d
[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
6345ec3b04
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
5462fcd128
[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
29be4f66d4
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
1547325073
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
1acb0d1bcd
Merge pull request #21274 from overleaf/em-recurly-client
...
Separate Recurly business logic
GitOrigin-RevId: 9c3b5ce61bdc7a6a5d3f507a31dc8919c882e476
2024-10-31 09:05:00 +00:00
2bfb55a305
Update tests
...
GitOrigin-RevId: 9272720e0f6865c54257c43bd98d8e6003251aa2
2024-10-17 08:06:17 +00:00
2f96ef11f9
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
e61b157666
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
5b1c0c5008
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
Liangjun Song