From 5442da999c8398b1e84162996f1e944c6496b095 Mon Sep 17 00:00:00 2001
From: jessib <jessib@leap.se>
Date: Tue, 30 Apr 2013 13:54:46 -0700
Subject: Changing customers route to be plural.

---
 billing/app/controllers/customer_controller.rb  | 65 -------------------------
 billing/app/controllers/customers_controller.rb | 65 +++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 65 deletions(-)
 delete mode 100644 billing/app/controllers/customer_controller.rb
 create mode 100644 billing/app/controllers/customers_controller.rb

(limited to 'billing/app/controllers')

diff --git a/billing/app/controllers/customer_controller.rb b/billing/app/controllers/customer_controller.rb
deleted file mode 100644
index 556b607..0000000
--- a/billing/app/controllers/customer_controller.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-class CustomerController < BillingBaseController
-  before_filter :authorize
-  before_filter :fetch_customer_data, :only => [:show, :edit]
-
-
-  def show
-    @subscriptions = @customer.active_subscriptions(@braintree_data)
-
-    # UGLY Braintree::ResourceCollection to array.
-    # might want method
-    @transactions = []
-    @braintree_data.transactions.each do |transaction|
-      @transactions << transaction
-    end
-  end
-
-  def new
-    if customer = Customer.find_by_user_id(current_user.id)
-      redirect_to edit_customer_path(customer.braintree_customer_id)
-    else
-      @tr_data = Braintree::TransparentRedirect.
-        create_customer_data(:redirect_url => confirm_customer_url)
-    end
-  end
-
-  def edit
-    @tr_data = Braintree::TransparentRedirect.
-      update_customer_data(:redirect_url => confirm_customer_url,
-                           :customer_id => params[:id])
-  end
-
-  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!
-      render :action => "confirm"
-    #elsif current_user.has_payment_info?
-    elsif (customer = Customer.find_by_user_id(current_user.id)) and customer.has_payment_info?
-      #customer.with_braintree_data!
-      render :action => "edit"
-    else
-      render :action => "new"
-    end
-  end
-
-  private
-
-  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
-      # TODO will want case for admins, presumably
-      access_denied
-    end
-  end
-
-end
diff --git a/billing/app/controllers/customers_controller.rb b/billing/app/controllers/customers_controller.rb
new file mode 100644
index 0000000..e62472f
--- /dev/null
+++ b/billing/app/controllers/customers_controller.rb
@@ -0,0 +1,65 @@
+class CustomersController < BillingBaseController
+  before_filter :authorize
+  before_filter :fetch_customer_data, :only => [:show, :edit]
+
+
+  def show
+    @subscriptions = @customer.active_subscriptions(@braintree_data)
+
+    # UGLY Braintree::ResourceCollection to array.
+    # might want method
+    @transactions = []
+    @braintree_data.transactions.each do |transaction|
+      @transactions << transaction
+    end
+  end
+
+  def new
+    if customer = Customer.find_by_user_id(current_user.id)
+      redirect_to edit_customer_path(customer.braintree_customer_id)
+    else
+      @tr_data = Braintree::TransparentRedirect.
+        create_customer_data(:redirect_url => confirm_customer_url)
+    end
+  end
+
+  def edit
+    @tr_data = Braintree::TransparentRedirect.
+      update_customer_data(:redirect_url => confirm_customer_url,
+                           :customer_id => params[:id])
+  end
+
+  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!
+      render :action => "confirm"
+    #elsif current_user.has_payment_info?
+    elsif (customer = Customer.find_by_user_id(current_user.id)) and customer.has_payment_info?
+      #customer.with_braintree_data!
+      render :action => "edit"
+    else
+      render :action => "new"
+    end
+  end
+
+  private
+
+  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
+      # TODO will want case for admins, presumably
+      access_denied
+    end
+  end
+
+end
-- 
cgit v1.2.3