diff --git a/assets/javascripts/discourse/components/stripe-card.js.es6 b/assets/javascripts/discourse/components/stripe-card.js.es6 index b8f5a6d..ac25c07 100644 --- a/assets/javascripts/discourse/components/stripe-card.js.es6 +++ b/assets/javascripts/discourse/components/stripe-card.js.es6 @@ -2,7 +2,7 @@ import { ajax } from 'discourse/lib/ajax'; export default Ember.Component.extend({ result: null, - paymentAmounts: [5, 10], + donateAmounts: [5, 10], amount: null, stripe: Stripe('pk_test_b8RmhzlL8QPizJRqOrKF3JEV'), diff --git a/assets/javascripts/discourse/templates/components/stripe-card.hbs b/assets/javascripts/discourse/templates/components/stripe-card.hbs index 15b111f..5983439 100644 --- a/assets/javascripts/discourse/templates/components/stripe-card.hbs +++ b/assets/javascripts/discourse/templates/components/stripe-card.hbs @@ -1,22 +1,22 @@
- +
- {{combo-box valueAttribute="value" content=paymentAmounts value=amount}} + {{combo-box valueAttribute="value" content=donateAmounts value=amount}}
- +
- + {{#if result}} - {{i18n 'discourse_payments.success'}} + {{i18n 'discourse_donations.success'}} {{/if}}
diff --git a/assets/javascripts/discourse/templates/connectors/user-profile-primary/link.hbs b/assets/javascripts/discourse/templates/connectors/user-profile-primary/link.hbs index 8dc3f75..6fb4ef1 100644 --- a/assets/javascripts/discourse/templates/connectors/user-profile-primary/link.hbs +++ b/assets/javascripts/discourse/templates/connectors/user-profile-primary/link.hbs @@ -1,4 +1,5 @@ - -
- Donate -
+{{#if siteSettings.discourse_donations_enabled}} +
+ Donate +
+{{/if}} diff --git a/assets/javascripts/discourse/templates/user/payments.hbs b/assets/javascripts/discourse/templates/user/payments.hbs index bca741e..229f783 100644 --- a/assets/javascripts/discourse/templates/user/payments.hbs +++ b/assets/javascripts/discourse/templates/user/payments.hbs @@ -1,9 +1,9 @@ -{{#d-section pageClass="user-payments" class="user-content user-payments"}} +{{#d-section pageClass="user-donations" class="user-content user-donations"}}
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index e59716b..79ea61b 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -1,6 +1,6 @@ en: js: - discourse_payments: + discourse_donations: title: Spenden amount: Betrag card: Kreditkarte oder Bankkarte diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 48de9f9..23708ec 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1,6 +1,6 @@ en: js: - discourse_payments: + discourse_donations: title: Donate amount: Amount card: Credit or debit card diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml new file mode 100644 index 0000000..4450eb9 --- /dev/null +++ b/config/locales/server.en.yml @@ -0,0 +1,3 @@ +en: + site_settings: + discourse_donations_enabled: "Enable the discourse donations plugin." diff --git a/config/settings.yml b/config/settings.yml new file mode 100644 index 0000000..b66dd35 --- /dev/null +++ b/config/settings.yml @@ -0,0 +1,4 @@ +plugins: + discourse_donations_enabled: + default: true + client: true diff --git a/plugin.rb b/plugin.rb index f1f67a2..1e00238 100644 --- a/plugin.rb +++ b/plugin.rb @@ -1,6 +1,6 @@ # name: discourse-donations # about: Integrating Discourse with Stripe for donations -# version: 1.6.1 +# version: 1.6.2 # url: https://github.com/choiceaustralia/discourse-donations # authors: Rimian Perkins @@ -9,6 +9,8 @@ gem 'stripe', '2.0.1' load File.expand_path('../lib/discourse_donations/engine.rb', __FILE__) load File.expand_path('../config/stripe.rb', __FILE__) +enabled_site_setting :discourse_donations_enabled + after_initialize do header_script = ''