diff --git a/ghost/admin/app/components/modal-product.hbs b/ghost/admin/app/components/modal-product.hbs index 3f682f3cf4..6b5f03e655 100644 --- a/ghost/admin/app/components/modal-product.hbs +++ b/ghost/admin/app/components/modal-product.hbs @@ -47,22 +47,24 @@ {{/if}} - - - - {{#if (not this.isFreeProduct)}} -

Redirect to this URL after signup for premium membership

- {{else}} -

Redirect to this URL after signup for a free membership

- {{/if}} -
+ {{#if (feature "tierWelcomePages")}} + + + + {{#if (not this.isFreeProduct)}} +

Redirect to this URL after signup for premium membership

+ {{else}} +

Redirect to this URL after signup for a free membership

+ {{/if}} +
+ {{/if}} {{#if (not this.isFreeProduct)}}
diff --git a/ghost/admin/app/services/feature.js b/ghost/admin/app/services/feature.js index 42bfbbf232..a330aa1521 100644 --- a/ghost/admin/app/services/feature.js +++ b/ghost/admin/app/services/feature.js @@ -60,6 +60,7 @@ export default Service.extend({ tweetGridCard: feature('tweetGridCard'), membersActivityFeed: feature('membersActivityFeed'), improvedOnboarding: feature('improvedOnboarding'), + tierWelcomePages: feature('tierWelcomePages'), _user: null, diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs index 255349498e..7653d2fcbd 100644 --- a/ghost/admin/app/templates/settings/labs.hbs +++ b/ghost/admin/app/templates/settings/labs.hbs @@ -326,6 +326,19 @@
+
+
+
+

Tier welcome pages

+

+ Add welcome pages per Tier (requires Tiers enabled) +

+
+
+ +
+
+
diff --git a/ghost/admin/app/templates/settings/membership.hbs b/ghost/admin/app/templates/settings/membership.hbs index 6b421a5236..0553954e48 100644 --- a/ghost/admin/app/templates/settings/membership.hbs +++ b/ghost/admin/app/templates/settings/membership.hbs @@ -95,7 +95,8 @@ @products={{this.products}} @openEditProduct={{this.openEditProduct}} /> - {{else}} + {{/if}} + {{#if (or (not (feature "tierWelcomePages")) (not (feature "multipleProducts")))}} {{this.stripePlanError}}

{{/if}}
+ {{/if}} + {{#if (or (not (feature "tierWelcomePages")) (not (feature "multipleProducts")))}}

Redirect to this URL after signup for premium membership

- {{/if}} {{/if}}
diff --git a/ghost/admin/package.json b/ghost/admin/package.json index b6a4f63f1c..6fdc9f408b 100644 --- a/ghost/admin/package.json +++ b/ghost/admin/package.json @@ -1,6 +1,6 @@ { "name": "ghost-admin", - "version": "4.34.0", + "version": "4.34.1", "description": "Ember.js admin client for Ghost", "author": "Ghost Foundation", "homepage": "http://ghost.org",