From 6c8c77de5de0153dd3c2005d7f7e2697c6afd516 Mon Sep 17 00:00:00 2001
From: Rish <zrishabhgarg@gmail.com>
Date: Wed, 17 Jun 2020 13:00:56 +0530
Subject: [PATCH] Handled new modal settings for basic customization

no issue

- Uses `show_beacon` setting to show/hide the default beacon
- Uses `show_signup_name` setting to show/hide the signup name
- Uses `allowed_plans` to show/hide the plans
---
 ghost/portal/src/App.js                       |  3 ++-
 .../portal/src/components/pages/SignupPage.js | 20 +++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ghost/portal/src/App.js b/ghost/portal/src/App.js
index 12747ce915..566d41d8c3 100644
--- a/ghost/portal/src/App.js
+++ b/ghost/portal/src/App.js
@@ -245,7 +245,8 @@ export default class App extends React.Component {
     }
 
     renderTriggerButton() {
-        if (!this.customTriggerButtons || this.customTriggerButtons.length === 0) {
+        const {site} = this.state;
+        if (site.show_beacon === undefined || site.show_beacon) {
             return (
                 <TriggerButton
                     isPopupOpen={this.state.showPopup}
diff --git a/ghost/portal/src/components/pages/SignupPage.js b/ghost/portal/src/components/pages/SignupPage.js
index 4eebc972bb..a2913fc31f 100644
--- a/ghost/portal/src/components/pages/SignupPage.js
+++ b/ghost/portal/src/components/pages/SignupPage.js
@@ -66,7 +66,7 @@ class SignupPage extends React.Component {
     }
 
     renderPlans() {
-        const {plans, allowSelfSignup, isStripeConfigured} = this.context.site;
+        const {plans, allowSelfSignup, isStripeConfigured, allowed_plans: allowedPlans} = this.context.site;
 
         const plansData = [];
         const stripePlans = [
@@ -74,12 +74,16 @@ class SignupPage extends React.Component {
             {type: 'year', price: plans.yearly, currency: plans.currency_symbol, name: 'Yearly'}
         ];
 
-        if (isStripeConfigured && allowSelfSignup) {
+        if (allowSelfSignup && (allowedPlans === undefined || allowedPlans.includes('free'))) {
             plansData.push({type: 'free', price: 'Decide later', name: 'Free'});
         }
 
         if (isStripeConfigured) {
-            stripePlans.forEach(plan => plansData.push(plan));
+            stripePlans.forEach((plan) => {
+                if (allowedPlans === undefined || allowedPlans.includes(plan.name.toLowerCase())) {
+                    plansData.push(plan);
+                }
+            });
         }
 
         return (
@@ -127,10 +131,18 @@ class SignupPage extends React.Component {
         );
     }
 
+    renderNameField() {
+        const {site} = this.context;
+        if (site.show_signup_name === undefined || site.show_signup_name) {
+            return this.renderInputField('name');
+        }
+        return null;
+    }
+
     renderForm() {
         return (
             <div style={{display: 'flex', flexDirection: 'column', marginBottom: '12px', padding: '0 18px'}}>
-                {this.renderInputField('name')}
+                {this.renderNameField()}
                 {this.renderInputField('email')}
                 {this.renderPlans()}
                 {this.renderSubmitButton()}