From 6cf86f431b25c5270fb98f077604e12683c1ce7a Mon Sep 17 00:00:00 2001
From: Peter Zimon <zimo@ghost.org>
Date: Wed, 5 May 2021 15:09:01 +0200
Subject: [PATCH] Product price cleanup

- removed bottom block (welcome page and stripe checkout link) from price modal
---
 .../app/components/modal-product-price.hbs    | 26 -------------------
 .../admin/app/templates/settings/product.hbs  | 10 +------
 2 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/ghost/admin/app/components/modal-product-price.hbs b/ghost/admin/app/components/modal-product-price.hbs
index 9c3d22de38..b955f121fc 100644
--- a/ghost/admin/app/components/modal-product-price.hbs
+++ b/ghost/admin/app/components/modal-product-price.hbs
@@ -8,7 +8,6 @@
 <form>
 <div class="modal-body">
     <div class="gh-main-section-block">
-        <h4 class="gh-main-section-header small bn">Pricing</h4>
         <div class="gh-main-section-content grey gh-product-priceform-block">
             <GhFormGroup @errors={{this.price.errors}} @hasValidated={{this.price.hasValidated}} @property="name">
                 <label for="name" class="fw6">Name</label>
@@ -40,7 +39,6 @@
                             @disabled={{this.isExistingPrice}}
                             @input={{action "setAmount" value="target.value"}}
                         />
-                        {{!-- <span class="gh-input-append"><span class="ttu">{{capitalize (or this.currencyVal "usd")}} </span>/{{or this.periodVal "month"}}</span> --}}
                     </div>
                     <GhErrorMessage @errors={{this.price.errors}} @property="price" />
                 </GhFormGroup>
@@ -69,30 +67,6 @@
                 />
             </GhFormGroup>
         </div>
-
-        <h4 class="gh-main-section-header small bn">Advanced</h4>
-        <div class="gh-main-section-content grey gh-product-priceform-block">
-            <GhFormGroup @errors={{this.price.errors}} @hasValidated={{this.price.hasValidated}} @property="welcome-page">
-                <label for="welcome-page" class="fw6">Welcome page</label>
-                <GhTextInput
-                    @value=''
-                    @name="welcome-page"
-                    @id="welcome-page"
-                    @class="gh-input" />
-                <p>Redirect to this URL after signing up with this price</p>
-                <GhErrorMessage @errors={{this.price.errors}} @property="welcome-page" />
-            </GhFormGroup>
-            <GhFormGroup @errors={{this.price.errors}} @hasValidated={{this.price.hasValidated}} @property="stripe-url">
-                <label for="stripe-url" class="fw6">Stripe Checkout URL</label>
-                <GhTextInput
-                    @value='https://example.com/checkout'
-                    @name="stripe-url"
-                    @id="stripe-url"
-                    @disabled={{true}}
-                    @class="gh-input" />
-                <GhErrorMessage @errors={{this.price.errors}} @property="stripe-url" />
-            </GhFormGroup>
-        </div>
     </div>
 </div>
 </form>
diff --git a/ghost/admin/app/templates/settings/product.hbs b/ghost/admin/app/templates/settings/product.hbs
index 7f9ec11468..a31e5dd26f 100644
--- a/ghost/admin/app/templates/settings/product.hbs
+++ b/ghost/admin/app/templates/settings/product.hbs
@@ -120,14 +120,6 @@
     </div>
 
     {{#if this.showPriceModal}}
-        {{!-- <GhFullscreenModal @modifier="action wide member-product">
-            <ModalProductPrice
-                    @model={{hash
-                        price=this.priceModel
-                    }}
-                    @confirm={{action "savePrice"}}
-                    @closeModal={{this.closePriceModal}} />
-        </GhFullscreenModal> --}}
         <GhFullscreenModal
             @modal="product-price"
             @model={{hash
@@ -135,7 +127,7 @@
             }}
             @confirm={{action "savePrice"}}
             @close={{this.closePriceModal}}
-            @modifier="action wide body-scrolling product-ssprice" />
+            @modifier="action wide product-ssprice" />
     {{/if}}
 
     {{#if this.showUnsavedChangesModal}}