Commit Graph

808 Commits

Author SHA1 Message Date
Rishabh
1ca383df5d Updated default free price fixture
refs https://github.com/TryGhost/Team/issues/648

We use sentence case everywhere for labels, the default description for free price should be the same
2021-05-10 23:05:02 +05:30
Rishabh
bc79df66e8 Added sorted prices in Portal plans UI
refs https://github.com/TryGhost/Team/issues/641

Updated prices list to be sorted on `currency` -> `amount` which is consistent with price list on Admin.
2021-05-10 23:05:02 +05:30
Rishabh
e9d8f25773 Updated old members data attribute handling for custom prices
refs https://github.com/TryGhost/Team/issues/643

With custom products and prices, the old data attributes for members functionality - `data-members-plan` - was still using the plan name for checkout session which won't work as it now expects a price ID. This change reworks how we setup to listen to `data-members-*` attributes and moves them inside App.js so they can work with API data fetched from site settings and use the price ID for the `monthly` and `yearly` names as fallback.
2021-05-10 23:05:02 +05:30
Rishabh
12500c3b95 Added fallback discount description
refs https://github.com/TryGhost/Team/issues/671

When turning on custom products, existing sites should have default price description that retains current behaviour. This change adds custom description with discount value for Yearly Plans to keep the existing behavior for sites that mimic the old setup.
2021-05-10 23:05:02 +05:30
Rishabh
9f154dbcd2 Added free price details handling
refs https://github.com/TryGhost/Team/issues/637

Since we allow setting custom name and description for free price now, this wires up the values for free membership price settings to API
2021-05-10 23:05:02 +05:30
Rishabh
b73fdf66d1 Added interval fallbacks for monthly/yearly plans
refs https://github.com/TryGhost/Team/issues/643

Previously, we always expected `Monthly` or `Yearly` prices to be available for attribtues/links as those were the only prices allowed in Portal. With custom prices, as prices can have dynamic names, we still support Monthly/Yearly prices for backwards compatibility.

The way Monthly/Yearly prices are determined with custom prices is first trying to find the first price by the name same as `Monthly` / `Yearly`, followed by finding a plan having interval `month`/`year`. This gives us the best possible window to continue supporting Monthly/Yearly till all themes have time to adapt to custom prices
2021-05-10 23:05:02 +05:30
Rishabh
815e00c761 Handled custom prices query in links/attributes
refs https://github.com/TryGhost/Team/issues/643

Previously, Portal only worked with hardcoded `Monthly` and `Yearly` plans as those were the only possible prices available to members. With custom prices and products, Portal is now expanded to work with any number of custom prices as well as allow links/attributes for them to work via IDs.

Also, to continue backwards compatibility with Monthly/Yearly, Portal will support their data attributes/links, finding the first relevant Monthly/Yearly plan by nickname, falling back on interval if needed.
2021-05-10 23:05:02 +05:30
Rishabh
811067b7a7 Added product name and description to title 2021-05-10 23:05:02 +05:30
Peter Zimon
d52f054410 Added product description to signup 2021-05-10 23:05:02 +05:30
Rishabh
3358847e78 Updated fixtures for preview mode 2021-05-10 23:05:02 +05:30
Rishabh
33308c61b5 Updated fixtures
no refs
2021-05-10 23:05:02 +05:30
Peter Zimon
fb772638b0 Refined price alignment and sizes 2021-05-10 23:05:02 +05:30
Peter Zimon
d49b3f40e7 Refined price name and value alignment 2021-05-10 23:05:02 +05:30
Peter Zimon
4260ff59a4 Updated dynamic modal width logic 2021-05-10 23:05:02 +05:30
Peter Zimon
80cd22bfaa Updated plan section styles 2021-05-10 23:05:02 +05:30
Rishabh
816560b7ce Updated preview to work in setup mode
refs https://github.com/TryGhost/Team/issues/644

In Preview mode during launch wizard in Admin, we show owners dummy Monthly/Yearly plan since the prices are not yet created but will be created if everything looks good in the next step. This change handles the dummy Monthly/yearly prices without actually having the values in DB or settings.
2021-05-10 23:05:02 +05:30
Rishabh
a7de8e9c47 Fixed tests
no refs

Updated tests to work with custom prices
2021-05-10 23:05:02 +05:30
Rishabh
53b63acf40 Cleaned up Signup and Plan pages
Cleanup Account home

Cleanup - Account Plan Page
2021-05-10 23:05:02 +05:30
Rishabh
7d43811600 Handled portal prices data from Admin 2021-05-10 23:05:02 +05:30
Rishabh
c178c60652 Updated api to use price id instead of plan name 2021-05-10 23:05:02 +05:30
Rishabh
41528e90bf Fixed current plan selection not working 2021-05-10 23:05:02 +05:30
Rishabh
92132a567c Added price change handling 2021-05-10 23:05:02 +05:30
Rishabh
4c2a6b9444 Added plan checkout 2021-05-10 23:05:02 +05:30
Peter Zimon
afd51e0e34 Updated no description price name style 2021-05-10 23:05:02 +05:30
Rishabh
38ed4ad61a Added v1 handling for custom prices
refs https://github.com/TryGhost/Team/issues/637
2021-05-10 23:05:02 +05:30
Peter Zimon
3eebae2e11 Updated change plan screen 2021-05-10 23:05:02 +05:30
Peter Zimon
cdb9e0e02c Updated price list 2021-05-10 23:05:02 +05:30
Peter Zimon
725ec2e09a Added product list to account screen 2021-05-10 23:05:02 +05:30
Renovate Bot
ad4168d5b2 Update dependency eslint-plugin-ghost to v2.2.0 2021-05-10 01:30:12 +00:00
Rishabh
4b97830079 v1.2.3 2021-05-03 22:24:15 +05:30
Rishabh
e9556466a2 Fixed Lint
no refs

Removed unused icon
2021-05-03 22:23:36 +05:30
Peter Zimon
68d0bc0248 Updated "Powered by Ghost" badge with new logo 2021-05-03 18:46:10 +02:00
Renovate Bot
9fd67880dd Update dependency eslint-plugin-ghost to v2.1.0 2021-04-30 12:16:47 +00:00
Renovate Bot
9ab5400219 Update actions/checkout action to v2 2021-04-29 09:06:18 +01:00
Rishabh
e9098743f3 v1.2.2 2021-04-28 16:31:02 +05:30
Peter Zimon
d8d2accfe4 Refined styles for invite only modal 2021-04-28 12:54:11 +02:00
Peter Zimon
4a0f3c2403 Updated invite-only styles 2021-04-28 12:40:52 +02:00
Rishabh
a1506b824f 🐛Fixed signup button and icon in invite mode
refs https://github.com/TryGhost/Team/issues/579

We added a new setting to explicitly set `invite-only` mode which was not handled in the signup button and header icon for signup page
2021-04-28 15:51:02 +05:30
Rishabh
c4aee97469 v1.2.1 2021-04-27 23:10:50 +05:30
Rishabh
33221313db Added allow self signup as preview option
refs https://github.com/TryGhost/Team/issues/579

Admin preview screen now sends `allowSelfSignup` as a query param that allows customising the Portal preview UI based on the changes selected by the Admin. This change handles the new query param in Portal
2021-04-27 23:09:57 +05:30
Rishabh
02a21b033d v1.2.0 2021-04-27 21:07:35 +05:30
Rishabh Garg
d690684a56 Updated to handle invite only setting (#139)
refs https://github.com/TryGhost/Team/issues/579

A new setting `members_signup_access` can be set to `invite` by the site owner which explicitly makes Portal to behave invite only, this change updates Portal to handle the setting
2021-04-27 21:04:58 +05:30
Renovate Bot
3bdfe189d9 Update dependency @testing-library/jest-dom to v5.12.0 2021-04-23 16:47:19 +00:00
Fabien O'Carroll
0066732b74 v1.1.1 2021-04-05 16:14:41 +01:00
Fabien 'egg' O'Carroll
6b60e51747 Updated data-attributes to use smart_cancel (#136)
refs https://github.com/TryGhost/Team/issues/530

This makes sure that sites not using the Portal modal will have their
cancel behaviour updated too.

* Added missing newline
2021-04-05 16:13:39 +01:00
Renovate Bot
aaf4cfcffe Update dependency @testing-library/react to v11.2.6 2021-03-31 12:39:55 +00:00
Fabien O'Carroll
62a7542a6c v1.1.0 2021-03-30 12:21:19 +01:00
Rish
778ffe2f81 Updated action for continuing a subscription
refs https://github.com/TryGhost/Team/issues/530

A continueSubscription action has been added to handle continuing
subscriptions as a different flow since we now have `smart_cancel` for the cancellation. The "continue subscription" button in Portal is updated to use the new action to correctly continue a subscription instead of old action which did both cancel and continue.
2021-03-30 12:20:21 +01:00
Fabien O'Carroll
1caaa3f2fe Updated actions to cancel&continue subscriptions
refs https://github.com/TryGhost/Team/issues/530

The members-api now accepts the `smart_cancel` option when updating
subscriptions. This will automatically handle cancelling the
subscription if it is in an overdue state.

A continueSubscription action has been added to handle continuing
subscriptions.
2021-03-30 12:20:21 +01:00
Renovate Bot
b2c380cd60 Update dependency @testing-library/jest-dom to v5.11.10 2021-03-26 22:13:41 +00:00