From 5337a9607429ab7560e757acce7474a994bdf217 Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Tue, 20 Apr 2021 16:55:31 +0100 Subject: [PATCH] Removed unused code from `` no issue - code relating to "portal settings" and "leave settings" modals was unused, presumably left over from settings re-jig copy and paste --- .../gh-members-payments-setting.hbs | 16 -------------- .../components/gh-members-payments-setting.js | 22 ------------------- .../templates/settings/members-payments.hbs | 1 - 3 files changed, 39 deletions(-) diff --git a/ghost/admin/app/components/gh-members-payments-setting.hbs b/ghost/admin/app/components/gh-members-payments-setting.hbs index 889b01c234..05148fd5e5 100644 --- a/ghost/admin/app/components/gh-members-payments-setting.hbs +++ b/ghost/admin/app/components/gh-members-payments-setting.hbs @@ -288,20 +288,4 @@ @confirm={{action "disconnectStripeConnectIntegration"}} @close={{action "closeDisconnectStripeModal"}} @modifier="action wide" /> -{{/if}} - -{{#if this.showPortalSettings}} - -{{/if}} - -{{#if this.showLeaveSettingsModal}} - {{/if}} \ No newline at end of file diff --git a/ghost/admin/app/components/gh-members-payments-setting.js b/ghost/admin/app/components/gh-members-payments-setting.js index a9acb8ba72..9e5254afa4 100644 --- a/ghost/admin/app/components/gh-members-payments-setting.js +++ b/ghost/admin/app/components/gh-members-payments-setting.js @@ -19,7 +19,6 @@ export default Component.extend({ stripePlanInvalidAmount: false, _scratchStripeYearlyAmount: null, _scratchStripeMonthlyAmount: null, - showLeaveSettingsModal: false, // passed in actions setStripeConnectIntegrationTokenSetting() {}, @@ -38,8 +37,6 @@ export default Component.extend({ stripeConnectAccountName: reads('settings.stripeConnectDisplayName'), stripeConnectLivemode: reads('settings.stripeConnectLivemode'), - portalSettingsBorderColor: reads('settings.accentColor'), - selectedCurrency: computed('stripePlans.monthly.currency', function () { return this.get('currencies').findBy('value', this.get('stripePlans.monthly.currency')) || this.get('topCurrencies').findBy('value', this.get('stripePlans.monthly.currency')); }), @@ -106,15 +103,6 @@ export default Component.extend({ }, actions: { - closePortalSettings() { - const changedAttributes = this.settings.changedAttributes(); - if (changedAttributes && Object.keys(changedAttributes).length > 0) { - this.set('showLeaveSettingsModal', true); - } else { - this.set('showPortalSettings', false); - } - }, - setDefaultContentVisibility(value) { this.setDefaultContentVisibility(value); }, @@ -184,16 +172,6 @@ export default Component.extend({ this.disconnectStripeConnectIntegration.perform(); }, - closeLeaveSettingsModal() { - this.set('showLeaveSettingsModal', false); - }, - - leavePortalSettings() { - this.settings.rollbackAttributes(); - this.set('showPortalSettings', false); - this.set('showLeaveSettingsModal', false); - }, - openStripeSettings() { this.set('membersStripeOpen', true); } diff --git a/ghost/admin/app/templates/settings/members-payments.hbs b/ghost/admin/app/templates/settings/members-payments.hbs index 109a1f6873..520169ea16 100644 --- a/ghost/admin/app/templates/settings/members-payments.hbs +++ b/ghost/admin/app/templates/settings/members-payments.hbs @@ -21,7 +21,6 @@ {{#if this.session.user.isOwner}}