TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-24 19:33:02 +03:00
Code Issues Projects Releases Wiki Activity

Updated Portal settings to render paid plans options only when relevant (#19507)

Browse Source 
fixes PROD-300
- hides "Prices available at signup" and "Price preselected at signup"
options in Portal settings, if no paid tier is active/visible
This commit is contained in:
Sag 2024-01-17 16:08:15 +01:00 committed by GitHub
parent 957b9f31d4
commit 5ddd90a244
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/admin-x-settings/src/components/settings/membership/portal/SignupOptions.tsx
View File

@ -99,15 +99,15 @@ const SignupOptions: React.FC<{
});
}
const paidActiveTiersResult = getPaidActiveTiers(localTiers) || [];
const paidActiveTiers = getPaidActiveTiers(localTiers) || [];
const defaultPlanOptions: SelectOption[] = [
{value: 'yearly', label: 'Yearly'},
{value: 'monthly', label: 'Monthly'}
];
if (paidActiveTiersResult.length > 0 && isStripeEnabled) {
paidActiveTiersResult.forEach((tier) => {
if (isStripeEnabled && paidActiveTiers.length > 0) {
paidActiveTiers.forEach((tier) => {
tiersCheckboxes.push({
checked: (tier.visibility === 'public'),
label: tier.name,
@ -117,6 +117,8 @@ const SignupOptions: React.FC<{
});
}
const arePaidTiersVisible = isStripeEnabled && paidActiveTiers.length > 0 && paidActiveTiers.some(tier => tier.visibility === 'public');
return <div className='mt-7'><Form>
<Toggle
checked={Boolean(portalName)}
@ -131,7 +133,7 @@ const SignupOptions: React.FC<{
title='Tiers available at signup'
/>
{isStripeEnabled && localTiers.some(tier => tier.visibility === 'public') && (
{arePaidTiersVisible && (
<>
<CheckboxGroup
checkboxes={[
@ -156,7 +158,7 @@ const SignupOptions: React.FC<{
]}
title='Prices available at signup'
/>
{(hasPortalImprovements && (portalPlans.includes('yearly') && portalPlans.includes('monthly'))) &&
{(hasPortalImprovements && portalPlans.includes('yearly') && portalPlans.includes('monthly')) &&
<Select
options={defaultPlanOptions}
selectedOption={defaultPlanOptions.find(option => option.value === portalDefaultPlan)}