Merge branch 'settings' into staging

README.md

@@ -11,14 +11,14 @@ Accept donations in Discourse! Integrates with [Stripe](https://stripe.com).
 
 ## Configuration
 
-Visit `/admin/plugins` and configure your private and public keys.
+Visit `/admin/plugins` and configure.
 
 ## TODO
 
 * Add a plugin outlet for custom user fields.
 * Some tests
 * Handle fails from stripe
-* A button in the user's profile page.
+* Add currency and postcode to settings
 
 ## Testing
 

app/controllers/discourse_donations/charges_controller.rb

@@ -8,6 +8,7 @@ module DiscourseDonations
 
     def create
       Stripe.api_key = SiteSetting.discourse_donations_secret_key
+      currency = SiteSetting.discourse_donations_currency
 
       customer = Stripe::Customer.create(
        :email => current_user.email,
@@ -18,8 +19,9 @@ module DiscourseDonations
         :customer    => customer.id,
         :amount      => params[:amount],
         :description => 'Consumer Defender',
-        :currency    => 'aud'
+        :currency    => currency
       )
+
       render :json => charge
     end
   end

assets/javascripts/discourse/components/stripe-card.js.es6

@@ -7,16 +7,19 @@ export default Ember.Component.extend({
   amount: null,
   stripe: null,
   transactionInProgress: null,
+  settings: null,
 
   init() {
     this._super();
-    var public_key = getRegister(this).lookup('site-settings:main').discourse_donations_public_key
-    this.set('stripe', Stripe(public_key));
+    this.set('settings', getRegister(this).lookup('site-settings:main'));
+    this.set('stripe', Stripe(this.get('settings').discourse_donations_public_key));
   },
 
   card: function() {
     var elements = this.get('stripe').elements();
-    return elements.create('card', { hidePostalCode: true });
+    return elements.create('card', {
+      hidePostalCode: this.get('settings').discourse_donations_hide_zip_code
+    });
   }.property('stripe'),
 
   didInsertElement() {

config/locales/client.de.yml

@@ -5,3 +5,5 @@ en:
       amount: Betrag
       card: Kreditkarte oder Bankkarte
       submit: Spende bezahlen
+      currency: Currency
+      hide_zip_code: Hide Zip Code

config/locales/server.en.yml

@@ -3,3 +3,5 @@ en:
     discourse_donations_enabled: Enable the discourse donations plugin.
     discourse_donations_secret_key: Stripe Secret Key
     discourse_donations_public_key: Stripe Public Key
+    discourse_donations_currency: Curency Code
+    discourse_donations_hide_zip_code: Hide Zip Code

config/settings.yml

@@ -6,3 +6,9 @@ plugins:
     client: false
   discourse_donations_public_key:
     client: true
+  discourse_donations_currency:
+    client: true
+    default: 'USD'
+  discourse_donations_hide_zip_code:
+    default: true
+    client: true

plugin.rb

@@ -1,6 +1,6 @@
 # name: discourse-donations
 # about: Integrating Discourse with Stripe for donations
-# version: 1.8.2
+# version: 1.9.0
 # url: https://github.com/choiceaustralia/discourse-donations
 # authors: Rimian Perkins