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

Cleaned up use of members isPaid flag

Browse source 
refs https://github.com/TryGhost/Ghost/pull/11651

- The flag is being removed from the backend, so can be safely removed on client as well
This commit is contained in:
Nazar Gargol 2020-03-10 15:15:48 +08:00
parent e61c8642e7
commit cfa766c4e4
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ghost/admin/app/components/gh-members-lab-setting.js
View file

@ -127,10 +127,7 @@ export default Component.extend({
stripeConfig.product = { stripeConfig.product = {
name: this.settings.get('title') name: this.settings.get('title')
}; };
// TODO: this flag has to be removed as it doesn't serve any purpose
if (key === 'isPaid') {
subscriptionSettings.isPaid = event;
}
if (key === 'secret_token' || key === 'public_token') { if (key === 'secret_token' || key === 'public_token') {
stripeConfig[key] = event.target.value; stripeConfig[key] = event.target.value;
} }

1
ghost/admin/app/services/settings.js
View file

@ -79,7 +79,6 @@ export default Service.extend(_ProxyMixin, ValidationEngine, {
return JSON.parse(settingsString); return JSON.parse(settingsString);
} catch (e) { } catch (e) {
return { return {
isPaid: false,
allowSelfSignup: true, allowSelfSignup: true,
fromAddress: 'noreply', fromAddress: 'noreply',
paymentProcessors: [{ paymentProcessors: [{

2
ghost/admin/mirage/fixtures/settings.js
View file

@ -177,7 +177,7 @@ export default [
id: 23, id: 23,
type: 'members', type: 'members',
key: 'members_subscription_settings', key: 'members_subscription_settings',
value: '{"isPaid":false,"allowSelfSignup":true,"fromAddress":"noreply","paymentProcessors":[{"adapter":"stripe","config":{"secret_token":"","public_token":"","product":{"name":"Ghost Subscription"},"plans":[{"name":"Monthly","currency":"usd","interval":"month","amount":""},{"name":"Yearly","currency":"usd","interval":"year","amount":""}]}}]}', value: '{"allowSelfSignup":true,"fromAddress":"noreply","paymentProcessors":[{"adapter":"stripe","config":{"secret_token":"","public_token":"","product":{"name":"Ghost Subscription"},"plans":[{"name":"Monthly","currency":"usd","interval":"month","amount":""},{"name":"Yearly","currency":"usd","interval":"year","amount":""}]}}]}',
created_at: '2019-10-09T09:49:00.000Z', created_at: '2019-10-09T09:49:00.000Z',
created_by: 1, created_by: 1,
updated_at: '2019-10-09T09:49:00.000Z', updated_at: '2019-10-09T09:49:00.000Z',