Back to singular-customer controller, in hopes that would help some confusions.

9 files changed, 12 insertions, 12 deletions

diff --git a/billing/app/controllers/customers_controller.rb b/billing/app/controllers/customer_controller.rb
index 2532334..505aa6e 100644
--- a/billing/app/controllers/customers_controller.rb
+++ b/billing/app/controllers/customer_controller.rb
@@ -1,7 +1,6 @@
-class CustomersController < BillingBaseController
+class CustomerController < BillingBaseController
   before_filter :authorize
-  before_filter :fetch_customer_data, :only => [:show, :edit]
-
+  before_filter :fetch_customer_data, :only => [:show, :edit] #confirm???
 
   def show
     @active_subscription = @customer.subscriptions(@braintree_data)
@@ -12,6 +11,7 @@ class CustomersController < BillingBaseController
       redirect_to edit_customer_path(customer.braintree_customer_id), :notice => 'Here is your saved customer data'
     else
       @tr_data = Braintree::TransparentRedirect.
+        # create_customer_data(:redirect_url => confirm_customer_url(-1))  # trial
         create_customer_data(:redirect_url => confirm_customer_url)
     end
   end
@@ -24,13 +24,13 @@ class CustomersController < BillingBaseController
 
   def confirm
     @result = Braintree::TransparentRedirect.confirm(request.query_string)
-
     if @result.success?
       # customer = Customer.new(:user_id => current_user.id, :braintree_customer_id =>  @result.customer.id)
       customer = Customer.new(:braintree_customer_id =>  @result.customer.id)
       customer.user = current_user
       customer.save
       #current_user.save!
+      #debugger
       render :action => "confirm"
     #elsif current_user.has_payment_info?
     elsif (customer = Customer.find_by_user_id(current_user.id)) and customer.has_payment_info?
@@ -46,7 +46,6 @@ class CustomersController < BillingBaseController
   def fetch_customer_data
     if ((@customer = Customer.find_by_user_id(current_user.id)) and
         (params[:id] == @customer.braintree_customer_id))
-      #current_customer.with_braintree_data!
       @braintree_data = Braintree::Customer.find(params[:id]) #used in editing form
       @default_cc = @customer.default_credit_card(@braintree_data)
     else
diff --git a/billing/app/views/customers/_transaction.html.haml b/billing/app/views/customer/_transaction.html.haml
index e69de29..e69de29 100644
--- a/billing/app/views/customers/_transaction.html.haml
+++ b/billing/app/views/customer/_transaction.html.haml
diff --git a/billing/app/views/customers/confirm.html.haml b/billing/app/views/customer/confirm.html.haml
index 975d1ad..5551622 100644
--- a/billing/app/views/customers/confirm.html.haml
+++ b/billing/app/views/customer/confirm.html.haml
@@ -11,4 +11,4 @@
   - @result.customer.credit_cards.each do |cc|
     %dd= cc.masked_number
 - customer = Customer.find_by_user_id(current_user.id)
-= link_to 'View Customer Info', customer_path(customer.braintree_customer_id), :class=> :btn
\ No newline at end of file
+= link_to 'View Customer Info', show_customer_path(customer.braintree_customer_id), :class=> :btn
\ No newline at end of file
diff --git a/billing/app/views/customers/edit.html.haml b/billing/app/views/customer/edit.html.haml
index bea3211..c2e5cb3 100644
--- a/billing/app/views/customers/edit.html.haml
+++ b/billing/app/views/customer/edit.html.haml
@@ -19,4 +19,4 @@
         = link_to 'Change credit card', edit_credit_card_info_path(:id => @default_cc.token), :class => :btn
   = hidden_field_tag :tr_data, @tr_data
   = f.submit 'Save Customer Info', :class => :btn
-= link_to 'Cancel', customer_path(@braintree_data.id), :class=> :btn
\ No newline at end of file
+= link_to 'Cancel', show_customer_path(@braintree_data.id), :class=> :btn
\ No newline at end of file
diff --git a/billing/app/views/customers/new.html.haml b/billing/app/views/customer/new.html.haml
index 2ff8229..6eaa3d1 100644
--- a/billing/app/views/customers/new.html.haml
+++ b/billing/app/views/customer/new.html.haml
@@ -16,7 +16,7 @@
       %dl
         %dt= cc.label :number, 'Number'
         %dd= cc.text_field :number
-        %dt= cc.label :expiration_date, 'Exipration Date (MM/YY)'
+        %dt= cc.label :expiration_date, 'Expiration Date (MM/YY)'
         %dd= cc.text_field :expiration_date
         %dt= cc.label :cvv, 'CVV'
         %dd= cc.text_field :cvv
diff --git a/billing/app/views/customers/show.html.haml b/billing/app/views/customer/show.html.haml
index d385d98..d385d98 100644
--- a/billing/app/views/customers/show.html.haml
+++ b/billing/app/views/customer/show.html.haml
diff --git a/billing/app/views/payments/confirm.html.haml b/billing/app/views/payments/confirm.html.haml
index fddbc45..9479eb9 100644
--- a/billing/app/views/payments/confirm.html.haml
+++ b/billing/app/views/payments/confirm.html.haml
@@ -26,4 +26,4 @@
     %td= h @result.transaction.credit_card_details.card_type
 - if current_user
   - customer = Customer.find_by_user_id(current_user.id)
-  = link_to 'View Customer Info', customer_path(customer.braintree_customer_id), :class=> :btn
\ No newline at end of file
+  = link_to 'View Customer Info', show_customer_path(customer.braintree_customer_id), :class=> :btn
\ No newline at end of file
diff --git a/billing/app/views/subscriptions/show.html.haml b/billing/app/views/subscriptions/show.html.haml
index b630a05..a3d57f9 100644
--- a/billing/app/views/subscriptions/show.html.haml
+++ b/billing/app/views/subscriptions/show.html.haml
@@ -1,4 +1,4 @@
 %h1 Current Subscription
 = render :partial => "subscription_details",  :locals => {:subscription => @subscription}
 = link_to 'Cancel Subscription', subscription_path,  :confirm => 'Are you sure you want to cancel this subscription?', :method => :delete, :class => 'btn btn-danger' if @subscription.status == 'Active' # permission check or should that just be on show?
-= link_to 'Show Customer Data', customer_path(@subscription_customer_id), :class => :btn
\ No newline at end of file
+= link_to 'Show Customer Data', show_customer_path(@subscription_customer_id), :class => :btn
\ No newline at end of file
diff --git a/billing/config/routes.rb b/billing/config/routes.rb
index 9b29aef..1bb32df 100644
--- a/billing/config/routes.rb
+++ b/billing/config/routes.rb
@@ -4,10 +4,11 @@ Rails.application.routes.draw do
   match 'payments/confirm' => 'payments#confirm', :as => :confirm_payment
   resources :payments, :only => [:index]
 
-  resources :customers, :only => [:new, :edit, :show]
+  resources :customer, :only => [:new, :edit]
   resources :credit_card_info, :only => [:edit]
 
-  match 'customer/confirm' => 'customer#confirm', :as => :confirm_customer
+  match 'customer/confirm/' => 'customer#confirm', :as => :confirm_customer
+  match 'customer/show/:id' => 'customer#show', :as => :show_customer
   match 'credit_card_info/confirm' => 'credit_card_info#confirm', :as => :confirm_credit_card_info
 
   resources :subscriptions, :only => [:new, :create, :index, :show, :update, :destroy]