Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Another fix.

  • Loading branch information...
commit 8401aa8bb281b6dd6cc7013a0ca41d168ef9e067 1 parent 0b34dc2
Steve Crozier authored

Showing 2 changed files with 3 additions and 5 deletions. Show diff stats Hide diff stats

  1. +2 2 app/models/chargeable.rb
  2. +1 3 app/models/donation.rb
4 app/models/chargeable.rb
@@ -60,7 +60,7 @@ def reserve_and_donate
60 60 if @make_donation
61 61
62 62 unless @donation.card_valid?
63   - flash.now[:error] = 'Invalid credit card information.' + object_errors(@donation)
  63 + flash.now[:error] = 'Invalid credit card information.'
64 64 render :action => :show
65 65 return
66 66 end
@@ -127,7 +127,7 @@ def process_donation
127 127 success, message = @donation.process_payment
128 128
129 129 unless success
130   - flash.now[:error] = 'Credit card transaction could not be processed: ' + message + contact_us
  130 + flash[:error] = 'Credit card transaction could not be processed: ' + message + contact_us
131 131 if @concert
132 132 redirect_to show_ticket_form_path(@concert.ident_string) and return
133 133 else
4 app/models/donation.rb
@@ -40,9 +40,7 @@ def card_valid?
40 40 :verification_value => @credit_card_verification,
41 41 :type => @credit_card_type,
42 42 )
43   - return true if @credit_card.valid?
44   - @credit_card.errors.full_messages{|m| errors.add_to_base(m)}
45   - return false
  43 + @credit_card.valid?
46 44 end
47 45
48 46 def name_and_address

0 comments on commit 8401aa8

Please sign in to comment.
Something went wrong with that request. Please try again.