diff --git a/core/server/data/schema/default-settings.json b/core/server/data/schema/default-settings.json index 7e64746a06..8bfe05e167 100644 --- a/core/server/data/schema/default-settings.json +++ b/core/server/data/schema/default-settings.json @@ -282,7 +282,7 @@ "type": "string" }, "stripe_plans": { - "defaultValue": "[{\"name\":\"Monthly\",\"currency\":\"usd\",\"interval\":\"month\",\"amount\":500},{\"name\":\"Yearly\",\"currency\":\"usd\",\"interval\":\"year\",\"amount\":5000}]", + "defaultValue": "[]", "type": "array" }, "stripe_connect_publishable_key": { @@ -324,7 +324,7 @@ "type": "boolean" }, "portal_plans": { - "defaultValue": "[\"free\", \"monthly\", \"yearly\"]", + "defaultValue": "[\"free\"]", "type": "array" }, "portal_button_style": { diff --git a/core/server/services/members/config.js b/core/server/services/members/config.js index ed65ba8ea9..017af9bd01 100644 --- a/core/server/services/members/config.js +++ b/core/server/services/members/config.js @@ -3,13 +3,6 @@ const crypto = require('crypto'); const createKeypair = require('keypair'); const path = require('path'); -const COMPLIMENTARY_PLAN = { - name: 'Complimentary', - currency: 'usd', - interval: 'year', - amount: '0' -}; - class MembersConfigProvider { /** * @param {object} options @@ -190,7 +183,7 @@ class MembersConfigProvider { product: { name: this._settingsCache.get('stripe_product_name') }, - plans: [COMPLIMENTARY_PLAN].concat(this._settingsCache.get('stripe_plans') || []), + plans: this._settingsCache.get('stripe_plans') || [], appInfo: { name: 'Ghost', partner_id: 'pp_partner_DKmRVtTs4j9pwZ', diff --git a/test/unit/data/schema/integrity_spec.js b/test/unit/data/schema/integrity_spec.js index b307ab8291..f94b3ab969 100644 --- a/test/unit/data/schema/integrity_spec.js +++ b/test/unit/data/schema/integrity_spec.js @@ -34,7 +34,7 @@ describe('DB version integrity', function () { // Only these variables should need updating const currentSchemaHash = '7886f066821a240b85c6b61ba2dcff65'; const currentFixturesHash = '8671672598d2a62e53418c4b91aa79a3'; - const currentSettingsHash = 'c202cf5780aa77d8730a82680e2b142e'; + const currentSettingsHash = '5529b6fd5ee65b65bb78954fd721b248'; const currentRoutesHash = '3d180d52c663d173a6be791ef411ed01'; // If this test is failing, then it is likely a change has been made that requires a DB version bump,