9eb84d6ad5
Merge pull request #24417 from overleaf/mf-implement-stripe-hosted-checkout-split-test
...
[web] Implement stripe hosted checkout with split test
GitOrigin-RevId: 25e5ff2a46135f402cdf479623ab38c858c5640c
2025-03-25 09:05:16 +00:00
84996ea88c
Implement checks for user eligibility when switching plans ( #24276 )
...
* Convert updateSubscription controller to async/await
* Move updateSubscription to subscription module
* Validate if user is eligible to change plan
GitOrigin-RevId: ce538429cd5a3b93acabdc046f1a8b164ac02301
2025-03-14 09:05:19 +00:00
7ec4cbd841
Merge pull request #24164 from overleaf/ds-group-discount-10-percent-february
...
Group plans - Reintroduce 10% discount for group plans (Part 1, 2 & 3 Combined)
GitOrigin-RevId: f3a59a65bbd300cc06f70e179e794c32ed7970ce
2025-03-11 09:05:50 +00:00
37dc516ea2
Merge pull request #24148 from overleaf/revert-24066-ds-group-discount-2
...
Revert "Group plans - Reintroduce 10% discount for group plans (part 2)"
GitOrigin-RevId: 2d8a8d117222daa997e4d0632a9e7235559a8b8c
2025-03-07 09:06:35 +00:00
3784061935
Merge pull request #24066 from overleaf/ds-group-discount-2
...
Group plans - Reintroduce 10% discount for group plans (part 2)
GitOrigin-RevId: ea5d600d901329944092daf560a015ac8ca10cd3
2025-03-07 09:06:05 +00:00
da3a24ad7e
Merge pull request #23721 from overleaf/jdt-hide-ai-for-paying-users-if-toggled
...
Hiding AI should hide assist for paying accounts
GitOrigin-RevId: 6a1ec76d648be2986241ee6e87d74ce69c7c4867
2025-02-28 09:05:32 +00:00
3851ee4eb2
Plans Group Size - Removing the 50 size ( #23851 )
...
* removing the group size 50
* removing the if condition for 20/50 groups
* running make cleanup_unused_locales
* removing instances of sizesForHighDenominationCurrencies and the related if conditions
* removing the price related to group size of 50 in different currencies
* fixing the test
* changing the 50 to 20 under faqs
* changing the remaining 50 to 20
* cleaning of variables
* removing extra variable
GitOrigin-RevId: 68f5d7df1eab29360e9c806ad844f1c900341c19
2025-02-28 09:04:51 +00:00
5d42e51d3e
Remove feature-flag bootstrap-5-subscription ( #23114 )
...
GitOrigin-RevId: 4a8dadb7e5ae65c2651b1eeb317bb43daca881c8
2025-02-17 09:05:02 +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
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
30335971cf
Merge pull request #23339 from overleaf/rh-pause-subscription-id
...
Fix recurly subscription id in pause-scheduled event
GitOrigin-RevId: 94838bddd53c9b9a051cae8252eca11b01e96c60
2025-02-04 09:05:06 +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
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
b9fb636f0b
[web] Remove promises exports from Controller modules ( #22242 )
...
* Remove promises object from CollaboratorsInviteController.mjs
* Define functions at root
* Remove mentions of undefined `revokeInviteForUser`
* Remove unused `doLogout`
* Remove promises object from UserController.js
* Remove unused `makeChangePreview`
* Remove promises object from SubscriptionController.js (`getRecommendedCurrency` and `getLatamCountryBannerDetails`)
* Remove promises object from CollabratecController.mjs
* Remove promises object from SSOController.mjs
* Remove promises object from ReferencesApiController.mjs
* Remove promises object from MetricsEmailController.mjs
* Remove promises object from InstitutionHubsController.mjs
* Remove promises object from DocumentUpdaterController.mjs
* Remove promises object from SubscriptionAdminController.mjs
* Fixup unit tests
* Add expects that controllers don't error
* Promisify `ensureAffiliationMiddleware`
GitOrigin-RevId: 311c8afa7d5c8e4f051408d305b6b4147a020edc
2025-01-17 09:05:36 +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
7994390967
[web] tear down group-pricing-2025 split test on non-plans pages ( #22785 )
...
* [web] rm split test from the change to group modal
* [web] rm split test from cancel flow
* [web] rm split test from checkout flow
* [web] rm unused translations
GitOrigin-RevId: 0188f2631ed18e79fdf55dabedac7cdea4f213d3
2025-01-16 09:05:22 +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
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
d488791474
[web] Update change plan flow for group-pricing-2025 ( #22532 )
...
GitOrigin-RevId: 23f6f5972b1d13b457c7c5e88f508b7cf022469a
2024-12-18 09:06:38 +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
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
da411733b6
Merge pull request #22119 from overleaf/kh-hotjar-on-plans-and-checkout
...
[web] add hotjar to plans pages
GitOrigin-RevId: eb582a85200747754923f28e7d710a9072577d75
2024-11-28 09:05:10 +00:00
b0c309e993
Merge pull request #22032 from overleaf/em-subscription-change-preview-404
...
Handle user without a subscription when asking for a change preview
GitOrigin-RevId: dab90720b292fd0cfb6dbb8a554797b9d2ac436b
2024-11-25 09:05:06 +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
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
d84d4dd093
Merge pull request #21937 from overleaf/em-total-per-year
...
Display "Total per year" for annual subscription change previews
GitOrigin-RevId: 90e6cd6ccc9f442b6ce1ec27f539202d2b6a7796
2024-11-19 09:05:14 +00:00
424fd5b591
Merge pull request #21839 from overleaf/em-subscription-change-preview-premium
...
Subscription preview for users with standalone AI add-on
GitOrigin-RevId: 636fa5aca8538bb95e79040d5c309dc505cfb17a
2024-11-19 09:05:09 +00:00
6c6ed06677
Merge pull request #21794 from overleaf/em-validate-plan-add-on
...
Add-on validation improvements
GitOrigin-RevId: 6812172fb431495ce34c2741c7c2c7c0d33685a6
2024-11-15 09:05:04 +00:00
5821dc7273
[web] Fix main branch linting error ( #21749 )
...
* Sync package-lock
I get this change when running `make install && bin/npm i`
* Add `featureUsage` to LoggedOutUser keys
We might want to change this to something like this:
```
export type NullifyProperties<T> = {
[P in keyof T]: undefined
}
export type LoggedOutUser = {
id: null
} & NullifyProperties<Omit<User, 'id'>>
```
* Revert "Sync package-lock"
This reverts commit 982466eba3f8d72a388d248b66658be0350b2d09.
* Remove `canceledSubscription` types for now
This is breaking the build at the moment. We can work on creating a `Request` that matches our usages of it
GitOrigin-RevId: bb21baba6a074c2169af786a9e56b33beddddd2f
2024-11-11 09:04:56 +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
aa9a246346
Merge pull request #20571 from overleaf/jdt-ai-addon-personal-upgrade
...
Enable purchasing an AI add-on for users on a monthly collaborator plan
GitOrigin-RevId: 988547bf6f01f7c1477191dd202df4448e376e5f
2024-10-14 11:09:04 +00:00
918d0f24eb
Merge pull request #20547 from overleaf/em-assist-plan
...
Add a button for buying standalone Overleaf Assist
GitOrigin-RevId: 50baea48ea990eba38ef564b71a79a76bbd45dfc
2024-09-30 08:04:52 +00:00
44103dd6a5
[web] Migrate /user/subscription/canceled to BS5 ( #20590 )
...
* [web] Initialize BS5 in subscription page
* [web] Backend wiring for `/user/subscription/canceled` to BS5
* [web] Backend `Canceled` to BS5
GitOrigin-RevId: 660458145c06e0d2dd1343186d31b6a7662b01a0
2024-09-26 08:05:04 +00:00
6b4c483269
[web] Migrate /user/subscription/thank-you to BS5 ( #20588 )
...
* [web] Initialize BS5 in subscription page
* [web] Backend wiring for `user/subscription/thank-you` to BS5
* [web] Update `SuccessfulSubscription` to BS5
GitOrigin-RevId: 45162664c116eb04b73e16443c84fa24ea8b220c
2024-09-26 08:04:59 +00:00
88196f8e38
[web] Initialize BS5 in subscription page ( #20476 )
...
GitOrigin-RevId: dacb283822eb4628f230a66f49af8bc9a2fa5dde
2024-09-26 08:04:46 +00:00
560aaecc5e
Revert "adding metadata object with robotsNoindexNofollow for plans-2 and pla…" ( #20323 )
...
This reverts commit 97fec521b19dac5af9cef9851f0ea145bd187b64.
GitOrigin-RevId: 6b86ee9feb0c6922bbdf3f5c3aa08c2d41b958ee
2024-09-09 08:05:14 +00:00
19295559c9
adding metadata object with robotsNoindexNofollow for plans-2 and plans-3 ( #20321 )
...
GitOrigin-RevId: 97fec521b19dac5af9cef9851f0ea145bd187b64
2024-09-09 08:05:05 +00:00
edd8a7211f
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
41e2d1bba7
Merge pull request #20005 from overleaf/mf-view-events-plans-page
...
[web] Implement plans page and interstitial payment page view events for plans redesign test
GitOrigin-RevId: 023338acffe149db93b37d94cf06e8102ffcff8f
2024-08-21 08:05:43 +00:00
9cf4cd36cf
Merge pull request #19942 from overleaf/mf-group-dropdown-connect-button-cta
...
[web] Connect license dropdown to CTA href and pricing header on new plans page group tab
GitOrigin-RevId: b3bdd05cc3efccc17883205de51232e31ee71c58
2024-08-16 08:04:53 +00:00
5065bb78ea
Merge pull request #19904 from overleaf/ds-plans-page-new-design-adding-geo-banners
...
Plans page new design - Implement geo banner for India and latin america users
GitOrigin-RevId: 4b0ca2e6e290672c5ae1f41cde904a4d48197a33
2024-08-15 08:05:58 +00:00
c636089939
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
a16db120c0
Implement free trial limits ( #19507 )
...
* Add additional validations for subscription trials
GitOrigin-RevId: 1cb821c62e02d3eaa5b2bcacaee63b6bc7a63311
2024-08-08 08:05:05 +00:00
3304aaddf3
Merge pull request #18962 from overleaf/mf-interstitial-payment-new-plans-page-config
...
[web] Implement website-redesign-plans split test config on interstitial payment page
GitOrigin-RevId: 6ea51d5f89ac6b633b5ce6dfbb81c258d668ce13
2024-07-15 09:04:53 +00:00
d80046c757
Delete unused code: planFeatures.js, this config should have been deleted on the first plans page redesign.
...
This config is superseded by `plansFeatures.js` that is imported by `plansConfig.js` which is directly used in the pug template.
GitOrigin-RevId: ae0a0e1ff7c8a64022ab378d17943fe4a7ed3b35
2024-06-14 08:05:03 +00:00
d35e11eaef
Merge pull request #18720 from overleaf/jel-begin-light-touch-plans
...
[web] Begin light touch redesign of plans page
GitOrigin-RevId: dda5ab1c0817371400f30f2e4d230f5c3a5728f4
2024-06-12 08:05:19 +00:00
M Fahru