TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-25 09:03:12 +03:00
Code Issues Projects Releases Wiki Activity

Updated tier preview in tier modal

Browse Source 
refs https://github.com/TryGhost/Team/issues/1791
This commit is contained in:
Djordje Vlaisavljevic 2022-08-16 16:44:11 +02:00
parent c4ea36cfde
commit 5f2d55dace
2 changed files with 41 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
ghost/admin/app/components/modal-tier.hbs
View File

@ -270,73 +270,56 @@
{{/if}}
<div class="gh-portal-tier-card-pricecontainer" data-test-tierpreview-price>
{{#if this.isFreeTier}}
<div class="gh-portal-tier-price">
<span class="currency-sign">{{currency-symbol this.currency}}</span>
<span class="amount">0</span>
</div>
{{else}}
{{#if this.isFreeTrialEnabled}}
<div class="gh-portal-tier-price">
<span class="amount">{{ this.tier.trialDays }} days free</span>
</div>
{{/if}}
{{#if this.stripeYearlyAmount}}
{{#if (feature 'freeTrial')}}
{{#unless this.freeTrialEnabled}}
<div class="gh-portal-tier-price">
<span class="currency-sign">{{currency-symbol this.currency}}</span>
{{#if (eq this.previewCadence "monthly")}}
<span class="amount">
{{format-number this.stripeMonthlyAmount}}
</span>
<span class="billing-period">/month</span>
{{else}}
<span class="amount">
{{format-number this.stripeYearlyAmount}}
</span>
<span class="billing-period">/year</span>
{{/if}}
</div>
{{/unless}}
{{#if this.isFreeTier}}
<div class="gh-portal-tier-price">
<span class="currency-sign">{{currency-symbol this.currency}}</span>
<span class="amount">0</span>
</div>
{{else}}
{{#if this.stripeYearlyAmount}}
<div class="gh-portal-tier-price">
<span class="currency-sign">{{currency-symbol this.currency}}</span>
{{#if (eq this.previewCadence "monthly")}}
<span class="amount">
{{format-number this.stripeMonthlyAmount}}
</span>
<span class="billing-period">/month</span>
{{else}}
<div class="gh-portal-tier-price">
<span class="currency-sign">{{currency-symbol this.currency}}</span>
{{#if (eq this.previewCadence "monthly")}}
<span class="amount">
{{format-number this.stripeMonthlyAmount}}
</span>
<span class="billing-period">/month</span>
{{else}}
<span class="amount">
{{format-number this.stripeYearlyAmount}}
</span>
<span class="billing-period">/year</span>
{{/if}}
</div>
<span class="amount">
{{format-number this.stripeYearlyAmount}}
</span>
<span class="billing-period">/year</span>
{{/if}}
{{#if (and (eq this.previewCadence "yearly") (gt this.discountValue 0))}}
</div>
{{#if (feature 'freeTrial')}}
{{#if this.isFreeTrialEnabled}}
<span class="gh-portal-discount-label">
<span style="background-color: {{this.settings.accentColor}}"></span>
{{this.discountValue}}% discount</span>
{{/if}}
{{ this.tier.trialDays }} days free</span>
{{/if}}
{{else}}
{{#if (and (eq this.previewCadence "yearly") (gt this.discountValue 0))}}
<span class="gh-portal-discount-label">
<span style="background-color: {{this.settings.accentColor}}"></span>
{{this.discountValue}}% discount
</span>
{{/if}}
{{/if}}
{{else}}
<div class="gh-portal-tier-price placeholder">
<span class="currency-sign">{{currency-symbol this.currency}}</span>
<span class="amount">0</span>
<span class="billing-period">/year</span>
</div>
{{/if}}
{{/if}}
</div>
{{#if this.isFreeTrialEnabled}}
<span class="after-trial-amount">Then
{{#if (eq this.previewCadence "yearly")}}
{{currency-symbol this.currency}}{{ format-number this.stripeYearlyAmount }}/year
{{else}}
{{currency-symbol this.currency}}{{ format-number this.stripeMonthlyAmount }}/month
{{/if}}
</div>
{{#if (feature 'freeTrial')}}
{{#if (and (eq this.previewCadence "yearly") (gt this.discountValue 0))}}
<span class="gh-portal-discount-label-trial" style={{this.accentColorStyle}}>
{{this.discountValue}}% discount
</span>
{{/if}}
{{/if}}
</div>

11
ghost/admin/app/styles/layouts/tiers.css
View File

@ -790,14 +790,11 @@
opacity: 0.35;
}
.gh-tier-form-tierpreview .after-trial-amount {
display: block;
font-size: 1.5rem;
font-weight: 500;
color: #686868;
margin-top: 6px;
margin-bottom: 6px;
.gh-tier-form-tierpreview .gh-portal-discount-label-trial {
font-weight: 600;
font-size: 1.3rem;
line-height: 1;
margin-top: 4px;
}
.gh-tier-setting-title {