From 416ae5da6b87c78fcf49592885a916e9ce4f0904 Mon Sep 17 00:00:00 2001 From: jessib Date: Thu, 18 Apr 2013 11:51:15 -0700 Subject: Basic display of a customer's transaction information --- billing/app/controllers/customer_controller.rb | 8 ++++++++ billing/app/views/customer/_transaction.html.haml | 15 +++++++++++++++ billing/app/views/customer/edit.html.haml | 8 ++++++-- 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 billing/app/views/customer/_transaction.html.haml (limited to 'billing/app') diff --git a/billing/app/controllers/customer_controller.rb b/billing/app/controllers/customer_controller.rb index 4192f4c..d71a5e4 100644 --- a/billing/app/controllers/customer_controller.rb +++ b/billing/app/controllers/customer_controller.rb @@ -19,7 +19,15 @@ class CustomerController < BillingBaseController @tr_data = Braintree::TransparentRedirect. update_customer_data(:redirect_url => confirm_customer_url, :customer_id => params[:id]) + @subscriptions = customer.active_subscriptions(@braintree_data) + + # UGLY Braintree::ResourceCollection to array. + # might want method + @transactions = [] + @braintree_data.transactions.each do |transaction| + @transactions << transaction + end else # TODO: will want to have case for admins, presumably access_denied diff --git a/billing/app/views/customer/_transaction.html.haml b/billing/app/views/customer/_transaction.html.haml new file mode 100644 index 0000000..97842dc --- /dev/null +++ b/billing/app/views/customer/_transaction.html.haml @@ -0,0 +1,15 @@ +%p + = transaction.id + Type: + = transaction.type + Transaction Amount: + = number_to_currency(transaction.amount) + Status: + = transaction.status + Date + = transaction.created_at + - if sub_start = transaction.subscription_details.billing_period_start_date + From subscription which started + = sub_start + - else + Not paid as part of subscription \ No newline at end of file diff --git a/billing/app/views/customer/edit.html.haml b/billing/app/views/customer/edit.html.haml index 400c5e2..686c551 100644 --- a/billing/app/views/customer/edit.html.haml +++ b/billing/app/views/customer/edit.html.haml @@ -17,9 +17,13 @@ Default Credit Card = @default_cc.masked_number = # (#{link_to @default_cc.token, edit_credit_card_info_path(:id => @default_cc.token)}) + %li + Transaction History + = render(:partial => "transaction", :collection => @transactions) - if @subscriptions.any? %li - Active Subscriptions # todo: won't really have multiple subscriptions + Active Subscriptions + = # todo: won't really have multiple subscriptions = render(:partial => "subscription", :collection => @subscriptions) = hidden_field_tag :tr_data, @tr_data - = f.submit 'Save Payment Info' \ No newline at end of file + = f.submit 'Save Customer Info' \ No newline at end of file -- cgit v1.2.3