Commit graph

61 commits

Author SHA1 Message Date
Eric Mc Sween
30e94eba32 Merge pull request #11444 from overleaf/em-price-increase-subscription-page
Fix copy when a pending subscription change is a price change

GitOrigin-RevId: 2ab3470f5eda5460bdf08f8464e42d6a7717d814
2023-01-26 09:04:30 +00:00
Davinder Singh
ec920ade78 Merge pull request #10563 from overleaf/ds-btn-success-to-btn-primary
replacing `btn-success` with `btn-primary`

GitOrigin-RevId: 77b90dbc4470bc059c40294b9764d1184f0b0bb8
2022-12-08 09:03:28 +00:00
Jessica Lawshe
024f6ee24e Merge pull request #10467 from overleaf/ds-btn-info-new-css-part-2
Updating`btn-info` to `btn-info-secondary` - part 2

GitOrigin-RevId: 934dd633494454277432810c4a1e70bb17829bd7
2022-11-18 09:05:51 +00:00
ilkin-overleaf
87b844aa15 Merge pull request #10438 from overleaf/ii-offer-personal-plan-on-cancellation
[web] Offer personal plan on subscription cancellation

GitOrigin-RevId: a7845fb3f7edc2f169ba237d8b822ff958a5c6a5
2022-11-16 09:06:18 +00:00
Timothée Alby
e48c23546e Merge pull request #8724 from overleaf/ta-subscription-contact-link
Link to Contact Page in Subscription Translations

GitOrigin-RevId: f255b0408cf4cf1e6e19cf8d3eebbe996327a598
2022-07-08 08:03:18 +00:00
M Fahru
d8fee0d91a Implement premium features discoverability for user subscription page with split test (#8355)
GitOrigin-RevId: c4bc01361a2d627f0a87f4ddeb8be8ed40f9acab
2022-06-23 08:02:58 +00:00
Thomas
3a1bba07f7 Merge pull request #8436 from overleaf/tm-update-wording-subscription-dashboard
Update wording on subscription dashboard

GitOrigin-RevId: 4739677fcf46e5de4db3e3fe2411f6ed9898aa2c
2022-06-21 08:03:08 +00:00
Thomas
6564147b0a Merge pull request #8142 from overleaf/tm-fix-recurly-double-submission
Fix plan change buttons not being disabled while request inflight

GitOrigin-RevId: a87c89ce6c9642a7988e2dfcc7ee6e3673c6128d
2022-05-26 08:04:12 +00:00
Thomas
35073d49dc Add error message on subscription dashboard if v1 is down (instead of returning a 500 error page) (#7947)
* Add error message on subscription dashboard if v1 is down

GitOrigin-RevId: 8c8b5ac4d44cfd2c42101efe1d55a5993ca21eea
2022-05-20 08:04:43 +00:00
Timothée Alby
62b662f07a Merge pull request #6561 from overleaf/tm-subscription-cancel-button-split-test
Update copy for subscription cancellation, in split test variant

GitOrigin-RevId: ab5847238b950099bf41b9d4c08f325ffce1051d
2022-02-16 11:34:08 +00:00
Tim Alby
3dbd913d97 disambiguate between displayPrice and recurlyPrice
GitOrigin-RevId: 38f4c51b9834c417824c0093096767f50e998cb8
2022-01-21 09:03:16 +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
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
Jessica Lawshe
379d9ac41c Merge pull request #4659 from overleaf/jel-em-duplicate-subscription-message
One Pro message per current commons institutions

GitOrigin-RevId: 21b74af8b9da1b6647a0384115f5d268b80e4bdf
2021-08-17 08:03:44 +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
Thomas
f7b96e86a7 Merge pull request #4034 from overleaf/tm-pending-subscription-addons
Display correct information when pending subscription has addons

GitOrigin-RevId: 7634ccf24788951507963b6d421fdb86e0dc38d5
2021-05-18 02:08:16 +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
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
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
Jessica Lawshe
e697064f16 Merge pull request #3834 from overleaf/tm-meta-tags-billing
[views] migrate subscription templates to meta tags

GitOrigin-RevId: 4e81e81380048436a011467c230cc54c02e0c423
2021-04-09 02:05:29 +00:00
Eric Mc Sween
5587de9cf5 Merge pull request #3833 from overleaf/em-meta-tags
Pass values to JS through meta tags

GitOrigin-RevId: f663a1b7fef4544b560574d21f59fdabaf617830
2021-04-01 02:05:44 +00:00
Simon Detheridge
3d48e1e027 Merge pull request #3799 from overleaf/tm-past-due-invoice-warning
Show warning if users Recurly account has past due invoices.

GitOrigin-RevId: 8c501e7e561b201a3a184923c0681d67049464a9
2021-03-31 02:05:33 +00:00
Alf Eaton
a5637651b5 Add Content-Security-Policy header (#3783)
* Add Content-Security-Policy header
* Add nonce attribute to script tags
* Use source-map for webpack devtool
* Add ng-csp attribute when CSP is enabled
* Allow overriding CSP settings with environment variables
* Hook into render and allow routes to disable the CSP header

GitOrigin-RevId: a873736a3514198165f1b2f1e18d002b65f20d30
2021-03-26 03:04:55 +00:00
Alf Eaton
974fe8fd39 Remove optional hyphens from pug templates (#3788)
GitOrigin-RevId: 2d31719a6aaefb85bba323d65ed66bdb06ec8928
2021-03-25 03:05:05 +00:00
Jakob Ackermann
58841ecbe9 Merge pull request #3765 from overleaf/jpa-xss-6
[views] mitigate Angular XSS in subscription dashboard

GitOrigin-RevId: 4ac0c431d520957aabd53436ae29a30c2aef3870
2021-03-18 03:04:34 +00:00
Eric Mc Sween
e5c49ea19a Merge pull request #3681 from overleaf/em-group-plans
Configure group plans for additional licenses

GitOrigin-RevId: 57822de9f490505c4b083afa80220e4d5b4c7d23
2021-02-23 03:04:43 +00:00
Hugh O'Brien
8d88b4ab5f Merge pull request #3574 from overleaf/hb-admin-improvements
Fix spacing issue on subscriptions page

GitOrigin-RevId: 7f071cb3050d93781c853a175512cd29caf9d594
2021-02-04 03:04:28 +00:00
Simon Detheridge
8e20258786 Merge pull request #3373 from overleaf/jpa-block-recurly-xss
[views] subscription: block angular template evaluation for emails

GitOrigin-RevId: 081314a387234dfe263b954a4206a0c8bba8b153
2020-11-10 03:04:14 +00:00
Jakob Ackermann
36f81a93b9 Merge pull request #3265 from overleaf/jpa-i18n-drop-html-from-vars
[misc] i18n: drop html from vars

GitOrigin-RevId: 3cf2aa5a70cc8710693c24bd4b65bddcd4ba09e8
2020-10-31 03:05:46 +00:00
Hugh O'Brien
8eab5a5f6f Merge pull request #3203 from overleaf/hb-new-personal-plan
New personal plan

GitOrigin-RevId: bd96e86bef35b618f492625c3a9ea41328390374
2020-10-14 02:05:07 +00:00
Timothée Alby
25b9243b3f Merge pull request #3115 from overleaf/msm-improve-student-subscription-dialog
Improve student subscription dialog

GitOrigin-RevId: 902e76612c5a6a419ca305ae37459438ad7f75eb
2020-08-19 02:06:29 +00:00
Timothée Alby
8cd6e7ccfc Merge pull request #3064 from overleaf/ta-manage-multiple-groups
Allow Users to Manage Multiple Groups

GitOrigin-RevId: c918da0114cdd1d679223f69d81159b4c2608874
2020-08-13 02:06:20 +00:00
Jessica Lawshe
cc46e33681 Merge pull request #2920 from overleaf/ta-custom-subscription-contact
Update Custom Subscription Wording

GitOrigin-RevId: a4582aadcae0689022ec0c74d4be4853c8cebf34
2020-06-19 02:10:27 +00:00
Jessica Lawshe
43a88a0939 Merge pull request #2806 from overleaf/jel-add-space-change-plan
Add a space before "Change plan"

GitOrigin-RevId: 99e39a65c251d5a09964891b3355b919b06df877
2020-05-07 03:28:23 +00:00
Paulo Jorge Reis
7f13e258bb Merge pull request #2697 from overleaf/pr-add-vat-number
Add VAT number and company name to the payment form

GitOrigin-RevId: 9ba2d7345f6f3cef1f7372e17c04243ab285e0bd
2020-04-30 03:19:59 +00:00
Miguel Serrano
e2bf647b81 Merge pull request #2763 from overleaf/ta-dot-dot-dot
Replace Triple-Dots with Ellipsis in Pug Files

GitOrigin-RevId: 408cea0772d8751acd8939e199e49e2cf9685b8f
2020-04-23 03:29:02 +00:00
Timothée Alby
f5e2983a6b Merge pull request #2609 from overleaf/ta-cmg-recurly-email-update
Add UI to Update Recurly Email

GitOrigin-RevId: 920a741fd9b4312f031bdd40e3d6bec48f1bd579
2020-02-21 04:21:12 +00:00
Timothée Alby
98f031e9aa Merge pull request #2619 from overleaf/ta-licence-attribute-fix
Read Licence Attribute from Affiliation Instead of Institution

GitOrigin-RevId: 2294222e2bd0da473a303d3ffdc5ddb7d856f7f7
2020-02-21 04:20:59 +00:00
Alasdair Smith
f2ad7ebfc3 Merge pull request #2429 from overleaf/as-move-deps-to-bundle
Move jQuery and Angular dependencies to bundle

GitOrigin-RevId: cee1507044438c8c435d934476f6ea6281215ccd
2019-12-17 04:22:53 +00:00
Eric Mc Sween
358cd22f54 Merge pull request #2087 from overleaf/subscription-invoices-link
Add Link to Invoices for Recurly Subscriptions

GitOrigin-RevId: dd3aa999c26988f2bd42b0db83dbfb0ce586a0a7
2019-08-20 12:59:58 +00:00
Timothée Alby
b9ab0edf69 Merge pull request #2015 from overleaf/ta-recurly-upgrade
Upgrade Recurly

GitOrigin-RevId: 9a7c4804d2fafa31ea634498359dbfd95416b2ae
2019-07-31 08:33:31 +00:00
Simon Detheridge
82672269c4 Merge pull request #1862 from overleaf/em-json-stringify
Globally apply StringHelper.stringifyJsonForScript()

GitOrigin-RevId: 82dc812a43a1e6f389471380a6a430c0a18dcec2
2019-06-17 15:14:25 +00:00
Timothée Alby
85e7f688d5 Display Pricing Exceptions on Subscription Dashboard (#1720)
Display Pricing Exceptions on Subscription Dashboard

GitOrigin-RevId: 31de89824db70b7af1f8704e6da592064ce44bfd
2019-04-23 14:35:21 +00:00
Timothée Alby
44ba16bb7c Fix Wording in Subscription Cancellation Flow (#1723)
Fix Wording in Subscription Cancellation Flow

GitOrigin-RevId: 27b89982d0ac9d4bc9e9b985df2dd515253a1368
2019-04-23 14:35:14 +00:00
Alasdair Smith
41f75b5936 Merge pull request #1543 from sharelatex/as-fix-potential-angular-xss
Fix potential Angular XSS issues

GitOrigin-RevId: a18a609a25b29e910cb78e28a37398417cfe4842
2019-03-18 10:37:15 +00:00
Timothée Alby
72ae3f3aa5 Merge pull request #1601 from sharelatex/hb-metrics-email-bugfixes
Fixes for unsubscribing from metrics email

GitOrigin-RevId: 7d7ae79275d6216ef2b44d2e75c51fabf460ef65
2019-03-11 11:07:20 +00:00
Hugh O'Brien
491c29bad1 Merge pull request #1569 from sharelatex/hb-v2-metrics-email-opt-out
v2 metrics email opt out and last sent tracking

GitOrigin-RevId: d45ac653c26e780dc380883c0ac1da7436bf8c2b
2019-03-11 11:03:39 +00:00
Chrystal Maria Griffiths
9abea8ae5f Merge pull request #1516 from sharelatex/as-sanitize-team-notice
Show sanitized HTML for team notice on subscription page

GitOrigin-RevId: 20256eed298a709d663bdfd0057e0d8462722a0c
2019-02-15 13:33:28 +00:00
Chrystal Maria Griffiths
2463fef390 Merge pull request #1454 from sharelatex/hb-subscriptions-page-messaging
Subscription page messaging updates

GitOrigin-RevId: c29999d22636dfe11c55b3f6110a38992645fad3
2019-02-04 16:24:35 +00:00