Kristina
8e6d1d5f07
Merge pull request #25732 from overleaf/kh-stripe-preview-addon-purchase
...
[web] add support for previewing add-on changes for Stripe
GitOrigin-RevId: 46e7d0b96bf0935a4a3afcaf03d7a6f3c26d2108
2025-05-22 08:07:20 +00:00
Domagoj Kriskovic
ab37e18bc3
Update AI Assist wording on checkout page if not in rollout ( #25689 ) ( #25733 )
...
* Update AI Assist wording on checkout page if not in rollout
* update wording when buyin addon
GitOrigin-RevId: 7133b4fd3efac8e8a7361dcc15d54367f809f16d
2025-05-20 08:05:36 +00:00
Kristina
dbb528762e
[web] add support for previewing base plan changes for Stripe ( #25619 )
...
GitOrigin-RevId: 458eeac52bc5fc010b9749f6fcd48350aa792582
2025-05-20 08:05:31 +00:00
Domagoj Kriskovic
996c407393
Revert "Update AI Assist wording on checkout page if not in rollout ( #25689 )" ( #25726 )
...
This reverts commit 20a90b14e97b1a8837e8be697c1a9666ed15a1c3.
GitOrigin-RevId: 26d4ad8f1b3a7dbe884dfbe4f4be5ee632abed1e
2025-05-19 12:26:35 +00:00
Domagoj Kriskovic
d7ef7f0399
Update AI Assist wording on checkout page if not in rollout ( #25689 )
...
* Update AI Assist wording on checkout page if not in rollout
* update wording when buyin addon
GitOrigin-RevId: 20a90b14e97b1a8837e8be697c1a9666ed15a1c3
2025-05-19 12:26:26 +00:00
Jimmy Domagala-Tang
82e5b2c5d7
Merge pull request #25151 from overleaf/dk-use-user-features
...
UserFeaturesContext with cross-tab syncing via BroadcastChannel
GitOrigin-RevId: 4262719f5018f5717211851ce28b3255af65461a
2025-05-13 08:07:57 +00:00
ilkin-overleaf
2ccdb74d20
Merge pull request #25318 from overleaf/ii-flexible-licensing-manually-collected-3
...
[web] Add seats feature for manually collected subscriptions improvements
GitOrigin-RevId: 4fbd93097590d97ad6464d1988471a78bf7cb9e2
2025-05-09 08:05:07 +00:00
ilkin-overleaf
1a8c549389
Merge pull request #24412 from overleaf/ii-flexible-licensing-manually-collected-2
...
[web] Add seats feature for manually collected subscriptions
GitOrigin-RevId: f7cc6f8ce17163f10e175a06bb471de6e3a96e3c
2025-04-30 08:05:00 +00:00
Domagoj Kriskovic
53c34b5726
Add "referrer" tracking to payment flows for AI assist ( #25002 )
...
* Add "referrer" tracking to payment flows for AI assist
* move sendMB call
* fix conflict
GitOrigin-RevId: 0c4480816d5fe525a87223c0b1827093d853d474
2025-04-29 08:05:41 +00:00
Kristina
6166a51552
Merge pull request #24922 from overleaf/kh-add-customer-portal-links
...
[web] add stripe customer portal link
GitOrigin-RevId: 6baaf51d4dd89ef779229ad17603529db06cf396
2025-04-24 08:05:44 +00:00
Jimmy Domagala-Tang
f95bf41824
Merge pull request #24697 from overleaf/jdt-show-addons-via-wf
...
Display When Ai Assist Is Granted Via Writefull
GitOrigin-RevId: 91f6e1843e2e1d1f7b3a49d95f31603e838c5545
2025-04-23 08:05:30 +00:00
Kristina
9f22564ca3
Merge pull request #24680 from overleaf/kh-rename-recurly-namespace
...
[web] rename recurly namespace
GitOrigin-RevId: b7cfd26923d47bd7f3de4140be24d2d1ef20f6c8
2025-04-11 08:05:20 +00:00
Jimmy Domagala-Tang
f7f4a03abb
Merge pull request #24523 from overleaf/jdt-prevent-bundle-dbl-buys
...
Redirect bundle purchases when users already have it
GitOrigin-RevId: d8e3c0256db08c08c2be24f38caef91fb26b90e8
2025-04-10 08:06:28 +00:00
ilkin-overleaf
61ce012fb5
Merge pull request #24430 from overleaf/ii-flexible-group-licensing-tear-down-feature-flag
...
[web] Tear down flexible group licensing feature flag
GitOrigin-RevId: 181713f1f2371b51cbc4256debea59bbcf3668f3
2025-03-31 08:04:42 +00:00
M Fahru
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
Thomas Mees
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
Davinder Singh
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
Davinder Singh
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
Davinder Singh
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
Jimmy Domagala-Tang
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
Davinder Singh
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
Antoine Clausse
5d42e51d3e
Remove feature-flag bootstrap-5-subscription ( #23114 )
...
GitOrigin-RevId: 4a8dadb7e5ae65c2651b1eeb317bb43daca881c8
2025-02-17 09:05:02 +00:00
ilkin-overleaf
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
ilkin-overleaf
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
roo hutton
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
roo hutton
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
roo hutton
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
Antoine Clausse
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
M Fahru
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
Kristina
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
M Fahru
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
M Fahru
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
Kristina
d488791474
[web] Update change plan flow for group-pricing-2025 ( #22532 )
...
GitOrigin-RevId: 23f6f5972b1d13b457c7c5e88f508b7cf022469a
2024-12-18 09:06:38 +00:00
Eric Mc Sween
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
M Fahru
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
M Fahru
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
Kristina
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
Eric Mc Sween
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
Liangjun Song
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
Eric Mc Sween
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
Eric Mc Sween
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
Eric Mc Sween
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
Eric Mc Sween
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
Eric Mc Sween
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
Antoine Clausse
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
Antoine Clausse
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
Eric Mc Sween
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
M Fahru
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
Jimmy Domagala-Tang
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
Eric Mc Sween
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