summaryrefslogtreecommitdiff
path: root/billing/app/controllers
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2013-03-21 13:51:58 -0700
committerAzul <azul@leap.se>2013-07-17 10:46:26 +0200
commit04288c2a2179d7aa71a2fa21267e6f02fb0400e2 (patch)
treecf760c8a4ee578071ee24f613d07f62ef28b55fa /billing/app/controllers
parenta1837914b8f989e2c45fb7b78fc648f0d3f957d6 (diff)
Unauthenticated users can make single payments (like donations), but payments from authenticated users will be as a Braintree Customer stored in the braintree vault.
Diffstat (limited to 'billing/app/controllers')
-rw-r--r--billing/app/controllers/customer_controller.rb12
-rw-r--r--billing/app/controllers/payments_controller.rb15
2 files changed, 22 insertions, 5 deletions
diff --git a/billing/app/controllers/customer_controller.rb b/billing/app/controllers/customer_controller.rb
index dcb94eb..bdb89f7 100644
--- a/billing/app/controllers/customer_controller.rb
+++ b/billing/app/controllers/customer_controller.rb
@@ -7,12 +7,14 @@ class CustomerController < ApplicationController
end
def edit
- current_customer = Customer.find_by_user_id(current_user.id)
+ customer = Customer.find_by_user_id(current_user.id)
#current_customer.with_braintree_data!
- #@credit_card = current_customer.default_credit_card
+ # @credit_card = current_customer.default_credit_card
+ @braintree_data = Braintree::Customer.find(customer.braintree_customer_id)
+ @default_cc = @braintree_data.credit_cards.find { |cc| cc.default? }
@tr_data = Braintree::TransparentRedirect.
update_customer_data(:redirect_url => confirm_customer_url,
- :customer_id => current_customer.braintree_customer_id)
+ :customer_id => customer.braintree_customer_id)
end
def confirm
@@ -26,8 +28,8 @@ class CustomerController < ApplicationController
#current_user.save!
render :action => "confirm"
#elsif current_user.has_payment_info?
- elsif (current_customer = Customer.find_by_user_id(current_user.id)) and current_customer.has_payment_info?
- current_customer.with_braintree_data! #todo
+ elsif (customer = Customer.find_by_user_id(current_user.id)) and customer.has_payment_info?
+ customer.with_braintree_data! #todo
render :action => "edit"
else
render :action => "new"
diff --git a/billing/app/controllers/payments_controller.rb b/billing/app/controllers/payments_controller.rb
index 2a76bb1..79a6433 100644
--- a/billing/app/controllers/payments_controller.rb
+++ b/billing/app/controllers/payments_controller.rb
@@ -1,6 +1,21 @@
class PaymentsController < ApplicationController
def new
@amount = calculate_amount
+ if current_user
+ if @customer = Customer.find_by_user_id(current_user.id)
+ @braintree_data = Braintree::Customer.find(@customer.braintree_customer_id)
+ @default_cc = @braintree_data.credit_cards.find { |cc| cc.default? }
+ @tr_data = Braintree::TransparentRedirect.transaction_data(:redirect_url => confirm_payment_url,
+ :transaction => {:type => "sale", :amount => @amount, :customer_id => @customer.braintree_customer_id, :options => {:submit_for_settlement => true } })
+ else
+ redirect_to new_customer_path
+ end
+ else
+ # anonymous payment not attributed to any user (ie, donation)
+ @tr_data = Braintree::TransparentRedirect.transaction_data(:redirect_url => confirm_payment_url,
+ :transaction => {:type => "sale", :amount => @amount, :options => {:submit_for_settlement => true } })
+ end
+
end
def confirm