Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-04-01 02:41:39 -05:00
Code Issues Activity

Fixed no-description bug

Browse source
This commit is contained in:
Peter Zimon 2021-08-17 15:03:45 +02:00
parent 3300378843
commit cf36bffe07
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ghost/portal/src/components/common/PlansSection.js
View file

@ -566,9 +566,12 @@ function PlanBenefits({product, plans, selectedPlan}) {
});
let planBenefits = [];
let planDescription = product.description;
if (!product.description) {
planDescription = `Get full access to ` + site.title;
}
if (selectedPlan === 'free') {
planBenefits = [];
planDescription = `Free preview of ` + site.title;
planDescription = `Get a free preview of ` + site.title;
} else if (plan?.interval === 'month') {
planBenefits = productBenefits.monthly;
} else if (plan?.interval === 'year') {
@ -585,7 +588,7 @@ function PlanBenefits({product, plans, selectedPlan}) {
return (
<div className={'gh-portal-singleproduct-benefits gh-portal-product-benefits ' + benefitsClass}>
{(product.description ? <div className='gh-portal-product-description'> {planDescription} </div> : '')}
<div className='gh-portal-product-description'> {planDescription} </div>
{benefits}
</div>
);

2
ghost/portal/src/components/common/ProductsSection.js
View file

@ -146,7 +146,7 @@ export const ProductsSectionStyles = ({site}) => {
font-size: 1.35rem;
line-height: 1.45em;
text-align: center;
color: var(--grey5);
color: var(--grey3);
margin-bottom: 24px;
}

3
ghost/portal/src/utils/fixtures.js
View file

@ -27,7 +27,7 @@ const products = [
{
id: 'product_1',
name: 'Ball is life membership',
description: 'Get access to everything and lock in early adopter pricing for life + listen to my podcast',
description: '',
monthlyPrice: {
id: '6085adc776909b1a2382369a',
stripe_price_id: '7d6c89c0289ca1731226e86b95b5a162085b8561ca0d10d3a4f03afd3e3e6ba6',
@ -50,6 +50,7 @@ const products = [
type: 'recurring',
interval: 'year'
},
// benefits: [],
benefits: [
{
id: 'a1',

2
ghost/portal/src/utils/helpers.js
View file

@ -258,7 +258,7 @@ export function getProductBenefits({product, site = null}) {
const yearlyDiscount = calculateDiscount(product.monthlyPrice.amount, product.yearlyPrice.amount);
const productBenefits = product?.benefits || [];
const monthlyBenefits = product?.benefits?.length > 0 ? [...productBenefits] : [{
name: 'Full access to all articles'
name: 'Access to all articles'
}];
const yearlyBenefits = [...monthlyBenefits];
if (yearlyDiscount > 0 && availablePrices.length > 1) {