From b6c213321be4393fcd4a2b4684e4ef10b2d42044 Mon Sep 17 00:00:00 2001
From: Rimian Perkins <hello@rimian.com.au>
Date: Mon, 27 Feb 2017 11:52:34 +1100
Subject: [PATCH 1/2] update name space in locales

---
 .../discourse/components/stripe-card.js.es6          |  2 +-
 .../discourse/templates/components/stripe-card.hbs   | 10 +++++-----
 .../discourse/templates/user/payments.hbs            |  4 ++--
 config/locales/client.de.yml                         | 12 ++++++------
 config/locales/client.en.yml                         |  2 +-
 plugin.rb                                            |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

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 @@
 <form id="payment-form" class="form-horizontal">
 
   <div class="control-group" style="width: 550px;">
-    <label class="control-label" for="card-element">{{i18n 'discourse_payments.amount'}}</label>
+    <label class="control-label" for="card-element">{{i18n 'discourse_donations.amount'}}</label>
     <div class="controls controls-dropdown">
-      {{combo-box valueAttribute="value" content=paymentAmounts value=amount}}
+      {{combo-box valueAttribute="value" content=donateAmounts value=amount}}
     </div>
   </div>
 
   <div class="control-group" style="width: 550px;">
-    <label class="control-label" for="card-element">{{i18n 'discourse_payments.card'}}</label>
+    <label class="control-label" for="card-element">{{i18n 'discourse_donations.card'}}</label>
     <div id="card-element" class="controls"></div>
   </div>
 
   <div class="control-group save-button">
     <div class="controls">
-      <button {{action "submitStripeCard"}} class="btn btn-primary">{{i18n 'discourse_payments.submit'}}</button>
+      <button {{action "submitStripeCard"}} class="btn btn-primary">{{i18n 'discourse_donations.submit'}}</button>
       {{#if result}}
-        <span>{{i18n 'discourse_payments.success'}}</span>
+        <span>{{i18n 'discourse_donations.success'}}</span>
       {{/if}}
     </div>
   </div>
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"}}
   <div class="user-table">
     <div class="wrapper">
       <section class="user-navigation">
         <ul class="action-list nav-stacked">
-          <li class="no-glyph">{{i18n 'discourse_payments.title'}}</li>
+          <li class="no-glyph">{{i18n 'discourse_donations.title'}}</li>
         </ul>
       </section>
       <section class="user-right">
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 48de9f9..79ea61b 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -1,8 +1,8 @@
 en:
   js:
-    discourse_payments:
-      title: Donate
-      amount: Amount
-      card: Credit or debit card
-      success: Payment Successful!
-      submit: Make Payment
+    discourse_donations:
+      title: Spenden
+      amount: Betrag
+      card: Kreditkarte oder Bankkarte
+      success: Bezahlung erfolgreich !
+      submit: Spende bezahlen
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/plugin.rb b/plugin.rb
index f1f67a2..3f7a797 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
 

From 5328dd7a9a7b1ab1f812e9ed7b769b24f1e5f0a2 Mon Sep 17 00:00:00 2001
From: Rimian Perkins <hello@rimian.com.au>
Date: Mon, 27 Feb 2017 12:07:21 +1100
Subject: [PATCH 2/2] only show the link when the plugin is enabled

---
 .../templates/connectors/user-profile-primary/link.hbs   | 9 +++++----
 config/locales/server.en.yml                             | 3 +++
 config/settings.yml                                      | 4 ++++
 plugin.rb                                                | 2 ++
 4 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 config/locales/server.en.yml
 create mode 100644 config/settings.yml

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 @@
-
-<div class="discourse-donations">
-  <a href="/users/{{model.username}}/payments">Donate</a>
-</div>
+{{#if siteSettings.discourse_donations_enabled}}
+  <div class="discourse-donations">
+    <a href="/users/{{model.username}}/payments">Donate</a>
+  </div>
+{{/if}}
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 3f7a797..1e00238 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -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 = '<script src="https://js.stripe.com/v3/"></script>'