Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-03 23:00:14 -05:00
Code Issues Activity

Revert "Added new settings for members modal settings (#11927)"

Browse source 
This reverts commit ea7d450a9b.
This commit is contained in:
Rish 2020-06-18 19:06:13 +05:30
parent 4fb39f29cc
commit 87c31444fd
2 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/server/data/schema/default-settings.json
View file

@ -220,23 +220,6 @@
},
"stripe_connect_integration": {
"defaultValue": "{}"
},
"membersjs_show_signup_name": {
"defaultValue": "true",
"validations": {
"isEmpty": false,
"isIn": [["true", "false"]]
}
},
"membersjs_show_beacon": {
"defaultValue": "true",
"validations": {
"isEmpty": false,
"isIn": [["true", "false"]]
}
},
"membersjs_allowed_plans": {
"defaultValue": "[\"free\", \"monthly\", \"yearly\"]"
}
},
"bulk_email": {

9
core/server/services/members/middleware.js
View file

@ -89,9 +89,7 @@ const getMemberSiteData = async function (req, res) {
);
const stripeSecretToken = stripePaymentProcessor && stripePaymentProcessor.config.secret_token;
const stripePublicToken = stripePaymentProcessor && stripePaymentProcessor.config.public_token;
const stripeConnectIntegration = settingsCache.get('stripe_connect_integration');
const isStripeConfigured = (!!stripeSecretToken && !!stripePublicToken) || !!(stripeConnectIntegration && stripeConnectIntegration.account_id);
const isStripeConfigured = (!!stripeSecretToken && stripeSecretToken !== '' && !!stripePublicToken && stripePublicToken !== '');
const response = {
title: settingsCache.get('title'),
description: settingsCache.get('description'),
@ -101,10 +99,7 @@ const getMemberSiteData = async function (req, res) {
version: ghostVersion.safe,
plans: membersService.config.getPublicPlans(),
allowSelfSignup: membersService.config.getAllowSelfSignup(),
isStripeConfigured,
show_beacon: settingsCache.get('membersjs_show_beacon'),
show_signup_name: settingsCache.get('membersjs_show_signup_name'),
allowed_plans: settingsCache.get('membersjs_allowed_plans')
isStripeConfigured
};
// Brand is currently an experimental feature