diff --git a/app/controllers/discourse_donations/charges_controller.rb b/app/controllers/discourse_donations/charges_controller.rb index 463e50f..ff6c266 100644 --- a/app/controllers/discourse_donations/charges_controller.rb +++ b/app/controllers/discourse_donations/charges_controller.rb @@ -45,7 +45,7 @@ module DiscourseDonations end if charge['paid'] == true - output['messages'] << I18n.t('donations.payment.success') + output['messages'] << I18n.l(Time.now(), format: :long) + ': ' + I18n.t('donations.payment.success') output['rewards'] << { type: :group, name: group_name } if group_name output['rewards'] << { type: :badge, name: badge_name } if badge_name diff --git a/app/controllers/discourse_donations/checkout_controller.rb b/app/controllers/discourse_donations/checkout_controller.rb index 192e239..a7d742c 100644 --- a/app/controllers/discourse_donations/checkout_controller.rb +++ b/app/controllers/discourse_donations/checkout_controller.rb @@ -28,7 +28,7 @@ module DiscourseDonations end if charge['paid'] - output['messages'] << I18n.t('donations.payment.success') + output['messages'] << I18n.l(Time.now(), format: :long) + ': ' + I18n.t('donations.payment.success') output['rewards'] << { type: :group, name: group_name } if group_name output['rewards'] << { type: :badge, name: badge_name } if badge_name end @@ -57,6 +57,7 @@ module DiscourseDonations def user_params params.permit(:amount, + :email, :stripeToken, :stripeTokenType, :stripeEmail, diff --git a/assets/javascripts/discourse/components/stripe-card.js.es6 b/assets/javascripts/discourse/components/stripe-card.js.es6 index 56016ac..cd88cc3 100644 --- a/assets/javascripts/discourse/components/stripe-card.js.es6 +++ b/assets/javascripts/discourse/components/stripe-card.js.es6 @@ -18,7 +18,7 @@ export default Ember.Component.extend({ init() { this._super(); - this.set('anon', (Discourse.User.current() == null)); + 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)); diff --git a/spec/controllers/discourse_donations/charges_controller_spec.rb b/spec/controllers/discourse_donations/charges_controller_spec.rb index 4dbf084..989a666 100644 --- a/spec/controllers/discourse_donations/charges_controller_spec.rb +++ b/spec/controllers/discourse_donations/charges_controller_spec.rb @@ -34,14 +34,14 @@ module DiscourseDonations it 'responds ok for anonymous users' do post :create, params: { email: 'foobar@example.com' } - expect(body['messages']).to include(I18n.t('donations.payment.success')) + expect(body['messages'][0]).to end_with(I18n.t('donations.payment.success')) expect(response).to have_http_status(200) end it 'does not expect a username or email if accounts are not being created' do current_user = log_in(:coding_horror) post :create, params: { create_account: 'false' } - expect(body['messages']).to include(I18n.t('donations.payment.success')) + expect(body['messages'][0]).to end_with(I18n.t('donations.payment.success')) expect(response).to have_http_status(200) end @@ -129,7 +129,7 @@ module DiscourseDonations end describe 'new user' do - let(:params) { { create_account: 'true', email: 'dood@example.com', password: 'secret', name: 'dood', username: 'mr-dood' } } + let(:params) { { create_account: 'true', email: 'dood@example.com', password: 'secretsecret', name: 'dood', username: 'mr-dood' } } before { SiteSetting.stubs(:discourse_donations_enable_create_accounts).returns(true) } diff --git a/spec/jobs/regular/donation_user_spec.rb b/spec/jobs/regular/donation_user_spec.rb index 2c46eea..27fd75b 100644 --- a/spec/jobs/regular/donation_user_spec.rb +++ b/spec/jobs/regular/donation_user_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' RSpec.describe Jobs::DonationUser, type: :job do - let(:args) { { email: 'captain-sensible@example.com', username: 'wot', name: 'captain', password: 'wot' } } + let(:args) { { email: 'captain-sensible@example.com', username: 'wot', name: 'captain', password: 'secret121321' } } before do SiteSetting.stubs(:enable_badges).returns(true)