From 5723b91ba2724c44bc5856433203cdee5174d08b Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Thu, 21 Jun 2018 19:00:19 +1000
Subject: [PATCH 1/7] Donation form style updates

---
 assets/stylesheets/discourse-donations.scss | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/assets/stylesheets/discourse-donations.scss b/assets/stylesheets/discourse-donations.scss
index dcbe614..50f5927 100644
--- a/assets/stylesheets/discourse-donations.scss
+++ b/assets/stylesheets/discourse-donations.scss
@@ -14,6 +14,20 @@ div.stripe-errors {
 
 .donations-page-payment {
   padding-top: 60px;
+
+  #payment-form {
+    .control-label {
+      margin: 0 6.5px;
+    }
+
+    .select-kit ul {
+      margin: 0;
+    }
+
+    input[type="checkbox"] {
+      margin: 0;
+    }
+  }
 }
 
 .transaction-fee-description {

From d55d149d7de8e3f790311d22afcd9f9e7baacbc8 Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Thu, 21 Jun 2018 19:00:43 +1000
Subject: [PATCH 2/7] Add recurring donations

---
 .../discourse_donations/charges_controller.rb | 43 ++++++++----
 app/services/discourse_donations/stripe.rb    | 70 ++++++++++++++++---
 .../discourse/components/stripe-card.js.es6   | 34 +++++++++
 .../templates/components/stripe-card.hbs      | 12 +++-
 config/locales/client.en.yml                  | 14 +++-
 config/settings.yml                           |  9 +++
 plugin.rb                                     |  2 +-
 7 files changed, 158 insertions(+), 26 deletions(-)

diff --git a/app/controllers/discourse_donations/charges_controller.rb b/app/controllers/discourse_donations/charges_controller.rb
index 7563474..c712d19 100644
--- a/app/controllers/discourse_donations/charges_controller.rb
+++ b/app/controllers/discourse_donations/charges_controller.rb
@@ -1,10 +1,11 @@
 require_dependency 'discourse'
 
 module DiscourseDonations
-  class ChargesController < ApplicationController
+  class ChargesController < ::ApplicationController
 
     skip_before_action :verify_authenticity_token, only: [:create]
     skip_before_action :check_xhr
+    before_action :set_user_and_email, only: [:create]
 
     def create
       Rails.logger.info user_params.inspect
@@ -12,7 +13,7 @@ module DiscourseDonations
       output = { 'messages' => [], 'rewards' => [] }
 
       if create_account
-        if !email.present? || !user_params[:username].present?
+        if !@email.present? || !user_params[:username].present?
           output['messages'] << I18n.t('login.missing_user_field')
         end
         if user_params[:password] && user_params[:password].length > User.max_password_length
@@ -32,15 +33,19 @@ module DiscourseDonations
 
       begin
         Rails.logger.debug "Creating a Stripe charge for #{user_params[:amount]}"
-        charge_params = [user_params[:stripeToken], user_params[:amount]]
+        opts = {
+          email: @email,
+          token: user_params[:stripeToken],
+          amount: user_params[:amount]
+        }
 
-        if user
-          charge_params.unshift(user, user.email)
+        if user_params[:type] === 'once'
+          charge = payment.charge(@user, opts)
         else
-          charge_params.unshift(nil, email)
+          opts[:type] = user_params[:type]
+          charge = payment.subscribe(@user, opts)
         end
 
-        charge = payment.charge(*charge_params)
       rescue ::Stripe::CardError => e
         err = e.json_body[:error]
 
@@ -58,7 +63,7 @@ module DiscourseDonations
         output['rewards'] << { type: :group, name: group_name } if group_name
         output['rewards'] << { type: :badge, name: badge_name } if badge_name
 
-        if create_account && email.present?
+        if create_account && @email.present?
           args = user_params.to_h.slice(:email, :username, :password, :name).merge(rewards: output['rewards'])
           Jobs.enqueue(:donation_user, args)
         end
@@ -97,19 +102,27 @@ module DiscourseDonations
     end
 
     def user_params
-      params.permit(:user_id, :name, :username, :email, :password, :stripeToken, :amount, :create_account)
+      params.permit(:user_id, :name, :username, :email, :password, :stripeToken, :type, :amount, :create_account)
     end
 
     def email
-      user_params[:email] || user.try(:email)
     end
 
-    def user
-      if user_params[:user_id]
-        User.find(user_params[:user_id])
-      else
-        current_user
+    def set_user_and_email
+      user = current_user
+
+      if user_params[:user_id].present?
+        user = User.find(user_params[:user_id])
       end
+
+      if user_params[:email].present?
+        email = user_params[:email]
+      else
+        email = user.try(:email)
+      end
+
+      @user = user
+      @email = email
     end
   end
 end
diff --git a/app/services/discourse_donations/stripe.rb b/app/services/discourse_donations/stripe.rb
index 936fcb7..893d4a2 100644
--- a/app/services/discourse_donations/stripe.rb
+++ b/app/services/discourse_donations/stripe.rb
@@ -1,3 +1,5 @@
+RECURRING_DONATION_PRODUCT_ID = 'discourse_donation_recurring'
+
 module DiscourseDonations
   class Stripe
     attr_reader :charge, :currency, :description
@@ -10,32 +12,47 @@ module DiscourseDonations
 
     def checkoutCharge(user = nil, email, token, amount)
       customer = customer(user, email, token)
+
       charge = ::Stripe::Charge.create(
         customer: customer.id,
         amount: amount,
         description: @description,
         currency: @currency
       )
+
       charge
     end
 
-    def charge(user = nil, email, token, amount)
-      customer = customer(user, email, token)
+    def charge(user = nil, opts)
+      customer = customer(user, opts[:email], opts[:token])
+
       @charge = ::Stripe::Charge.create(
         customer: customer.id,
-        amount: amount,
-        description: description,
-        currency: currency
+        amount: opts[:amount],
+        description: @description,
+        currency: @currency
       )
+
       @charge
     end
 
-    def subscribe(user = nil, email, opts)
-      customer = customer(user, email, opts[:stripeToken])
+    def subscribe(user = nil, opts)
+      customer = customer(user, opts[:email], opts[:token])
+
+      plans = ::Stripe::Plan.list
+      type = opts[:type]
+      plan_id = create_plan_id(type)
+
+      unless plans.data && plans.data.any? { |p| p['id'] === plan_id }
+        result = create_plan(type, opts[:amount])
+        plan_id = result['id']
+      end
+
       @subscription = ::Stripe::Subscription.create(
         customer: customer.id,
-        plan: opts[:plan]
+        items: [{ plan: plan_id }]
       )
+
       @subscription
     end
 
@@ -47,10 +64,12 @@ module DiscourseDonations
           email: email,
           source: source
         )
+
         if user
           user.custom_fields['stripe_customer_id'] = customer.id
           user.save_custom_fields(true)
         end
+
         customer
       end
     end
@@ -58,5 +77,40 @@ module DiscourseDonations
     def successful?
       @charge[:paid]
     end
+
+    def create_plan(type, amount)
+      id = create_plan_id(type)
+      nickname = id.gsub(/_/, ' ').titleize
+
+      products = ::Stripe::Product.list(type: 'service')
+
+      if products['data'] && products['data'].any? { |p| p['id'] === RECURRING_DONATION_PRODUCT_ID }
+        product = RECURRING_DONATION_PRODUCT_ID
+      else
+        result = create_product
+        product = result['id']
+      end
+
+      ::Stripe::Plan.create(
+        id: id,
+        nickname: nickname,
+        interval: type.tr('ly', ''),
+        currency: @currency,
+        product: product,
+        amount: amount.to_i
+      )
+    end
+
+    def create_product
+      ::Stripe::Product.create(
+        id: RECURRING_DONATION_PRODUCT_ID,
+        name: "Discourse Donation Recurring",
+        type: 'service'
+      )
+    end
+
+    def create_plan_id(type)
+      "discourse_donation_recurring_#{type}"
+    end
   end
 end
diff --git a/assets/javascripts/discourse/components/stripe-card.js.es6 b/assets/javascripts/discourse/components/stripe-card.js.es6
index ee83b52..add4db7 100644
--- a/assets/javascripts/discourse/components/stripe-card.js.es6
+++ b/assets/javascripts/discourse/components/stripe-card.js.es6
@@ -16,6 +16,39 @@ export default Ember.Component.extend({
     this.set('settings', getRegister(this).lookup('site-settings:main'));
     this.set('create_accounts', this.get('anon') && this.get('settings').discourse_donations_enable_create_accounts);
     this.set('stripe', Stripe(this.get('settings').discourse_donations_public_key));
+
+    const types = Discourse.SiteSettings.discourse_donations_types.split('|') || [];
+    this.set('types', types);
+    this.set('type', types[0]);
+  },
+
+  @computed('types')
+  donationTypes(types) {
+    return types.map((type) => {
+      return {
+        id: type,
+        name: I18n.t(`discourse_donations.types.${type}`)
+      }
+    })
+  },
+
+  @computed('type')
+  period(type) {
+    let anchor;
+
+    if (type === 'weekly') {
+      anchor = moment().format('dddd');
+    }
+
+    if (type === 'monthly') {
+      anchor = moment().format('Do');
+    }
+
+    if (type === 'yearly') {
+      anchor = moment().format('MMMM D');
+    }
+
+    return I18n.t(`discourse_donations.period.${type}`, { anchor });
   },
 
   @computed
@@ -91,6 +124,7 @@ export default Ember.Component.extend({
           const amount = transactionFeeEnabled ? this.get('totalAmount') : this.get('amount');
           let params = {
             stripeToken: data.token.id,
+            type: self.get('type'),
             amount: amount * 100,
             email: self.get('email'),
             username: self.get('username'),
diff --git a/assets/javascripts/discourse/templates/components/stripe-card.hbs b/assets/javascripts/discourse/templates/components/stripe-card.hbs
index d3fd676..7b3fc3b 100644
--- a/assets/javascripts/discourse/templates/components/stripe-card.hbs
+++ b/assets/javascripts/discourse/templates/components/stripe-card.hbs
@@ -1,5 +1,14 @@
 <form id="payment-form" class="form-horizontal">
 
+  <div class="control-group">
+    <label class="control-label">
+      {{i18n 'discourse_donations.type'}}
+    </label>
+    <div class="controls controls-dropdown">
+      {{combo-box content=donationTypes value=type}}
+    </div>
+  </div>
+
   <div class="control-group">
     <label class="control-label" for="card-element">
       {{i18n 'discourse_donations.amount'}}
@@ -14,7 +23,7 @@
     <div class="control-group">
       <div class="controls">
         {{input type="checkbox" checked=includeTransactionFee}}
-        {{i18n 'discourse_donations.transaction_fee.label' transactionFee=transactionFee currency=settings.discourse_donations_currency}}
+        <span>{{i18n 'discourse_donations.transaction_fee.label' transactionFee=transactionFee currency=settings.discourse_donations_currency}}</span>
         <div class='transaction-fee-description' {{action 'toggleTransactionFeeDescription'}}>
           {{d-icon 'info-circle'}}
           {{#if showTransactionFeeDescription}}
@@ -32,6 +41,7 @@
       <div class="controls">
         {{settings.discourse_donations_currency}}
         {{totalAmount}}
+        {{period}}
       </div>
     </div>
   {{/if}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 975e9ba..26cef77 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -17,6 +17,7 @@ en:
     discourse_donations_transaction_fee_percent: "Percent part of Stripe transaction fee (changes per region). See <a href='https://stripe.com/pricing'>Stripe's pricing for your region</a> and <a href='https://support.stripe.com/questions/can-i-charge-my-stripe-fees-to-my-customers'>Stripe's explaination of passing fees onto customers</a>."
     discourse_donations_amounts: "Donation amounts available to user"
     discourse_donations_custom_amount: "Allow custom donation amount"
+    discourse_donations_types: "Donation types. First listed will be the default."
     errors:
       discourse_donations_amount_must_be_number: "Amounts must be numbers"
 
@@ -25,7 +26,7 @@ en:
       title: Donate
       nav_item: Donate
       amount: Amount
-      card: Credit or debit card
+      card: Card
       submit: Make Payment
       submit_with_create_account: Make Payment and Create Account
       transaction_fee:
@@ -34,3 +35,14 @@ en:
         total: "Total"
       messages:
         success: Thank you for your donation!
+      type: "Type"
+      types:
+        once: "Once"
+        weekly: "Weekly"
+        monthly: "Monthly"
+        yearly: "Yearly"
+      period:
+        once: "once."
+        weekly: "every week on {{anchor}}."
+        monthly: "on the {{anchor}} of every month."
+        yearly: "every year on {{anchor}}."
diff --git a/config/settings.yml b/config/settings.yml
index 8ba2e94..066f016 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -50,3 +50,12 @@ plugins:
     default: '1|2|5|10|20|50'
     regex: "^[0-9\\|]+$"
     regex_error: "site_settings.errors.discourse_donations_amount_must_be_number"
+  discourse_donations_types:
+    client: true
+    type: list
+    default: 'monthly|once'
+    choices:
+      - yearly
+      - monthly
+      - weekly
+      - once
diff --git a/plugin.rb b/plugin.rb
index b6f6f56..9f6715d 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -22,7 +22,7 @@ after_initialize do
   class ::User
     def stripe_customer_id
       if custom_fields['stripe_customer_id']
-        custom_fields['stripe_customer_id']
+        custom_fields['stripe_customer_id'].to_s
       else
         nil
       end

From 90f5083fb64e2a1f2203e01c9a26441c49bdd2e8 Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Fri, 22 Jun 2018 11:55:16 +1000
Subject: [PATCH 3/7] Small fixes

---
 .../discourse_donations/charges_controller.rb |  6 ++---
 .../discourse/components/stripe-card.js.es6   | 24 ++++++++++++++++---
 config/locales/client.en.yml                  |  4 ++--
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/app/controllers/discourse_donations/charges_controller.rb b/app/controllers/discourse_donations/charges_controller.rb
index c712d19..ba30895 100644
--- a/app/controllers/discourse_donations/charges_controller.rb
+++ b/app/controllers/discourse_donations/charges_controller.rb
@@ -40,10 +40,10 @@ module DiscourseDonations
         }
 
         if user_params[:type] === 'once'
-          charge = payment.charge(@user, opts)
+          result = payment.charge(@user, opts)
         else
           opts[:type] = user_params[:type]
-          charge = payment.subscribe(@user, opts)
+          result = payment.subscribe(@user, opts)
         end
 
       rescue ::Stripe::CardError => e
@@ -57,7 +57,7 @@ module DiscourseDonations
         render(json: output) && (return)
       end
 
-      if charge['paid'] == true
+      if result['paid'] == true || result['status'] === 'active'
         output['messages'] << I18n.l(Time.now(), format: :long) + ': ' + I18n.t('donations.payment.success')
 
         output['rewards'] << { type: :group, name: group_name } if group_name
diff --git a/assets/javascripts/discourse/components/stripe-card.js.es6 b/assets/javascripts/discourse/components/stripe-card.js.es6
index add4db7..ca4bc3c 100644
--- a/assets/javascripts/discourse/components/stripe-card.js.es6
+++ b/assets/javascripts/discourse/components/stripe-card.js.es6
@@ -4,7 +4,6 @@ import { default as computed } from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Component.extend({
   result: [],
-  amount: 1,
   stripe: null,
   transactionInProgress: null,
   settings: null,
@@ -18,8 +17,13 @@ export default Ember.Component.extend({
     this.set('stripe', Stripe(this.get('settings').discourse_donations_public_key));
 
     const types = Discourse.SiteSettings.discourse_donations_types.split('|') || [];
-    this.set('types', types);
-    this.set('type', types[0]);
+    const amounts = this.get('donateAmounts');
+
+    this.setProperties({
+      types,
+      type: types[0],
+      amount: amounts[0].value
+    });
   },
 
   @computed('types')
@@ -91,6 +95,20 @@ export default Ember.Component.extend({
   didInsertElement() {
     this._super();
     this.get('card').mount('#card-element');
+    Ember.$(document).on('click', Ember.run.bind(this, this.documentClick));
+  },
+
+  willDestroyElement() {
+    Ember.$(document).off('click', Ember.run.bind(this, this.documentClick));
+  },
+
+  documentClick(e) {
+    let $element = this.$('.transaction-fee-description');
+    let $target = $(e.target);
+    if ($target.closest($element).length < 1 &&
+        this._state !== 'destroying') {
+      this.set('showTransactionFeeDescription', false);
+    }
   },
 
   setSuccess() {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 26cef77..e85a01a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -15,7 +15,7 @@ en:
     discourse_donations_enable_transaction_fee: "Give the user the option of including the Stripe transaction fee in their donation."
     discourse_donations_transaction_fee_fixed: "Fixed part of Stripe transaction fee (changes per region). See <a href='https://stripe.com/pricing'>Stripe's pricing for your region</a> and <a href='https://support.stripe.com/questions/can-i-charge-my-stripe-fees-to-my-customers'>Stripe's explaination of passing fees onto customers</a>."
     discourse_donations_transaction_fee_percent: "Percent part of Stripe transaction fee (changes per region). See <a href='https://stripe.com/pricing'>Stripe's pricing for your region</a> and <a href='https://support.stripe.com/questions/can-i-charge-my-stripe-fees-to-my-customers'>Stripe's explaination of passing fees onto customers</a>."
-    discourse_donations_amounts: "Donation amounts available to user"
+    discourse_donations_amounts: "Donation amounts available to user. First listed will be the default."
     discourse_donations_custom_amount: "Allow custom donation amount"
     discourse_donations_types: "Donation types. First listed will be the default."
     errors:
@@ -31,7 +31,7 @@ en:
       submit_with_create_account: Make Payment and Create Account
       transaction_fee:
         label: "Include transaction fee of {{currency}} {{transactionFee}}"
-        description: "When you make a donation we get charged a transaciton fee. If you would like to help us out with this fee, check this box and it will be included in your donation."
+        description: "When you make a donation we get charged a transaction fee. If you would like to help us out with this fee, check this box and it will be included in your donation."
         total: "Total"
       messages:
         success: Thank you for your donation!

From 8453d5cc03527c22c6414c453f217757ec65017a Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Mon, 25 Jun 2018 18:14:50 +1000
Subject: [PATCH 4/7] various

---
 app/controllers/controllers.rb                |  2 +
 .../discourse_donations/charges_controller.rb | 53 +++++++---
 .../payments_controller.rb                    | 11 ---
 .../discourse_donations/application_helper.rb |  5 -
 app/services/discourse_donations/stripe.rb    | 67 +++++++++++--
 app/services/services.rb                      |  2 +
 .../discourse/components/donation-list.js.es6 |  5 +
 .../discourse/components/stripe-card.js.es6   | 98 +++++++++++++------
 .../discourse/controllers/donate.js.es6       | 11 +++
 .../discourse/helpers/donation.js.es6         | 56 +++++++++++
 .../discourse/lib/donation-utilities.js.es6   | 31 ++++++
 .../discourse/routes/donate.js.es6            | 20 ++++
 .../templates/components/donation-list.hbs    | 23 +++++
 .../templates/components/stripe-card.hbs      | 15 ++-
 .../connectors/extra-nav-item/donate.hbs      |  6 +-
 .../discourse/templates/donate.hbs            | 21 +++-
 assets/stylesheets/discourse-donations.scss   | 23 ++++-
 config/locales/client.en.yml                  | 25 +++--
 config/locales/server.en.yml                  |  5 +-
 config/routes.rb                              |  5 +-
 config/settings.yml                           |  8 +-
 lib/discourse_donations/engine.rb             |  1 -
 plugin.rb                                     | 16 +--
 23 files changed, 406 insertions(+), 103 deletions(-)
 create mode 100644 app/controllers/controllers.rb
 delete mode 100644 app/controllers/discourse_donations/payments_controller.rb
 delete mode 100644 app/helpers/discourse_donations/application_helper.rb
 create mode 100644 app/services/services.rb
 create mode 100644 assets/javascripts/discourse/components/donation-list.js.es6
 create mode 100644 assets/javascripts/discourse/controllers/donate.js.es6
 create mode 100644 assets/javascripts/discourse/helpers/donation.js.es6
 create mode 100644 assets/javascripts/discourse/lib/donation-utilities.js.es6
 create mode 100644 assets/javascripts/discourse/routes/donate.js.es6
 create mode 100644 assets/javascripts/discourse/templates/components/donation-list.hbs

diff --git a/app/controllers/controllers.rb b/app/controllers/controllers.rb
new file mode 100644
index 0000000..d11f590
--- /dev/null
+++ b/app/controllers/controllers.rb
@@ -0,0 +1,2 @@
+load File.expand_path('../discourse_donations/charges_controller.rb', __FILE__)
+load File.expand_path('../discourse_donations/checkout_controller.rb', __FILE__)
diff --git a/app/controllers/discourse_donations/charges_controller.rb b/app/controllers/discourse_donations/charges_controller.rb
index ba30895..1c79371 100644
--- a/app/controllers/discourse_donations/charges_controller.rb
+++ b/app/controllers/discourse_donations/charges_controller.rb
@@ -1,11 +1,18 @@
-require_dependency 'discourse'
-
 module DiscourseDonations
   class ChargesController < ::ApplicationController
-
     skip_before_action :verify_authenticity_token, only: [:create]
-    skip_before_action :check_xhr
-    before_action :set_user_and_email, only: [:create]
+    before_action :set_user, only: [:index, :create]
+    before_action :set_email, only: [:create]
+
+    def index
+      if @user && @user.stripe_customer_id
+        result = DiscourseDonations::Stripe.new(secret_key, stripe_options).list(@user)
+      else
+        result = {}
+      end
+
+      render json: success_json.merge(result)
+    end
 
     def create
       Rails.logger.info user_params.inspect
@@ -30,6 +37,7 @@ module DiscourseDonations
 
       Rails.logger.debug "Creating a Stripe payment"
       payment = DiscourseDonations::Stripe.new(secret_key, stripe_options)
+      result = {}
 
       begin
         Rails.logger.debug "Creating a Stripe charge for #{user_params[:amount]}"
@@ -40,15 +48,17 @@ module DiscourseDonations
         }
 
         if user_params[:type] === 'once'
-          result = payment.charge(@user, opts)
+          result[:payment] = payment.charge(@user, opts)
         else
           opts[:type] = user_params[:type]
-          result = payment.subscribe(@user, opts)
+          result[:subscription] = payment.subscribe(@user, opts)
         end
 
       rescue ::Stripe::CardError => e
         err = e.json_body[:error]
 
+        puts "HERE IS THE ERROR: #{e.inspect}"
+
         output['messages'] << "There was an error (#{err[:type]})."
         output['messages'] << "Error code: #{err[:code]}" if err[:code]
         output['messages'] << "Decline code: #{err[:decline_code]}" if err[:decline_code]
@@ -57,8 +67,21 @@ module DiscourseDonations
         render(json: output) && (return)
       end
 
-      if result['paid'] == true || result['status'] === 'active'
-        output['messages'] << I18n.l(Time.now(), format: :long) + ': ' + I18n.t('donations.payment.success')
+      if (result[:charge] && result[:charge]['paid'] == true) ||
+         (result[:subscription] && result[:subscription]['status'] === 'active')
+
+        output['messages'] << I18n.t('donations.payment.success')
+
+        if result[:charge]
+          output['messages'] << " #{I18n.t('donations.payment.receipt_sent', email: @email)}"
+        end
+
+        if result[:subscription]
+          output['messages'] << " #{I18n.t('donations.payment.invoice_sent', email: @email)}"
+        end
+
+        output['charge'] = result[:charge] if result[:charge]
+        output['subscription'] = result[:subscription] if result[:subscription]
 
         output['rewards'] << { type: :group, name: group_name } if group_name
         output['rewards'] << { type: :badge, name: badge_name } if badge_name
@@ -105,23 +128,23 @@ module DiscourseDonations
       params.permit(:user_id, :name, :username, :email, :password, :stripeToken, :type, :amount, :create_account)
     end
 
-    def email
-    end
-
-    def set_user_and_email
+    def set_user
       user = current_user
 
       if user_params[:user_id].present?
         user = User.find(user_params[:user_id])
       end
 
+      @user = user
+    end
+
+    def set_email
       if user_params[:email].present?
         email = user_params[:email]
       else
-        email = user.try(:email)
+        email = @user.try(:email)
       end
 
-      @user = user
       @email = email
     end
   end
diff --git a/app/controllers/discourse_donations/payments_controller.rb b/app/controllers/discourse_donations/payments_controller.rb
deleted file mode 100644
index e4a6c27..0000000
--- a/app/controllers/discourse_donations/payments_controller.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module DiscourseDonations
-  class PaymentsController < ApplicationController
-    def index
-      render json: {}
-    end
-
-    def show
-      render json: {}
-    end
-  end
-end
diff --git a/app/helpers/discourse_donations/application_helper.rb b/app/helpers/discourse_donations/application_helper.rb
deleted file mode 100644
index 9009142..0000000
--- a/app/helpers/discourse_donations/application_helper.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-
-module DiscourseDonations
-  module ApplicationHelper
-  end
-end
diff --git a/app/services/discourse_donations/stripe.rb b/app/services/discourse_donations/stripe.rb
index 893d4a2..c43a9cf 100644
--- a/app/services/discourse_donations/stripe.rb
+++ b/app/services/discourse_donations/stripe.rb
@@ -1,5 +1,3 @@
-RECURRING_DONATION_PRODUCT_ID = 'discourse_donation_recurring'
-
 module DiscourseDonations
   class Stripe
     attr_reader :charge, :currency, :description
@@ -30,7 +28,8 @@ module DiscourseDonations
         customer: customer.id,
         amount: opts[:amount],
         description: @description,
-        currency: @currency
+        currency: @currency,
+        receipt_email: customer.email
       )
 
       @charge
@@ -56,7 +55,49 @@ module DiscourseDonations
       @subscription
     end
 
-    def customer(user, email, source)
+    def list(user)
+      customer = customer(user)
+      result = {}
+
+      raw_invoices = ::Stripe::Invoice.list(customer: customer.id)
+      raw_invoices = raw_invoices.is_a?(Object) ? raw_invoices['data'] : []
+
+      raw_charges = ::Stripe::Charge.list(customer: customer.id)
+      raw_charges = raw_charges.is_a?(Object) ? raw_charges['data'] : []
+
+      if raw_invoices.any?
+        raw_subscriptions = ::Stripe::Subscription.list(customer: customer.id)['data']
+
+        if raw_subscriptions.any?
+          subscriptions = []
+
+          raw_subscriptions.each do |subscription|
+            invoices = raw_invoices.select do |invoice|
+              invoice['subscription'] === subscription['id']
+            end
+
+            subscriptions.push(
+              subscription: subscription,
+              invoices: invoices
+            )
+          end
+
+          result[:subscriptions] = subscriptions
+        end
+
+        ## filter out any charges related to subscriptions
+        raw_invoice_ids = raw_invoices.map { |i| i['id'] }
+        raw_charges = raw_charges.select { |c| raw_invoice_ids.exclude?(c['invoice']) }
+      end
+
+      if raw_charges.any?
+        result[:charges] = raw_charges
+      end
+
+      result
+    end
+
+    def customer(user, email = nil, source = nil)
       if user && user.stripe_customer_id
         ::Stripe::Customer.retrieve(user.stripe_customer_id)
       else
@@ -84,8 +125,8 @@ module DiscourseDonations
 
       products = ::Stripe::Product.list(type: 'service')
 
-      if products['data'] && products['data'].any? { |p| p['id'] === RECURRING_DONATION_PRODUCT_ID }
-        product = RECURRING_DONATION_PRODUCT_ID
+      if products['data'] && products['data'].any? { |p| p['id'] === product_id }
+        product = product_id
       else
         result = create_product
         product = result['id']
@@ -94,7 +135,7 @@ module DiscourseDonations
       ::Stripe::Plan.create(
         id: id,
         nickname: nickname,
-        interval: type.tr('ly', ''),
+        interval: type,
         currency: @currency,
         product: product,
         amount: amount.to_i
@@ -103,12 +144,20 @@ module DiscourseDonations
 
     def create_product
       ::Stripe::Product.create(
-        id: RECURRING_DONATION_PRODUCT_ID,
-        name: "Discourse Donation Recurring",
+        id: product_id,
+        name: product_name,
         type: 'service'
       )
     end
 
+    def product_id
+      @product_id ||= "#{SiteSetting.title}_recurring_donation"
+    end
+
+    def product_name
+      @product_name ||= I18n.t('discourse_donations.recurring', site_title: SiteSetting.title)
+    end
+
     def create_plan_id(type)
       "discourse_donation_recurring_#{type}"
     end
diff --git a/app/services/services.rb b/app/services/services.rb
new file mode 100644
index 0000000..8e8aabc
--- /dev/null
+++ b/app/services/services.rb
@@ -0,0 +1,2 @@
+load File.expand_path('../discourse_donations/rewards.rb', __FILE__)
+load File.expand_path('../discourse_donations/stripe.rb', __FILE__)
diff --git a/assets/javascripts/discourse/components/donation-list.js.es6 b/assets/javascripts/discourse/components/donation-list.js.es6
new file mode 100644
index 0000000..744ebe3
--- /dev/null
+++ b/assets/javascripts/discourse/components/donation-list.js.es6
@@ -0,0 +1,5 @@
+export default Ember.Component.extend({
+  classNames: 'donation-list',
+  hasSubscriptions: Ember.computed.notEmpty('subscriptions'),
+  hasCharges: Ember.computed.notEmpty('charges')
+})
diff --git a/assets/javascripts/discourse/components/stripe-card.js.es6 b/assets/javascripts/discourse/components/stripe-card.js.es6
index ca4bc3c..d02b917 100644
--- a/assets/javascripts/discourse/components/stripe-card.js.es6
+++ b/assets/javascripts/discourse/components/stripe-card.js.es6
@@ -1,5 +1,6 @@
 import { ajax } from 'discourse/lib/ajax';
 import { getRegister } from 'discourse-common/lib/get-owner';
+import { formatAnchor, zeroDecimalCurrencies } from '../lib/donation-utilities';
 import { default as computed } from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Component.extend({
@@ -11,12 +12,13 @@ export default Ember.Component.extend({
 
   init() {
     this._super();
-    this.set('anon', (!Discourse.User.current()));
-    this.set('settings', getRegister(this).lookup('site-settings:main'));
-    this.set('create_accounts', this.get('anon') && this.get('settings').discourse_donations_enable_create_accounts);
-    this.set('stripe', Stripe(this.get('settings').discourse_donations_public_key));
+    const user = this.get('currentUser');
+    const settings = Discourse.SiteSettings;
 
-    const types = Discourse.SiteSettings.discourse_donations_types.split('|') || [];
+    this.set('create_accounts', !user && settings.discourse_donations_enable_create_accounts);
+    this.set('stripe', Stripe(settings.discourse_donations_public_key));
+
+    const types = settings.discourse_donations_types.split('|') || [];
     const amounts = this.get('donateAmounts');
 
     this.setProperties({
@@ -38,21 +40,7 @@ export default Ember.Component.extend({
 
   @computed('type')
   period(type) {
-    let anchor;
-
-    if (type === 'weekly') {
-      anchor = moment().format('dddd');
-    }
-
-    if (type === 'monthly') {
-      anchor = moment().format('Do');
-    }
-
-    if (type === 'yearly') {
-      anchor = moment().format('MMMM D');
-    }
-
-    return I18n.t(`discourse_donations.period.${type}`, { anchor });
+    return I18n.t(`discourse_donations.period.${type}`, { anchor: formatAnchor(type) });
   },
 
   @computed
@@ -73,9 +61,23 @@ export default Ember.Component.extend({
   @computed('stripe')
   card(stripe) {
     let elements = stripe.elements();
-    return elements.create('card', {
-      hidePostalCode: !this.get('settings').discourse_donations_zip_code
+    let card = elements.create('card', {
+      hidePostalCode: !Discourse.SiteSettings.discourse_donations_zip_code
     });
+
+    card.addEventListener('change', (event) => {
+      if (event.error) {
+        this.set('stripeError', event.error.message);
+      } else {
+        this.set('stripeError', '');
+      }
+
+      if (event.elementType === 'card' && event.complete) {
+        this.set('stripeReady', true);
+      }
+    });
+
+    return card;
   },
 
   @computed('amount')
@@ -92,6 +94,21 @@ export default Ember.Component.extend({
     return amount;
   },
 
+  @computed('currentUser', 'email')
+  userReady(currentUser, email) {
+    return currentUser || email;
+  },
+
+  @computed('userReady', 'stripeReady')
+  formIncomplete(userReady, stripeReady) {
+    return !userReady || !stripeReady;
+  },
+
+  @computed('transactionInProgress', 'formIncomplete')
+  disableSubmit(transactionInProgress, formIncomplete) {
+    return transactionInProgress || formIncomplete;
+  },
+
   didInsertElement() {
     this._super();
     this.get('card').mount('#card-element');
@@ -130,27 +147,52 @@ export default Ember.Component.extend({
 
     submitStripeCard() {
       let self = this;
-      self.set('transactionInProgress', true);
+      this.set('transactionInProgress', true);
+
       this.get('stripe').createToken(this.get('card')).then(data => {
         self.set('result', []);
 
         if (data.error) {
-          self.set('result', data.error.message);
+          this.setProperties({
+            stripeError: data.error.message,
+            stripeReady: false
+          });
           self.endTranscation();
         } else {
-          const transactionFeeEnabled = Discourse.SiteSettings.discourse_donations_enable_transaction_fee;
-          const amount = transactionFeeEnabled ? this.get('totalAmount') : this.get('amount');
+          const settings = Discourse.SiteSettings;
+
+          const transactionFeeEnabled = settings.discourse_donations_enable_transaction_fee;
+          let amount = transactionFeeEnabled ? this.get('totalAmount') : this.get('amount');
+
+          if (zeroDecimalCurrencies.indexOf(setting.discourse_donations_currency) === -1) {
+            amount = amount * 100;
+          }
+
           let params = {
             stripeToken: data.token.id,
             type: self.get('type'),
-            amount: amount * 100,
+            amount,
             email: self.get('email'),
             username: self.get('username'),
             create_account: self.get('create_accounts')
           };
 
           if(!self.get('paymentSuccess')) {
-            ajax('/charges', { data: params, method: 'post' }).then(d => {
+            ajax('/donate/charges', { data: params, method: 'post' }).then(d => {
+              let donation = d.donation;
+
+              if (donation) {
+                if (donation.object === 'subscription') {
+                  let subscriptions = this.get('subscriptions') || [];
+                  subscriptions.push(donation);
+                  this.set('subscriptions', subscriptions);
+                } else if (donation.object === 'charge') {
+                  let charges = this.get('charges') || [];
+                  charges.push(donation);
+                  this.set('charges', charges);
+                }
+              }
+
               self.concatMessages(d.messages);
               self.endTranscation();
             });
diff --git a/assets/javascripts/discourse/controllers/donate.js.es6 b/assets/javascripts/discourse/controllers/donate.js.es6
new file mode 100644
index 0000000..daecc05
--- /dev/null
+++ b/assets/javascripts/discourse/controllers/donate.js.es6
@@ -0,0 +1,11 @@
+import { default as computed } from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Controller.extend({
+  loadingDonations: false,
+  
+  @computed('charges', 'subscriptions')
+  hasDonations(charges, subscriptions) {
+    return (charges && charges.length > 0) ||
+           (subscriptions && subscriptions.length > 0);
+  }
+})
diff --git a/assets/javascripts/discourse/helpers/donation.js.es6 b/assets/javascripts/discourse/helpers/donation.js.es6
new file mode 100644
index 0000000..cd372c5
--- /dev/null
+++ b/assets/javascripts/discourse/helpers/donation.js.es6
@@ -0,0 +1,56 @@
+import { registerHelper } from "discourse-common/lib/helpers";
+import { formatAnchor, formatAmount } from '../lib/donation-utilities';
+
+registerHelper("donation-subscription", function([subscription]) {
+  let currency = subscription.plan.currency.toUpperCase();
+  let html = currency;
+
+  html += ` ${formatAmount(subscription.plan.amount, currency)} `;
+
+  html += I18n.t(`discourse_donations.period.${subscription.plan.interval}`, {
+    anchor: formatAnchor(subscription.plan.interval, moment.unix(subscription.billing_cycle_anchor))
+  });
+
+  return new Handlebars.SafeString(html);
+});
+
+registerHelper("donation-invoice", function([invoice]) {
+  let details = invoice.lines.data[0];
+  let html = I18n.t('discourse_donations.invoice_prefix');
+  let currency = details.currency.toUpperCase();
+
+  html += ` ${currency}`;
+
+  html += ` ${formatAmount(details.amount, currency)} `;
+
+  html += I18n.t(`discourse_donations.period.once`, {
+    anchor: formatAnchor('once', moment.unix(invoice.date))
+  });
+
+  if (invoice.invoice_pdf) {
+    html += ` (<a href='${invoice.invoice_pdf}' target='_blank'>${I18n.t('discourse_donations.invoice')}</a>)`;
+  }
+
+  return new Handlebars.SafeString(html);
+});
+
+registerHelper("donation-charge", function([charge]) {
+  let html = I18n.t('discourse_donations.invoice_prefix');
+  let currency = charge.currency.toUpperCase();
+
+  html += ` ${currency}`;
+
+  html += ` ${formatAmount(charge.amount, currency)} `;
+
+  html += I18n.t(`discourse_donations.period.once`, {
+    anchor: formatAnchor('once', moment.unix(charge.created))
+  });
+
+  if (charge.receipt_email) {
+    html += `. ${I18n.t('discourse_donations.receipt', {
+      email: charge.receipt_email
+    })}`;
+  }
+
+  return new Handlebars.SafeString(html);
+});
diff --git a/assets/javascripts/discourse/lib/donation-utilities.js.es6 b/assets/javascripts/discourse/lib/donation-utilities.js.es6
new file mode 100644
index 0000000..6f82bf2
--- /dev/null
+++ b/assets/javascripts/discourse/lib/donation-utilities.js.es6
@@ -0,0 +1,31 @@
+const formatAnchor = function(type = null, time = moment()) {
+  let format;
+
+  switch(type) {
+    case 'once':
+      format = 'Do MMMM YYYY';
+      break;
+    case 'week':
+      format = 'dddd';
+      break;
+    case 'month':
+      format = 'Do';
+      break;
+    case 'year':
+      format = 'MMMM D';
+      break;
+    default:
+      format = 'dddd';
+  }
+
+  return moment(time).format(format);
+}
+
+const zeroDecimalCurrencies = ['MGA', 'BIF', 'CLP', 'PYG', 'DFJ', 'RWF', 'GNF', 'UGX', 'JPY', 'VND', 'VUV', 'XAF', 'KMF', 'KRW', 'XOF', 'XPF'];
+
+const formatAmount = function(amount, currency) {
+  let zeroDecimal = zeroDecimalCurrencies.indexOf(currency) > -1;
+  return zeroDecimal ? amount : (amount / 100).toFixed(2);
+}
+
+export { formatAnchor, formatAmount, zeroDecimalCurrencies }
diff --git a/assets/javascripts/discourse/routes/donate.js.es6 b/assets/javascripts/discourse/routes/donate.js.es6
new file mode 100644
index 0000000..90b12e0
--- /dev/null
+++ b/assets/javascripts/discourse/routes/donate.js.es6
@@ -0,0 +1,20 @@
+import DiscourseRoute from "discourse/routes/discourse";
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { ajax } from 'discourse/lib/ajax';
+
+export default DiscourseRoute.extend({
+  setupController(controller) {
+    controller.set('loadingDonations', true);
+
+    ajax('/donate/charges').then((result) => {
+      if (result && (result.charges || result.subscriptions)) {
+        controller.setProperties({
+          charges: result.charges,
+          subscriptions: result.subscriptions
+        });
+      }
+    }).catch(popupAjaxError).finally(() => {
+      controller.set('loadingDonations', false);
+    })
+  }
+});
diff --git a/assets/javascripts/discourse/templates/components/donation-list.hbs b/assets/javascripts/discourse/templates/components/donation-list.hbs
new file mode 100644
index 0000000..fba86c4
--- /dev/null
+++ b/assets/javascripts/discourse/templates/components/donation-list.hbs
@@ -0,0 +1,23 @@
+{{#if hasCharges}}
+  <h4>{{i18n 'discourse_donations.donations.charges'}}</h4>
+  <ul>
+    {{#each charges as |charge|}}
+      <li>{{donation-charge charge}}</li>
+    {{/each}}
+  </ul>
+{{/if}}
+
+{{#if hasSubscriptions}}
+  <h4>{{i18n 'discourse_donations.donations.subscriptions'}}</h4>
+  <ul>
+    {{#each subscriptions as |s|}}
+      <li class="underline">{{donation-subscription s.subscription}}</li>
+
+      {{#if s.invoices}}
+        {{#each s.invoices as |invoice|}}
+          <li>{{donation-invoice invoice}}</li>
+        {{/each}}
+      {{/if}}
+    {{/each}}
+  </ul>
+{{/if}}
diff --git a/assets/javascripts/discourse/templates/components/stripe-card.hbs b/assets/javascripts/discourse/templates/components/stripe-card.hbs
index 7b3fc3b..e1ffa1e 100644
--- a/assets/javascripts/discourse/templates/components/stripe-card.hbs
+++ b/assets/javascripts/discourse/templates/components/stripe-card.hbs
@@ -1,5 +1,4 @@
 <form id="payment-form" class="form-horizontal">
-
   <div class="control-group">
     <label class="control-label">
       {{i18n 'discourse_donations.type'}}
@@ -48,14 +47,20 @@
 
   <div class="control-group" style="width: 550px;">
     <label class="control-label" for="card-element">{{i18n 'discourse_donations.card'}}</label>
-    <div id="card-element" class="controls"></div>
+    <div class="controls">
+      <div id="card-element"></div>
+      {{#if stripeError}}
+        <div class="instructions stripe-error">{{stripeError}}</div>
+      {{/if}}
+    </div>
   </div>
 
-  {{#if anon}}
+  {{#unless currentUser}}
     <div class="control-group">
       <label class="control-label" for="card-element">{{i18n 'user.email.title'}}</label>
       <div class="controls">
         {{text-field value=email}}
+        <div class="instructions">{{i18n 'discourse_donations.email_instructions'}}</div>
       </div>
     </div>
 
@@ -81,11 +86,11 @@
         </div>
       </div>
     {{/if}}
-  {{/if}}
+  {{/unless}}
 
   <div class="control-group save-button">
     <div class="controls">
-      {{#d-button action="submitStripeCard" disabled=transactionInProgress class="btn btn-primary btn-payment"}}
+      {{#d-button action="submitStripeCard" disabled=disableSubmit class="btn btn-primary btn-payment"}}
         {{#if create_accounts}}
           {{i18n 'discourse_donations.submit_with_create_account'}}
         {{else}}
diff --git a/assets/javascripts/discourse/templates/connectors/extra-nav-item/donate.hbs b/assets/javascripts/discourse/templates/connectors/extra-nav-item/donate.hbs
index 1f57cc3..69bb4ec 100644
--- a/assets/javascripts/discourse/templates/connectors/extra-nav-item/donate.hbs
+++ b/assets/javascripts/discourse/templates/connectors/extra-nav-item/donate.hbs
@@ -1,5 +1,5 @@
 {{#if siteSettings.discourse_donations_enabled}}
-    <a href="/donate">
-      {{i18n 'discourse_donations.nav_item'}}
-    </a>
+  <a href="/donate">
+    {{i18n 'discourse_donations.nav_item'}}
+  </a>
 {{/if}}
diff --git a/assets/javascripts/discourse/templates/donate.hbs b/assets/javascripts/discourse/templates/donate.hbs
index 0dccb22..42a804b 100644
--- a/assets/javascripts/discourse/templates/donate.hbs
+++ b/assets/javascripts/discourse/templates/donate.hbs
@@ -1,7 +1,24 @@
-<h1>{{i18n 'discourse_donations.title' site_name=siteSettings.title}}</h1>
+<h3>{{i18n 'discourse_donations.title' site_name=siteSettings.title}}</h3>
+
 <div class="donations-page-description">
   {{cook-text siteSettings.discourse_donations_page_description}}
 </div>
+
 <div class="donations-page-payment">
-  {{stripe-card}}
+  {{stripe-card charges=charges subscriptions=subscriptions}}
 </div>
+
+{{#if currentUser}}
+  <div class="donations-page-donations">
+    <h3>{{i18n 'discourse_donations.donations.title'}}</h3>
+    {{#if loadingDonations}}
+      {{loading-spinner size='small'}}
+    {{else}}
+      {{#if hasDonations}}
+        {{donation-list charges=charges subscriptions=subscriptions}}
+      {{else}}
+        {{i18n 'discourse_donations.donations.none'}}
+      {{/if}}
+    {{/if}}
+  </div>
+{{/if}}
diff --git a/assets/stylesheets/discourse-donations.scss b/assets/stylesheets/discourse-donations.scss
index 50f5927..23c0263 100644
--- a/assets/stylesheets/discourse-donations.scss
+++ b/assets/stylesheets/discourse-donations.scss
@@ -13,7 +13,7 @@ div.stripe-errors {
 }
 
 .donations-page-payment {
-  padding-top: 60px;
+  padding: 30px 0;
 
   #payment-form {
     .control-label {
@@ -27,6 +27,11 @@ div.stripe-errors {
     input[type="checkbox"] {
       margin: 0;
     }
+
+    .stripe-error {
+      margin-top: 5px;
+      color: $danger;
+    }
   }
 }
 
@@ -49,3 +54,19 @@ div.stripe-errors {
   width: 400px;
   z-index: 1;
 }
+
+.body-page .donations-page-donations {
+  margin-bottom: 40px;
+
+  .donation-list {
+    ul {
+      margin-left: 0;
+      list-style: none;
+
+      li.underline {
+        border-bottom: 1px solid $primary-medium;
+        display: inline-block;
+      }
+    }
+  }
+}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index e85a01a..657b3de 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -23,12 +23,16 @@ en:
 
   js:
     discourse_donations:
-      title: Donate
       nav_item: Donate
+      title: "Make a Donation"
       amount: Amount
       card: Card
       submit: Make Payment
       submit_with_create_account: Make Payment and Create Account
+      invoice: "Invoice"
+      invoice_prefix: "You gave"
+      receipt: "Receipt sent to {{email}}."
+      email_instructions: "Required to send you a receipt. Not used for marketing."
       transaction_fee:
         label: "Include transaction fee of {{currency}} {{transactionFee}}"
         description: "When you make a donation we get charged a transaction fee. If you would like to help us out with this fee, check this box and it will be included in your donation."
@@ -38,11 +42,16 @@ en:
       type: "Type"
       types:
         once: "Once"
-        weekly: "Weekly"
-        monthly: "Monthly"
-        yearly: "Yearly"
+        week: "Weekly"
+        month: "Monthly"
+        year: "Yearly"
       period:
-        once: "once."
-        weekly: "every week on {{anchor}}."
-        monthly: "on the {{anchor}} of every month."
-        yearly: "every year on {{anchor}}."
+        once: "on {{anchor}}"
+        week: "every week on {{anchor}}"
+        month: "on the {{anchor}} of every month"
+        year: "every year on {{anchor}}"
+      donations:
+        title: "Your Donations"
+        charges: "Once Off"
+        subscriptions: "Recurring"
+        none: "You haven't made a donation yet."
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index dc63d40..9b59074 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1,4 +1,7 @@
 en:
   donations:
+    recurring: "%{site_title} recurring donation"
     payment:
-      success: 'Thank you. Your donation has been successful'
+      success: 'Thank you, your donation has been successful.'
+      receipt_sent: 'A receipt has been sent to %{email}.'
+      invoice_sent: 'An invoice has been sent to %{email}.'
diff --git a/config/routes.rb b/config/routes.rb
index eba16d8..c17ffdd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,5 @@
 DiscourseDonations::Engine.routes.draw do
-  resources :charges, only: [:create]
+  get '/' => 'charges#index'
+  resources :charges, only: [:index, :create]
   resources :checkout, only: [:create]
-  get 'users/:username/payments' => 'payments#show'
-  get 'donate' => 'payments#show'
 end
diff --git a/config/settings.yml b/config/settings.yml
index 066f016..ac439b2 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -53,9 +53,9 @@ plugins:
   discourse_donations_types:
     client: true
     type: list
-    default: 'monthly|once'
+    default: 'month|once'
     choices:
-      - yearly
-      - monthly
-      - weekly
+      - year
+      - month
+      - week
       - once
diff --git a/lib/discourse_donations/engine.rb b/lib/discourse_donations/engine.rb
index c743474..d92e065 100644
--- a/lib/discourse_donations/engine.rb
+++ b/lib/discourse_donations/engine.rb
@@ -1,4 +1,3 @@
-
 module ::DiscourseDonations
   class Engine < ::Rails::Engine
     engine_name 'discourse-donations'
diff --git a/plugin.rb b/plugin.rb
index 9f6715d..514fd5e 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -2,12 +2,10 @@
 # about: Integrates Stripe into Discourse to allow forum visitors to make donations
 # version: 1.11.1
 # url: https://github.com/chrisbeach/discourse-donations
-# authors: Rimian Perkins, Chris Beach
+# authors: Rimian Perkins, Chris Beach, Angus McLeod
 
 gem 'stripe', '2.8.0'
 
-load File.expand_path('../lib/discourse_donations/engine.rb', __FILE__)
-
 register_asset "stylesheets/discourse-donations.scss"
 
 enabled_site_setting :discourse_donations_enabled
@@ -17,7 +15,15 @@ register_html_builder('server:before-head-close') do
 end
 
 after_initialize do
+  load File.expand_path('../lib/discourse_donations/engine.rb', __FILE__)
+  load File.expand_path('../config/routes.rb', __FILE__)
+  load File.expand_path('../app/controllers/controllers.rb', __FILE__)
   load File.expand_path('../app/jobs/jobs.rb', __FILE__)
+  load File.expand_path('../app/services/services.rb', __FILE__)
+
+  Discourse::Application.routes.append do
+    mount ::DiscourseDonations::Engine, at: 'donate'
+  end
 
   class ::User
     def stripe_customer_id
@@ -29,7 +35,3 @@ after_initialize do
     end
   end
 end
-
-Discourse::Application.routes.prepend do
-  mount ::DiscourseDonations::Engine, at: '/'
-end

From fd0b53c67cd49271dddd7ed27d17ba6d6ffa7f2b Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Mon, 25 Jun 2018 18:37:55 +1000
Subject: [PATCH 5/7] Properly validate email

---
 .../discourse/components/stripe-card.js.es6   | 17 +++++--
 .../templates/components/donation-list.hbs    | 46 +++++++++++--------
 .../templates/components/stripe-card.hbs      |  8 +++-
 assets/stylesheets/discourse-donations.scss   | 21 +++++----
 4 files changed, 59 insertions(+), 33 deletions(-)

diff --git a/assets/javascripts/discourse/components/stripe-card.js.es6 b/assets/javascripts/discourse/components/stripe-card.js.es6
index d02b917..2eb2611 100644
--- a/assets/javascripts/discourse/components/stripe-card.js.es6
+++ b/assets/javascripts/discourse/components/stripe-card.js.es6
@@ -2,6 +2,7 @@ import { ajax } from 'discourse/lib/ajax';
 import { getRegister } from 'discourse-common/lib/get-owner';
 import { formatAnchor, zeroDecimalCurrencies } from '../lib/donation-utilities';
 import { default as computed } from 'ember-addons/ember-computed-decorators';
+import { emailValid } from "discourse/lib/utilities";
 
 export default Ember.Component.extend({
   result: [],
@@ -94,9 +95,19 @@ export default Ember.Component.extend({
     return amount;
   },
 
-  @computed('currentUser', 'email')
-  userReady(currentUser, email) {
-    return currentUser || email;
+  @computed('email')
+  emailValid(email) {
+    return emailValid(email);
+  },
+
+  @computed('email', 'emailValid')
+  showEmailError(email, emailValid) {
+    return email && email.length > 3 && !emailValid;
+  },
+
+  @computed('currentUser', 'emailValid')
+  userReady(currentUser, emailValid) {
+    return currentUser || emailValid;
   },
 
   @computed('userReady', 'stripeReady')
diff --git a/assets/javascripts/discourse/templates/components/donation-list.hbs b/assets/javascripts/discourse/templates/components/donation-list.hbs
index fba86c4..ae2706e 100644
--- a/assets/javascripts/discourse/templates/components/donation-list.hbs
+++ b/assets/javascripts/discourse/templates/components/donation-list.hbs
@@ -1,23 +1,29 @@
-{{#if hasCharges}}
-  <h4>{{i18n 'discourse_donations.donations.charges'}}</h4>
-  <ul>
-    {{#each charges as |charge|}}
-      <li>{{donation-charge charge}}</li>
-    {{/each}}
-  </ul>
-{{/if}}
-
 {{#if hasSubscriptions}}
-  <h4>{{i18n 'discourse_donations.donations.subscriptions'}}</h4>
-  <ul>
-    {{#each subscriptions as |s|}}
-      <li class="underline">{{donation-subscription s.subscription}}</li>
+  <div class="subscription-list">
+    <div class="underline">{{i18n 'discourse_donations.donations.subscriptions'}}</div>
+    <ul>
+      {{#each subscriptions as |s|}}
+        <li>{{donation-subscription s.subscription}}</li>
 
-      {{#if s.invoices}}
-        {{#each s.invoices as |invoice|}}
-          <li>{{donation-invoice invoice}}</li>
-        {{/each}}
-      {{/if}}
-    {{/each}}
-  </ul>
+        {{#if s.invoices}}
+          <ul>
+            {{#each s.invoices as |invoice|}}
+              <li>{{donation-invoice invoice}}</li>
+            {{/each}}
+          </ul>
+        {{/if}}
+      {{/each}}
+    </ul>
+  </div>
+{{/if}}
+
+{{#if hasCharges}}
+  <div class="charge-list">
+    <div class='underline'>{{i18n 'discourse_donations.donations.charges'}}</div>
+    <ul>
+      {{#each charges as |charge|}}
+        <li>{{donation-charge charge}}</li>
+      {{/each}}
+    </ul>
+  </div>
 {{/if}}
diff --git a/assets/javascripts/discourse/templates/components/stripe-card.hbs b/assets/javascripts/discourse/templates/components/stripe-card.hbs
index e1ffa1e..a23c7fc 100644
--- a/assets/javascripts/discourse/templates/components/stripe-card.hbs
+++ b/assets/javascripts/discourse/templates/components/stripe-card.hbs
@@ -50,7 +50,7 @@
     <div class="controls">
       <div id="card-element"></div>
       {{#if stripeError}}
-        <div class="instructions stripe-error">{{stripeError}}</div>
+        <div class="stripe-error">{{stripeError}}</div>
       {{/if}}
     </div>
   </div>
@@ -60,7 +60,11 @@
       <label class="control-label" for="card-element">{{i18n 'user.email.title'}}</label>
       <div class="controls">
         {{text-field value=email}}
-        <div class="instructions">{{i18n 'discourse_donations.email_instructions'}}</div>
+        {{#if showEmailError}}
+          <div class="error">{{i18n 'user.email.invalid'}}</div>
+        {{else}}
+          <div class="instructions">{{i18n 'discourse_donations.email_instructions'}}</div>
+        {{/if}}
       </div>
     </div>
 
diff --git a/assets/stylesheets/discourse-donations.scss b/assets/stylesheets/discourse-donations.scss
index 23c0263..878b905 100644
--- a/assets/stylesheets/discourse-donations.scss
+++ b/assets/stylesheets/discourse-donations.scss
@@ -28,7 +28,7 @@ div.stripe-errors {
       margin: 0;
     }
 
-    .stripe-error {
+    .error, .stripe-error {
       margin-top: 5px;
       color: $danger;
     }
@@ -56,17 +56,22 @@ div.stripe-errors {
 }
 
 .body-page .donations-page-donations {
-  margin-bottom: 40px;
+  margin-bottom: 20px;
 
   .donation-list {
-    ul {
-      margin-left: 0;
-      list-style: none;
+    .subscription-list, .charge-list {
+      margin-bottom: 10px;
+      display: inline-block;
 
-      li.underline {
-        border-bottom: 1px solid $primary-medium;
-        display: inline-block;
+      > ul {
+        margin: 10px 0;
+        list-style: none;
       }
     }
+
+    .underline {
+      border-bottom: 1px solid $primary-medium;
+      display: inline-block;
+    }
   }
 }

From 1b1eb215e4fd366439c12dfbfb85588249f1a1fd Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Thu, 28 Jun 2018 09:32:58 +1000
Subject: [PATCH 6/7] various

---
 .../discourse_donations/charges_controller.rb |  68 ++++++---
 app/services/discourse_donations/stripe.rb    | 137 ++++++++++++++----
 .../discourse/components/donation-list.js.es6 |   3 +
 .../discourse/components/donation-row.js.es6  |  96 ++++++++++++
 .../discourse/components/stripe-card.js.es6   |  34 +++--
 .../controllers/cancel-subscription.js.es6    |  12 ++
 .../discourse/controllers/donate.js.es6       |  46 +++++-
 .../discourse/helpers/donation.js.es6         |  56 -------
 .../discourse/routes/donate.js.es6            |  21 ++-
 .../templates/components/donation-list.hbs    |   7 +-
 .../templates/components/donation-row.hbs     |  39 +++++
 .../templates/components/stripe-card.hbs      |   1 +
 .../discourse/templates/donate.hbs            |  30 ++--
 .../templates/modal/cancel-subscription.hbs   |  11 ++
 assets/stylesheets/discourse-donations.scss   |  35 ++++-
 config/locales/client.en.yml                  |  13 +-
 config/locales/server.en.yml                  |   6 +-
 config/routes.rb                              |   3 +
 18 files changed, 478 insertions(+), 140 deletions(-)
 create mode 100644 assets/javascripts/discourse/components/donation-row.js.es6
 create mode 100644 assets/javascripts/discourse/controllers/cancel-subscription.js.es6
 delete mode 100644 assets/javascripts/discourse/helpers/donation.js.es6
 create mode 100644 assets/javascripts/discourse/templates/components/donation-row.hbs
 create mode 100644 assets/javascripts/discourse/templates/modal/cancel-subscription.hbs

diff --git a/app/controllers/discourse_donations/charges_controller.rb b/app/controllers/discourse_donations/charges_controller.rb
index 1c79371..017be3f 100644
--- a/app/controllers/discourse_donations/charges_controller.rb
+++ b/app/controllers/discourse_donations/charges_controller.rb
@@ -1,14 +1,20 @@
 module DiscourseDonations
   class ChargesController < ::ApplicationController
     skip_before_action :verify_authenticity_token, only: [:create]
+
+    before_action :ensure_logged_in, only: [:cancel_subscription]
     before_action :set_user, only: [:index, :create]
-    before_action :set_email, only: [:create]
+    before_action :set_email, only: [:index, :create, :cancel_subscription]
 
     def index
-      if @user && @user.stripe_customer_id
-        result = DiscourseDonations::Stripe.new(secret_key, stripe_options).list(@user)
-      else
-        result = {}
+      result = {}
+
+      if current_user
+        stripe = DiscourseDonations::Stripe.new(secret_key, stripe_options)
+
+        list_result = stripe.list(current_user, email: current_user.email)
+
+        result = list_result if list_result.present?
       end
 
       render json: success_json.merge(result)
@@ -36,7 +42,7 @@ module DiscourseDonations
       end
 
       Rails.logger.debug "Creating a Stripe payment"
-      payment = DiscourseDonations::Stripe.new(secret_key, stripe_options)
+      stripe = DiscourseDonations::Stripe.new(secret_key, stripe_options)
       result = {}
 
       begin
@@ -48,17 +54,27 @@ module DiscourseDonations
         }
 
         if user_params[:type] === 'once'
-          result[:payment] = payment.charge(@user, opts)
+          result[:charge] = stripe.charge(@user, opts)
         else
           opts[:type] = user_params[:type]
-          result[:subscription] = payment.subscribe(@user, opts)
+
+          subscription = stripe.subscribe(@user, opts)
+
+          if subscription && subscription['id']
+            invoices = stripe.invoices_for_subscription(@user,
+              email: opts[:email],
+              subscription_id: subscription['id']
+            )
+          end
+
+          result[:subscription] = {}
+          result[:subscription][:subscription] = subscription if subscription
+          result[:subscription][:invoices] = invoices if invoices
         end
 
       rescue ::Stripe::CardError => e
         err = e.json_body[:error]
 
-        puts "HERE IS THE ERROR: #{e.inspect}"
-
         output['messages'] << "There was an error (#{err[:type]})."
         output['messages'] << "Error code: #{err[:code]}" if err[:code]
         output['messages'] << "Decline code: #{err[:decline_code]}" if err[:decline_code]
@@ -68,18 +84,16 @@ module DiscourseDonations
       end
 
       if (result[:charge] && result[:charge]['paid'] == true) ||
-         (result[:subscription] && result[:subscription]['status'] === 'active')
+         (result[:subscription] && result[:subscription][:subscription] &&
+          result[:subscription][:subscription]['status'] === 'active')
 
         output['messages'] << I18n.t('donations.payment.success')
 
-        if result[:charge]
+        if (result[:charge] && result[:charge]['receipt_number']) ||
+           (result[:subscription] && result[:subscription][:invoices].first['receipt_number'])
           output['messages'] << " #{I18n.t('donations.payment.receipt_sent', email: @email)}"
         end
 
-        if result[:subscription]
-          output['messages'] << " #{I18n.t('donations.payment.invoice_sent', email: @email)}"
-        end
-
         output['charge'] = result[:charge] if result[:charge]
         output['subscription'] = result[:subscription] if result[:subscription]
 
@@ -95,6 +109,20 @@ module DiscourseDonations
       render json: output
     end
 
+    def cancel_subscription
+      params.require(:subscription_id)
+
+      stripe = DiscourseDonations::Stripe.new(secret_key, stripe_options)
+
+      result = stripe.cancel_subscription(params[:subscription_id])
+
+      if result[:success]
+        render json: success_json.merge(subscription: result[:subscription])
+      else
+        render json: failed_json.merge(message: result[:message])
+      end
+    end
+
     private
 
     def create_account
@@ -132,16 +160,20 @@ module DiscourseDonations
       user = current_user
 
       if user_params[:user_id].present?
-        user = User.find(user_params[:user_id])
+        if record = User.find_by(user_params[:user_id])
+          user = record
+        end
       end
 
       @user = user
     end
 
     def set_email
+      email = nil
+
       if user_params[:email].present?
         email = user_params[:email]
-      else
+      elsif @user
         email = @user.try(:email)
       end
 
diff --git a/app/services/discourse_donations/stripe.rb b/app/services/discourse_donations/stripe.rb
index c43a9cf..cf7288e 100644
--- a/app/services/discourse_donations/stripe.rb
+++ b/app/services/discourse_donations/stripe.rb
@@ -9,7 +9,13 @@ module DiscourseDonations
     end
 
     def checkoutCharge(user = nil, email, token, amount)
-      customer = customer(user, email, token)
+      customer = customer(user,
+        email: email,
+        source: token,
+        create: true
+      )
+
+      return if !customer
 
       charge = ::Stripe::Charge.create(
         customer: customer.id,
@@ -22,7 +28,13 @@ module DiscourseDonations
     end
 
     def charge(user = nil, opts)
-      customer = customer(user, opts[:email], opts[:token])
+      customer = customer(user,
+        email: opts[:email],
+        source: opts[:token],
+        create: true
+      )
+
+      return if !customer
 
       @charge = ::Stripe::Charge.create(
         customer: customer.id,
@@ -36,28 +48,40 @@ module DiscourseDonations
     end
 
     def subscribe(user = nil, opts)
-      customer = customer(user, opts[:email], opts[:token])
+      customer = customer(user,
+        email: opts[:email],
+        source: opts[:token],
+        create: true
+      )
+
+      return if !customer
+
+      type = opts[:type]
+      amount = opts[:amount]
 
       plans = ::Stripe::Plan.list
-      type = opts[:type]
-      plan_id = create_plan_id(type)
+      plan_id = create_plan_id(type, amount)
 
       unless plans.data && plans.data.any? { |p| p['id'] === plan_id }
-        result = create_plan(type, opts[:amount])
+        result = create_plan(type, amount)
+
         plan_id = result['id']
       end
 
-      @subscription = ::Stripe::Subscription.create(
+      ::Stripe::Subscription.create(
         customer: customer.id,
-        items: [{ plan: plan_id }]
+        items: [{
+          plan: plan_id
+        }]
       )
-
-      @subscription
     end
 
-    def list(user)
-      customer = customer(user)
-      result = {}
+    def list(user, opts = {})
+      customer = customer(user, opts)
+
+      return if !customer
+
+      result = { customer: customer }
 
       raw_invoices = ::Stripe::Invoice.list(customer: customer.id)
       raw_invoices = raw_invoices.is_a?(Object) ? raw_invoices['data'] : []
@@ -66,7 +90,8 @@ module DiscourseDonations
       raw_charges = raw_charges.is_a?(Object) ? raw_charges['data'] : []
 
       if raw_invoices.any?
-        raw_subscriptions = ::Stripe::Subscription.list(customer: customer.id)['data']
+        raw_subscriptions = ::Stripe::Subscription.list(customer: customer.id, status: 'all')
+        raw_subscriptions = raw_subscriptions.is_a?(Object) ? raw_subscriptions['data'] : []
 
         if raw_subscriptions.any?
           subscriptions = []
@@ -97,22 +122,82 @@ module DiscourseDonations
       result
     end
 
-    def customer(user, email = nil, source = nil)
-      if user && user.stripe_customer_id
-        ::Stripe::Customer.retrieve(user.stripe_customer_id)
+    def invoices_for_subscription(user, opts)
+      customer = customer(user,
+        email: opts[:email]
+      )
+
+      invoices = []
+
+      if customer
+        result = ::Stripe::Invoice.list(
+          customer: customer.id,
+          subscription: opts[:subscription_id]
+        )
+
+        invoices = result['data'] if result['data']
+      end
+
+      invoices
+    end
+
+    def cancel_subscription(subscription_id)
+      if subscription = ::Stripe::Subscription.retrieve(subscription_id)
+        result = subscription.delete
+
+        if result['status'] === 'canceled'
+          { success: true, subscription: subscription }
+        else
+          { success: false, message: I18n.t('donations.subscription.error.not_cancelled') }
+        end
       else
+        { success: false, message: I18n.t('donations.subscription.error.not_found') }
+      end
+    end
+
+    def customer(user, opts = {})
+      customer = nil
+
+      if user && user.stripe_customer_id
+        begin
+          customer = ::Stripe::Customer.retrieve(user.stripe_customer_id)
+        rescue ::Stripe::StripeError => e
+          user.custom_fields['stripe_customer_id'] = nil
+          user.save_custom_fields(true)
+          customer = nil
+        end
+      end
+
+      if !customer && opts[:email]
+        begin
+          customers = ::Stripe::Customer.list(email: opts[:email])
+
+          if customers && customers['data']
+            customer = customers['data'].first if customers['data'].any?
+          end
+
+          if customer && user
+            user.custom_fields['stripe_customer_id'] = customer.id
+            user.save_custom_fields(true)
+          end
+        rescue ::Stripe::StripeError => e
+          customer = nil
+        end
+      end
+
+      if !customer && opts[:create]
         customer = ::Stripe::Customer.create(
-          email: email,
-          source: source
+          email: opts[:email],
+          source: opts[:source]
         )
 
         if user
           user.custom_fields['stripe_customer_id'] = customer.id
           user.save_custom_fields(true)
         end
-
-        customer
       end
+
+      customer
     end
 
     def successful?
@@ -120,7 +205,7 @@ module DiscourseDonations
     end
 
     def create_plan(type, amount)
-      id = create_plan_id(type)
+      id = create_plan_id(type, amount)
       nickname = id.gsub(/_/, ' ').titleize
 
       products = ::Stripe::Product.list(type: 'service')
@@ -151,15 +236,15 @@ module DiscourseDonations
     end
 
     def product_id
-      @product_id ||= "#{SiteSetting.title}_recurring_donation"
+      @product_id ||= "#{SiteSetting.title}_recurring_donation".freeze
     end
 
     def product_name
-      @product_name ||= I18n.t('discourse_donations.recurring', site_title: SiteSetting.title)
+      @product_name ||= I18n.t('donations.recurring', site_title: SiteSetting.title)
     end
 
-    def create_plan_id(type)
-      "discourse_donation_recurring_#{type}"
+    def create_plan_id(type, amount)
+      "discourse_donation_recurring_#{type}_#{amount}".freeze
     end
   end
 end
diff --git a/assets/javascripts/discourse/components/donation-list.js.es6 b/assets/javascripts/discourse/components/donation-list.js.es6
index 744ebe3..3b9b4da 100644
--- a/assets/javascripts/discourse/components/donation-list.js.es6
+++ b/assets/javascripts/discourse/components/donation-list.js.es6
@@ -1,3 +1,6 @@
+import { ajax } from 'discourse/lib/ajax';
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+
 export default Ember.Component.extend({
   classNames: 'donation-list',
   hasSubscriptions: Ember.computed.notEmpty('subscriptions'),
diff --git a/assets/javascripts/discourse/components/donation-row.js.es6 b/assets/javascripts/discourse/components/donation-row.js.es6
new file mode 100644
index 0000000..56533f5
--- /dev/null
+++ b/assets/javascripts/discourse/components/donation-row.js.es6
@@ -0,0 +1,96 @@
+import { ajax } from 'discourse/lib/ajax';
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { formatAnchor, formatAmount } from '../lib/donation-utilities';
+import { default as computed, observes, on } from 'ember-addons/ember-computed-decorators';
+import showModal from "discourse/lib/show-modal";
+
+export default Ember.Component.extend({
+  classNameBindings: [':donation-row', 'canceled', 'updating'],
+  includePrefix: Ember.computed.or('invoice', 'charge'),
+  canceled: Ember.computed.equal('subscription.status', 'canceled'),
+
+  @computed('subscription', 'invoice', 'charge', 'customer')
+  data(subscription, invoice, charge, customer) {
+    if (subscription) {
+      return $.extend({}, subscription.plan, {
+        anchor: subscription.billing_cycle_anchor
+      });
+    } else if (invoice) {
+      let receiptSent = false;
+
+      if (invoice.receipt_number && customer.email) {
+        receiptSent = true;
+      }
+
+      return $.extend({}, invoice.lines.data[0], {
+        anchor: invoice.date,
+        invoiceLink: invoice.invoice_pdf,
+        receiptSent
+      });
+    } else if (charge) {
+      let receiptSent = false;
+
+      if (charge.receipt_number && charge.receipt_email) {
+        receiptSent = true;
+      }
+
+      return $.extend({}, charge, {
+        anchor: charge.created,
+        receiptSent
+      });
+    }
+  },
+
+  @computed('data.currency')
+  currency(currency) {
+    return currency ? currency.toUpperCase() : null;
+  },
+
+  @computed('data.amount', 'currency')
+  amount(amount, currency) {
+    return formatAmount(amount, currency);
+  },
+
+  @computed('data.interval')
+  interval(interval) {
+    return interval || 'once';
+  },
+
+  @computed('data.anchor', 'interval')
+  period(anchor, interval) {
+    return I18n.t(`discourse_donations.period.${interval}`, {
+      anchor: formatAnchor(interval, moment.unix(anchor))
+    })
+  },
+
+  cancelSubscription() {
+    const subscriptionId = this.get('subscription.id');
+    this.set('updating', true);
+
+    ajax('/donate/charges/cancel-subscription', {
+      data: {
+        subscription_id: subscriptionId
+      },
+      method: 'put'
+    }).then(result => {
+      if (result.success) {
+        this.set('subscription', result.subscription);
+      }
+    }).catch(popupAjaxError).finally(() => {
+      this.set('updating', false);
+    });
+  },
+
+  actions: {
+    cancelSubscription() {
+      showModal('cancel-subscription', {
+        model: {
+          currency: this.get('currency'),
+          amount: this.get('amount'),
+          period: this.get('period'),
+          confirm: () => this.cancelSubscription()
+        }
+      });
+    }
+  }
+})
diff --git a/assets/javascripts/discourse/components/stripe-card.js.es6 b/assets/javascripts/discourse/components/stripe-card.js.es6
index 2eb2611..06d4ad3 100644
--- a/assets/javascripts/discourse/components/stripe-card.js.es6
+++ b/assets/javascripts/discourse/components/stripe-card.js.es6
@@ -175,7 +175,7 @@ export default Ember.Component.extend({
           const transactionFeeEnabled = settings.discourse_donations_enable_transaction_fee;
           let amount = transactionFeeEnabled ? this.get('totalAmount') : this.get('amount');
 
-          if (zeroDecimalCurrencies.indexOf(setting.discourse_donations_currency) === -1) {
+          if (zeroDecimalCurrencies.indexOf(settings.discourse_donations_currency) === -1) {
             amount = amount * 100;
           }
 
@@ -189,22 +189,26 @@ export default Ember.Component.extend({
           };
 
           if(!self.get('paymentSuccess')) {
-            ajax('/donate/charges', { data: params, method: 'post' }).then(d => {
-              let donation = d.donation;
-
-              if (donation) {
-                if (donation.object === 'subscription') {
-                  let subscriptions = this.get('subscriptions') || [];
-                  subscriptions.push(donation);
-                  this.set('subscriptions', subscriptions);
-                } else if (donation.object === 'charge') {
-                  let charges = this.get('charges') || [];
-                  charges.push(donation);
-                  this.set('charges', charges);
-                }
+            ajax('/donate/charges', {
+              data: params,
+              method: 'post'
+            }).then(result => {              
+              if (result.subscription) {
+                let subscription = $.extend({}, result.subscription, {
+                  new: true
+                });
+                this.get('subscriptions').unshiftObject(subscription);
               }
 
-              self.concatMessages(d.messages);
+              if (result.charge) {
+                let charge = $.extend({}, result.charge, {
+                  new: true
+                });
+                this.get('charges').unshiftObject(charge);
+              }
+
+              self.concatMessages(result.messages);
+
               self.endTranscation();
             });
           }
diff --git a/assets/javascripts/discourse/controllers/cancel-subscription.js.es6 b/assets/javascripts/discourse/controllers/cancel-subscription.js.es6
new file mode 100644
index 0000000..57a6565
--- /dev/null
+++ b/assets/javascripts/discourse/controllers/cancel-subscription.js.es6
@@ -0,0 +1,12 @@
+export default Ember.Controller.extend({
+  actions: {
+    confirm() {
+      this.get('model.confirm')();
+      this.send('closeModal');
+    },
+
+    cancel() {
+      this.send('closeModal');
+    }
+  }
+})
diff --git a/assets/javascripts/discourse/controllers/donate.js.es6 b/assets/javascripts/discourse/controllers/donate.js.es6
index daecc05..2073af0 100644
--- a/assets/javascripts/discourse/controllers/donate.js.es6
+++ b/assets/javascripts/discourse/controllers/donate.js.es6
@@ -1,11 +1,53 @@
 import { default as computed } from 'ember-addons/ember-computed-decorators';
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { ajax } from 'discourse/lib/ajax';
+import { getOwner } from 'discourse-common/lib/get-owner';
 
 export default Ember.Controller.extend({
   loadingDonations: false,
-  
-  @computed('charges', 'subscriptions')
+  loadDonationsDisabled: Ember.computed.not('emailVaild'),
+
+  @computed('charges.[]', 'subscriptions.[]')
   hasDonations(charges, subscriptions) {
     return (charges && charges.length > 0) ||
            (subscriptions && subscriptions.length > 0);
+  },
+
+  @computed('email')
+  emailVaild(email) {
+    return emailValid(email);
+  },
+
+  actions: {
+    loadDonations() {
+      let email = this.get('email');
+
+      this.set('loadingDonations', true);
+
+      ajax('/donate/charges', {
+        data: { email },
+        type: 'GET'
+      }).then((result) => {
+        this.setProperties({
+          charges: Ember.A(result.charges),
+          subscriptions: Ember.A(result.subscriptions),
+          customer: result.customer
+        });
+      }).catch(popupAjaxError).finally(() => {
+        this.setProperties({
+          loadingDonations: false,
+          hasEmailResult: true
+        });
+
+        Ember.run.later(() => {
+          this.set('hasEmailResult', false);
+        }, 6000)
+      })
+    },
+
+    showLogin() {
+      const controller = getOwner(this).lookup('route:application');
+      controller.send('showLogin');
+    }
   }
 })
diff --git a/assets/javascripts/discourse/helpers/donation.js.es6 b/assets/javascripts/discourse/helpers/donation.js.es6
deleted file mode 100644
index cd372c5..0000000
--- a/assets/javascripts/discourse/helpers/donation.js.es6
+++ /dev/null
@@ -1,56 +0,0 @@
-import { registerHelper } from "discourse-common/lib/helpers";
-import { formatAnchor, formatAmount } from '../lib/donation-utilities';
-
-registerHelper("donation-subscription", function([subscription]) {
-  let currency = subscription.plan.currency.toUpperCase();
-  let html = currency;
-
-  html += ` ${formatAmount(subscription.plan.amount, currency)} `;
-
-  html += I18n.t(`discourse_donations.period.${subscription.plan.interval}`, {
-    anchor: formatAnchor(subscription.plan.interval, moment.unix(subscription.billing_cycle_anchor))
-  });
-
-  return new Handlebars.SafeString(html);
-});
-
-registerHelper("donation-invoice", function([invoice]) {
-  let details = invoice.lines.data[0];
-  let html = I18n.t('discourse_donations.invoice_prefix');
-  let currency = details.currency.toUpperCase();
-
-  html += ` ${currency}`;
-
-  html += ` ${formatAmount(details.amount, currency)} `;
-
-  html += I18n.t(`discourse_donations.period.once`, {
-    anchor: formatAnchor('once', moment.unix(invoice.date))
-  });
-
-  if (invoice.invoice_pdf) {
-    html += ` (<a href='${invoice.invoice_pdf}' target='_blank'>${I18n.t('discourse_donations.invoice')}</a>)`;
-  }
-
-  return new Handlebars.SafeString(html);
-});
-
-registerHelper("donation-charge", function([charge]) {
-  let html = I18n.t('discourse_donations.invoice_prefix');
-  let currency = charge.currency.toUpperCase();
-
-  html += ` ${currency}`;
-
-  html += ` ${formatAmount(charge.amount, currency)} `;
-
-  html += I18n.t(`discourse_donations.period.once`, {
-    anchor: formatAnchor('once', moment.unix(charge.created))
-  });
-
-  if (charge.receipt_email) {
-    html += `. ${I18n.t('discourse_donations.receipt', {
-      email: charge.receipt_email
-    })}`;
-  }
-
-  return new Handlebars.SafeString(html);
-});
diff --git a/assets/javascripts/discourse/routes/donate.js.es6 b/assets/javascripts/discourse/routes/donate.js.es6
index 90b12e0..04d7994 100644
--- a/assets/javascripts/discourse/routes/donate.js.es6
+++ b/assets/javascripts/discourse/routes/donate.js.es6
@@ -4,15 +4,24 @@ import { ajax } from 'discourse/lib/ajax';
 
 export default DiscourseRoute.extend({
   setupController(controller) {
+    let charges = [];
+    let subscriptions = [];
+    let customer = {};
+
     controller.set('loadingDonations', true);
 
-    ajax('/donate/charges').then((result) => {
-      if (result && (result.charges || result.subscriptions)) {
-        controller.setProperties({
-          charges: result.charges,
-          subscriptions: result.subscriptions
-        });
+    ajax('/donate/charges').then((result) => {      
+      if (result) {
+        charges = result.charges;
+        subscriptions = result.subscriptions;
+        customer = result.customer;
       }
+
+      controller.setProperties({
+        charges: Ember.A(charges),
+        subscriptions: Ember.A(subscriptions),
+        customer
+      });
     }).catch(popupAjaxError).finally(() => {
       controller.set('loadingDonations', false);
     })
diff --git a/assets/javascripts/discourse/templates/components/donation-list.hbs b/assets/javascripts/discourse/templates/components/donation-list.hbs
index ae2706e..4a23964 100644
--- a/assets/javascripts/discourse/templates/components/donation-list.hbs
+++ b/assets/javascripts/discourse/templates/components/donation-list.hbs
@@ -3,12 +3,11 @@
     <div class="underline">{{i18n 'discourse_donations.donations.subscriptions'}}</div>
     <ul>
       {{#each subscriptions as |s|}}
-        <li>{{donation-subscription s.subscription}}</li>
-
+        <li>{{donation-row subscription=s.subscription customer=customer new=s.new}}</li>
         {{#if s.invoices}}
           <ul>
             {{#each s.invoices as |invoice|}}
-              <li>{{donation-invoice invoice}}</li>
+              <li>{{donation-row invoice=invoice customer=customer new=s.new}}</li>
             {{/each}}
           </ul>
         {{/if}}
@@ -22,7 +21,7 @@
     <div class='underline'>{{i18n 'discourse_donations.donations.charges'}}</div>
     <ul>
       {{#each charges as |charge|}}
-        <li>{{donation-charge charge}}</li>
+        <li>{{donation-row charge=charge customer=customer new=charge.new}}</li>
       {{/each}}
     </ul>
   </div>
diff --git a/assets/javascripts/discourse/templates/components/donation-row.hbs b/assets/javascripts/discourse/templates/components/donation-row.hbs
new file mode 100644
index 0000000..d37abb4
--- /dev/null
+++ b/assets/javascripts/discourse/templates/components/donation-row.hbs
@@ -0,0 +1,39 @@
+{{#if includePrefix}}
+  <span>{{i18n 'discourse_donations.invoice_prefix'}}</span>
+{{/if}}
+
+<span>{{currency}}</span>
+
+<span>{{amount}}</span>
+
+<span>{{period}}</span>
+
+{{#if invoice}}
+  <a href='{{data.invoiceLink}}' target='_blank'>({{i18n 'discourse_donations.invoice'}})</a>
+{{/if}}
+
+{{#if currentUser}}
+  {{#if subscription}}
+    {{#if updating}}
+      {{loading-spinner size='small'}}
+    {{else}}
+      {{#unless canceled}}
+        <a {{action 'cancelSubscription'}}>
+          {{i18n 'cancel'}}
+        </a>
+      {{/unless}}
+    {{/if}}
+  {{/if}}
+{{/if}}
+
+{{#if receiptSent}}
+  <span>–</span>
+  <span>{{i18n 'discourse_donations.receipt' email=customer.email}}</span>
+{{/if}}
+
+{{#if new}}
+  <span class="new-flag">
+    {{d-icon 'circle'}}
+    <span>{{i18n 'new_item'}}</span>
+  </span>
+{{/if}}
diff --git a/assets/javascripts/discourse/templates/components/stripe-card.hbs b/assets/javascripts/discourse/templates/components/stripe-card.hbs
index a23c7fc..154a746 100644
--- a/assets/javascripts/discourse/templates/components/stripe-card.hbs
+++ b/assets/javascripts/discourse/templates/components/stripe-card.hbs
@@ -33,6 +33,7 @@
         </div>
       </div>
     </div>
+
     <div class="control-group">
       <label class='control-label'>
         {{i18n 'discourse_donations.transaction_fee.total'}}
diff --git a/assets/javascripts/discourse/templates/donate.hbs b/assets/javascripts/discourse/templates/donate.hbs
index 42a804b..c639b0c 100644
--- a/assets/javascripts/discourse/templates/donate.hbs
+++ b/assets/javascripts/discourse/templates/donate.hbs
@@ -8,17 +8,29 @@
   {{stripe-card charges=charges subscriptions=subscriptions}}
 </div>
 
-{{#if currentUser}}
-  <div class="donations-page-donations">
-    <h3>{{i18n 'discourse_donations.donations.title'}}</h3>
-    {{#if loadingDonations}}
-      {{loading-spinner size='small'}}
-    {{else}}
+<div class="donations-page-donations">
+  <h3>{{i18n 'discourse_donations.donations.title'}}</h3>
+  {{#if loadingDonations}}
+    <span>{{i18n 'discourse_donations.donations.loading'}}</span>
+    {{loading-spinner size='small'}}
+  {{else}}
+    {{#if currentUser}}
       {{#if hasDonations}}
-        {{donation-list charges=charges subscriptions=subscriptions}}
+        {{donation-list charges=charges subscriptions=subscriptions customer=customer}}
       {{else}}
         {{i18n 'discourse_donations.donations.none'}}
       {{/if}}
+    {{else}}
+      {{#if hasDonations}}
+        {{donation-list charges=charges subscriptions=subscriptions customer=customer}}
+      {{else}}
+        {{#if hasEmailResult}}
+          {{i18n 'discourse_donations.donations.none_email' email=email}}
+        {{else}}
+          {{input value=email placeholder=(i18n 'email')}}
+          {{d-button action='loadDonations' label='discourse_donations.donations.load' disabled=loadDonationsDisabled}}
+        {{/if}}
+      {{/if}}
     {{/if}}
-  </div>
-{{/if}}
+  {{/if}}
+</div>
diff --git a/assets/javascripts/discourse/templates/modal/cancel-subscription.hbs b/assets/javascripts/discourse/templates/modal/cancel-subscription.hbs
new file mode 100644
index 0000000..b67cb78
--- /dev/null
+++ b/assets/javascripts/discourse/templates/modal/cancel-subscription.hbs
@@ -0,0 +1,11 @@
+{{#d-modal-body title='discourse_donations.subscription.cancel.title'}}
+  {{i18n 'discourse_donations.subscription.cancel.description' site=siteSettings.title
+                                                               currency=model.currency
+                                                               amount=model.amount
+                                                               period=model.period}}
+{{/d-modal-body}}
+
+<div class="modal-footer">
+  {{d-button action='confirm' label='yes_value' class='btn-primary'}}
+  {{d-button action='cancel' label='no_value'}}
+</div>
diff --git a/assets/stylesheets/discourse-donations.scss b/assets/stylesheets/discourse-donations.scss
index 878b905..a120f28 100644
--- a/assets/stylesheets/discourse-donations.scss
+++ b/assets/stylesheets/discourse-donations.scss
@@ -61,11 +61,15 @@ div.stripe-errors {
   .donation-list {
     .subscription-list, .charge-list {
       margin-bottom: 10px;
-      display: inline-block;
 
       > ul {
         margin: 10px 0;
         list-style: none;
+
+        .spinner {
+          height: 5px;
+          width: 5px;
+        }
       }
     }
 
@@ -75,3 +79,32 @@ div.stripe-errors {
     }
   }
 }
+
+.donation-row {
+  span {
+    line-height: 25px;
+  }
+
+  &.canceled {
+    text-decoration: line-through;
+  }
+
+  &.updating {
+    color: $primary-low;
+  }
+
+  .new-flag {
+    color: $tertiary;
+    margin-left: 5px;
+
+    .fa {
+      line-height: 16px;
+      font-size: 8px;
+    }
+
+    > * {
+      display: inline-block;
+      vertical-align: middle;
+    }
+  }
+}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 657b3de..69076a5 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -27,11 +27,17 @@ en:
       title: "Make a Donation"
       amount: Amount
       card: Card
-      submit: Make Payment
+      submit: Donate
       submit_with_create_account: Make Payment and Create Account
-      invoice: "Invoice"
+      invoice: "invoice"
       invoice_prefix: "You gave"
       receipt: "Receipt sent to {{email}}."
+      subscription:
+        cancel:
+          title: "Cancel Recurring Donation"
+          description: >
+            Are you sure you want to cancel your recurring donation to {{site}}
+            of {{currency}} {{amount}} {{period}}?
       email_instructions: "Required to send you a receipt. Not used for marketing."
       transaction_fee:
         label: "Include transaction fee of {{currency}} {{transactionFee}}"
@@ -52,6 +58,9 @@ en:
         year: "every year on {{anchor}}"
       donations:
         title: "Your Donations"
+        load: "Load Donations"
+        loading: "Loading donations"
         charges: "Once Off"
         subscriptions: "Recurring"
         none: "You haven't made a donation yet."
+        none_email: "There are no donations for {{email}}."
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 9b59074..c72bc8f 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1,7 +1,11 @@
 en:
   donations:
-    recurring: "%{site_title} recurring donation"
+    recurring: "%{site_title} Recurring Donation"
     payment:
       success: 'Thank you, your donation has been successful.'
       receipt_sent: 'A receipt has been sent to %{email}.'
       invoice_sent: 'An invoice has been sent to %{email}.'
+    subscription:
+      error:
+        not_found: "Subscription not found."
+        not_cancelled: "Subscription not cancelled."
diff --git a/config/routes.rb b/config/routes.rb
index c17ffdd..b08fab8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,8 @@
 DiscourseDonations::Engine.routes.draw do
   get '/' => 'charges#index'
+
   resources :charges, only: [:index, :create]
+  put '/charges/cancel-subscription' => 'charges#cancel_subscription'
+
   resources :checkout, only: [:create]
 end

From 0260197e9ee3cd53195d4fdcdcceaa8087a5d348 Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Thu, 28 Jun 2018 13:46:02 +1000
Subject: [PATCH 7/7] various

---
 .../javascripts/discourse/components/stripe-card.js.es6   | 8 ++++----
 .../discourse/templates/components/stripe-card.hbs        | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/assets/javascripts/discourse/components/stripe-card.js.es6 b/assets/javascripts/discourse/components/stripe-card.js.es6
index 06d4ad3..2708ca1 100644
--- a/assets/javascripts/discourse/components/stripe-card.js.es6
+++ b/assets/javascripts/discourse/components/stripe-card.js.es6
@@ -1,5 +1,4 @@
 import { ajax } from 'discourse/lib/ajax';
-import { getRegister } from 'discourse-common/lib/get-owner';
 import { formatAnchor, zeroDecimalCurrencies } from '../lib/donation-utilities';
 import { default as computed } from 'ember-addons/ember-computed-decorators';
 import { emailValid } from "discourse/lib/utilities";
@@ -10,6 +9,7 @@ export default Ember.Component.extend({
   transactionInProgress: null,
   settings: null,
   showTransactionFeeDescription: false,
+  includeTransactionFee: true,
 
   init() {
     this._super();
@@ -35,8 +35,8 @@ export default Ember.Component.extend({
       return {
         id: type,
         name: I18n.t(`discourse_donations.types.${type}`)
-      }
-    })
+      };
+    });
   },
 
   @computed('type')
@@ -192,7 +192,7 @@ export default Ember.Component.extend({
             ajax('/donate/charges', {
               data: params,
               method: 'post'
-            }).then(result => {              
+            }).then(result => {
               if (result.subscription) {
                 let subscription = $.extend({}, result.subscription, {
                   new: true
diff --git a/assets/javascripts/discourse/templates/components/stripe-card.hbs b/assets/javascripts/discourse/templates/components/stripe-card.hbs
index 154a746..e8ff719 100644
--- a/assets/javascripts/discourse/templates/components/stripe-card.hbs
+++ b/assets/javascripts/discourse/templates/components/stripe-card.hbs
@@ -11,7 +11,7 @@
   <div class="control-group">
     <label class="control-label" for="card-element">
       {{i18n 'discourse_donations.amount'}}
-      {{settings.discourse_donations_currency}}
+      {{siteSettings.discourse_donations_currency}}
     </label>
     <div class="controls controls-dropdown">
       {{combo-box valueAttribute="value" content=donateAmounts value=amount}}
@@ -22,7 +22,7 @@
     <div class="control-group">
       <div class="controls">
         {{input type="checkbox" checked=includeTransactionFee}}
-        <span>{{i18n 'discourse_donations.transaction_fee.label' transactionFee=transactionFee currency=settings.discourse_donations_currency}}</span>
+        <span>{{i18n 'discourse_donations.transaction_fee.label' transactionFee=transactionFee currency=siteSettings.discourse_donations_currency}}</span>
         <div class='transaction-fee-description' {{action 'toggleTransactionFeeDescription'}}>
           {{d-icon 'info-circle'}}
           {{#if showTransactionFeeDescription}}
@@ -39,7 +39,7 @@
         {{i18n 'discourse_donations.transaction_fee.total'}}
       </label>
       <div class="controls">
-        {{settings.discourse_donations_currency}}
+        {{siteSettings.discourse_donations_currency}}
         {{totalAmount}}
         {{period}}
       </div>