From 8fbb5eb04d71325f1bca40c3c777e38d0d5a5c4e Mon Sep 17 00:00:00 2001
From: "Fabien \"egg\" O'Carroll" <fabien@allou.is>
Date: Sun, 30 Jan 2022 16:18:50 +0200
Subject: [PATCH] Removed shared redirect inputs when Tiers enabled

refs https://github.com/TryGhost/Team/issues/1168

These are being replaced by Tier specific redirect which are set in the
Tier modal when Tiers feature is enabled.
---
 .../app/templates/settings/membership.hbs     | 63 ++++++++++---------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/ghost/admin/app/templates/settings/membership.hbs b/ghost/admin/app/templates/settings/membership.hbs
index 80dbc5b63a..6b421a5236 100644
--- a/ghost/admin/app/templates/settings/membership.hbs
+++ b/ghost/admin/app/templates/settings/membership.hbs
@@ -95,23 +95,24 @@
                                     @products={{this.products}}
                                     @openEditProduct={{this.openEditProduct}}
                                 />
+                            {{else}}
+                                <GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="free-welcome-page">
+                                    <label for="freeWelcomePage">Welcome page</label>
+                                    <GhUrlInput
+                                        @id="freeWelcomePage"
+                                        @value={{readonly this.settings.membersFreeSignupRedirect}}
+                                        @baseUrl={{readonly this.siteUrl}}
+                                        @setResult={{this.setFreeSignupRedirect}}
+                                        @validateUrl={{this.validateFreeSignupRedirect}}
+                                        @placeholder={{readonly this.siteUrl}}
+                                    />
+                                    <GhErrorMessage
+                                        @errors={{settings.errors}}
+                                        @property="membersFreeSignupRedirect"
+                                    />
+                                    <p>Redirect to this URL after signup for a free membership</p>
+                                </GhFormGroup>
                             {{/if}}
-                            <GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="free-welcome-page">
-                                <label for="freeWelcomePage">Welcome page</label>
-                                <GhUrlInput
-                                    @id="freeWelcomePage"
-                                    @value={{readonly this.settings.membersFreeSignupRedirect}}
-                                    @baseUrl={{readonly this.siteUrl}}
-                                    @setResult={{this.setFreeSignupRedirect}}
-                                    @validateUrl={{this.validateFreeSignupRedirect}}
-                                    @placeholder={{readonly this.siteUrl}}
-                                />
-                                <GhErrorMessage
-                                    @errors={{settings.errors}}
-                                    @property="membersFreeSignupRedirect"
-                                />
-                                <p>Redirect to this URL after signup for a free membership</p>
-                            </GhFormGroup>
                         </div>
                         {{/liquid-if}}
                     </div>
@@ -205,23 +206,23 @@
                                             <p class="response w-100"><span class="red">{{this.stripePlanError}}</span></p>
                                         {{/if}}
                                     </GhFormGroup>
+                                    <GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="paid-welcome-page">
+                                        <label for="paidWelcomePage">Welcome page</label>
+                                        <GhUrlInput
+                                            @value={{readonly this.settings.membersPaidSignupRedirect}}
+                                            @baseUrl={{readonly this.siteUrl}}
+                                            @setResult={{this.setPaidSignupRedirect}}
+                                            @validateUrl={{this.validatePaidSignupRedirect}}
+                                            @placeholder={{readonly this.siteUrl}}
+                                        />
+                                        <GhErrorMessage
+                                            @errors={{settings.errors}}
+                                            @property="membersPaidSignupRedirect"
+                                        />
+                                        <p>Redirect to this URL after signup for premium membership</p>
+                                    </GhFormGroup>
 
                                 {{/if}}
-                                <GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="paid-welcome-page">
-                                    <label for="paidWelcomePage">Welcome page</label>
-                                    <GhUrlInput
-                                        @value={{readonly this.settings.membersPaidSignupRedirect}}
-                                        @baseUrl={{readonly this.siteUrl}}
-                                        @setResult={{this.setPaidSignupRedirect}}
-                                        @validateUrl={{this.validatePaidSignupRedirect}}
-                                        @placeholder={{readonly this.siteUrl}}
-                                    />
-                                    <GhErrorMessage
-                                        @errors={{settings.errors}}
-                                        @property="membersPaidSignupRedirect"
-                                    />
-                                    <p>Redirect to this URL after signup for premium membership</p>
-                                </GhFormGroup>
                             {{/if}}
                         </div>
                         {{/liquid-if}}