discourse/discourse-subscriptions
1
0
Fork 0
mirror of https://github.com/discourse/discourse-subscriptions.git synced 2025-07-07 23:12:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

pluralize messages name space

Browse Source
This commit is contained in:
Rimian Perkins 2017-05-03 09:59:10 +10:00
parent e2a12a1b11
commit 53ebcf4625
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/discourse_donations/charges_controller.rb
View File

@ -8,13 +8,13 @@ module DiscourseDonations
def create def create
if create_account && (email.nil? || email.empty?) if create_account && (email.nil? || email.empty?)
response = {'message' => 'Please enter your email address'} response = {'messages' => 'Please enter your email address'}
elsif create_account && params[:username].nil? elsif create_account && params[:username].nil?
response = {'message' => 'Please enter a username'} response = {'messages' => 'Please enter a username'}
else else
payment = DiscourseDonations::Stripe.new(secret_key, stripe_options) payment = DiscourseDonations::Stripe.new(secret_key, stripe_options)
response = payment.charge(email, params) response = payment.charge(email, params)
response['message'] = response['outcome']['seller_message'] response['messages'] = response['outcome']['seller_message']
end end
response['rewards'] = [] response['rewards'] = []

4
assets/javascripts/discourse/components/stripe-card.js.es6
View File

@ -58,7 +58,7 @@ export default Ember.Component.extend({
ajax('/users', { data: params, method: 'post' }).then(data => { ajax('/users', { data: params, method: 'post' }).then(data => {
self.setSuccess(); self.setSuccess();
self.set('result', self.get('result') + data.message); self.set('result', self.get('result') + data.messages);
self.endTranscation(); self.endTranscation();
}); });
}); });
@ -88,7 +88,7 @@ export default Ember.Component.extend({
if(!self.get('paymentSuccess')) { if(!self.get('paymentSuccess')) {
ajax('/charges', { data: params, method: 'post' }).then(data => { ajax('/charges', { data: params, method: 'post' }).then(data => {
self.set('result', data.message); self.set('result', data.messages);
if(!this.get('create_accounts')) { if(!this.get('create_accounts')) {
if(data.status == 'succeeded') { this.setSuccess() }; if(data.status == 'succeeded') { this.setSuccess() };

10
spec/controllers/discourse_donations/charges_controller_spec.rb
View File

@ -14,32 +14,32 @@ module DiscourseDonations
it 'responds ok for anonymous users' do it 'responds ok for anonymous users' do
post :create, { email: 'foobar@example.com' } post :create, { email: 'foobar@example.com' }
expect(body['message']).to eq(body['outcome']['seller_message']) expect(body['messages']).to eq(body['outcome']['seller_message'])
expect(response).to have_http_status(200) expect(response).to have_http_status(200)
end end
it 'responds ok when the email is empty' do it 'responds ok when the email is empty' do
post :create, { create_account: 'true', email: '' } post :create, { create_account: 'true', email: '' }
expect(body['message']).to eq('Please enter your email address') expect(body['messages']).to eq('Please enter your email address')
expect(response).to have_http_status(200) expect(response).to have_http_status(200)
end end
it 'responds ok when the email is empty' do it 'responds ok when the email is empty' do
post :create, { create_account: 'true' } post :create, { create_account: 'true' }
expect(body['message']).to eq('Please enter your email address') expect(body['messages']).to eq('Please enter your email address')
expect(response).to have_http_status(200) expect(response).to have_http_status(200)
end end
it 'expects a username if accounts are being created' do it 'expects a username if accounts are being created' do
post :create, { email: 'zipitydoodah@example.com', create_account: 'true' } post :create, { email: 'zipitydoodah@example.com', create_account: 'true' }
expect(body['message']).to eq('Please enter a username') expect(body['messages']).to eq('Please enter a username')
expect(response).to have_http_status(200) expect(response).to have_http_status(200)
end end
it 'does not expect a username or email if accounts are not being created' do it 'does not expect a username or email if accounts are not being created' do
current_user = log_in(:coding_horror) current_user = log_in(:coding_horror)
post :create, { create_account: 'false' } post :create, { create_account: 'false' }
expect(body['message']).to eq('Payment complete.') expect(body['messages']).to eq('Payment complete.')
expect(response).to have_http_status(200) expect(response).to have_http_status(200)
end end