From d11768e58b98312c95a8ac5e9c18e3069b4d76dc Mon Sep 17 00:00:00 2001
From: claucece <soficeli0@gmail.com>
Date: Tue, 15 Sep 2015 00:26:52 -0500
Subject: implemented the form and the generate

---
 engines/billing/app/controllers/payments_controller.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'engines/billing/app/controllers')

diff --git a/engines/billing/app/controllers/payments_controller.rb b/engines/billing/app/controllers/payments_controller.rb
index fce6570..b7a8e24 100644
--- a/engines/billing/app/controllers/payments_controller.rb
+++ b/engines/billing/app/controllers/payments_controller.rb
@@ -2,7 +2,7 @@ class PaymentsController < BillingBaseController
   before_filter :require_login, :only => [:index]
 
   def new
-    fetch_transparent_redirect
+  @client_token = Braintree::ClientToken.generate
   end
 
   def confirm
@@ -25,10 +25,11 @@ class PaymentsController < BillingBaseController
 
   protected
 
-
+  
   def fetch_transparent_redirect
     @tr_data = Braintree::TransparentRedirect.transaction_data redirect_url: confirm_payment_url,
       transaction: { type: "sale", options: {submit_for_settlement: true } }
   end
 
+
 end
-- 
cgit v1.2.3


From 027086fc7be10607d27a56fa18f905b696f917d4 Mon Sep 17 00:00:00 2001
From: claucece <soficeli0@gmail.com>
Date: Tue, 15 Sep 2015 17:49:35 -0500
Subject: add donate button, bitcoin, payment_method

---
 engines/billing/app/controllers/payments_controller.rb | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'engines/billing/app/controllers')

diff --git a/engines/billing/app/controllers/payments_controller.rb b/engines/billing/app/controllers/payments_controller.rb
index b7a8e24..ece967b 100644
--- a/engines/billing/app/controllers/payments_controller.rb
+++ b/engines/billing/app/controllers/payments_controller.rb
@@ -6,13 +6,11 @@ class PaymentsController < BillingBaseController
   end
 
   def confirm
-    @result = Braintree::TransparentRedirect.confirm(request.query_string)
-    if @result.success?
-      render :action => "confirm"
-    else
-      fetch_transparent_redirect
-      render :action => "new"
-    end
+    result = Braintree::Transaction.sale(
+               amount: params[:amount],
+               payment_method_nonce: params[:payment_method_nonce]
+             )
+    redirect_to action: :new, flash: { success: "done" }
   end
 
   def index
-- 
cgit v1.2.3


From 234cb9af5f11953f93910e79143fcb842e924248 Mon Sep 17 00:00:00 2001
From: claucece <soficeli0@gmail.com>
Date: Wed, 16 Sep 2015 00:13:01 -0500
Subject: added payment_info, _customer_form, sucess instances

---
 engines/billing/app/controllers/payments_controller.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'engines/billing/app/controllers')

diff --git a/engines/billing/app/controllers/payments_controller.rb b/engines/billing/app/controllers/payments_controller.rb
index ece967b..7c2b2d3 100644
--- a/engines/billing/app/controllers/payments_controller.rb
+++ b/engines/billing/app/controllers/payments_controller.rb
@@ -6,11 +6,16 @@ class PaymentsController < BillingBaseController
   end
 
   def confirm
-    result = Braintree::Transaction.sale(
+    @result = Braintree::Transaction.sale(
                amount: params[:amount],
-               payment_method_nonce: params[:payment_method_nonce]
+               payment_method_nonce: params[:payment_method_nonce],
              )
-    redirect_to action: :new, flash: { success: "done" }
+    if @result.success? == true
+    redirect_to action: :new, notice: "Congraulations! Your transaction has been successfully!"
+    else
+    flash[:alert] = "Something went wrong while processing your donation. Please try again!"
+    redirect_to action: :new
+   end
   end
 
   def index
-- 
cgit v1.2.3


From f55fd33542c68fc8fc4519d622a41ef9517ebee3 Mon Sep 17 00:00:00 2001
From: claucece <soficeli0@gmail.com>
Date: Fri, 18 Sep 2015 17:33:05 -0500
Subject: added customers, recurring payment and payment_info

---
 .../billing/app/controllers/payments_controller.rb | 58 +++++++++++++++-------
 1 file changed, 41 insertions(+), 17 deletions(-)

(limited to 'engines/billing/app/controllers')

diff --git a/engines/billing/app/controllers/payments_controller.rb b/engines/billing/app/controllers/payments_controller.rb
index 7c2b2d3..6ea149f 100644
--- a/engines/billing/app/controllers/payments_controller.rb
+++ b/engines/billing/app/controllers/payments_controller.rb
@@ -2,19 +2,10 @@ class PaymentsController < BillingBaseController
   before_filter :require_login, :only => [:index]
 
   def new
-  @client_token = Braintree::ClientToken.generate
-  end
-
-  def confirm
-    @result = Braintree::Transaction.sale(
-               amount: params[:amount],
-               payment_method_nonce: params[:payment_method_nonce],
-             )
-    if @result.success? == true
-    redirect_to action: :new, notice: "Congraulations! Your transaction has been successfully!"
+    if current_user.has_payment_info?
+      @client_token = Braintree::ClientToken.generate(customer_id: current_user.braintree_customer_id)
     else
-    flash[:alert] = "Something went wrong while processing your donation. Please try again!"
-    redirect_to action: :new
+      @client_token = Braintree::ClientToken.generate
    end
   end
 
@@ -26,13 +17,46 @@ class PaymentsController < BillingBaseController
     @transactions = braintree_data.transactions
   end
 
-  protected
+  def confirm
+    make_transaction
+    if @result.success?
+      flash[:success] = "Congratulations! Your transaction has been successfully!"
+    else
+      flash[:error] = "Something went wrong while processing your donation. Please try again!"
+    end
+    redirect_to action: :new, locale: params[:locale]
+  end
 
-  
-  def fetch_transparent_redirect
-    @tr_data = Braintree::TransparentRedirect.transaction_data redirect_url: confirm_payment_url,
-      transaction: { type: "sale", options: {submit_for_settlement: true } }
+  private
+  def make_transaction
+    unless current_user.has_payment_info?
+      transact_with_user_info
+    else
+      transact_without_user_info
+    end
   end
 
+  def transact_with_user_info
+    @result = Braintree::Transaction.sale(
+               amount: params[:amount],
+               payment_method_nonce: params[:payment_method_nonce],
+               customer: {
+                  first_name: params[:first_name],
+                  last_name: params[:last_name],
+                  company: params[:company],
+                  email: current_user.email,
+                  phone: params[:phone]
+                },
+                options: {
+                  store_in_vault: true
+                })
+    current_user.update_attributes(braintree_customer_id: @result.transaction.customer_details.id) if @result.success?
+  end
 
+  def transact_without_user_info
+    @result = Braintree::Transaction.sale(
+               amount: params[:amount],
+               payment_method_nonce: params[:payment_method_nonce],
+              )
+  end
 end
-- 
cgit v1.2.3


From 2e1d21f53f0f96fba544b592fde84af2f4879a24 Mon Sep 17 00:00:00 2001
From: claucece <soficeli0@gmail.com>
Date: Mon, 21 Sep 2015 23:27:05 -0500
Subject: subscriptions, haml and translations

---
 .../billing/app/controllers/payments_controller.rb |  10 +-
 .../app/controllers/subscriptions_controller.rb    | 105 ++++++++++++++++-----
 2 files changed, 89 insertions(+), 26 deletions(-)

(limited to 'engines/billing/app/controllers')

diff --git a/engines/billing/app/controllers/payments_controller.rb b/engines/billing/app/controllers/payments_controller.rb
index 6ea149f..4a047ad 100644
--- a/engines/billing/app/controllers/payments_controller.rb
+++ b/engines/billing/app/controllers/payments_controller.rb
@@ -9,6 +9,7 @@ class PaymentsController < BillingBaseController
    end
   end
 
+# not sure if this should be kept
   def index
     access_denied unless admin? or (@user == current_user)
     customer = Customer.find_by_user_id(@user.id)
@@ -27,12 +28,15 @@ class PaymentsController < BillingBaseController
     redirect_to action: :new, locale: params[:locale]
   end
 
+
   private
   def make_transaction
-    unless current_user.has_payment_info?
-      transact_with_user_info
-    else
+    if current_user.has_payment_info?
       transact_without_user_info
+   elsif current_user.is_anonymous?
+      transact_without_user_info
+    else
+      transact_with_user_info
     end
   end
 
diff --git a/engines/billing/app/controllers/subscriptions_controller.rb b/engines/billing/app/controllers/subscriptions_controller.rb
index f066b3c..0a9b412 100644
--- a/engines/billing/app/controllers/subscriptions_controller.rb
+++ b/engines/billing/app/controllers/subscriptions_controller.rb
@@ -1,6 +1,5 @@
 class SubscriptionsController < BillingBaseController
   before_filter :require_login
-  before_filter :fetch_subscription, :only => [:show, :destroy]
   before_filter :confirm_cancel_subscription, :only => [:destroy]
   before_filter :confirm_self_or_admin, :only => [:index]
   before_filter :confirm_no_pending_active_pastdue_subscription, :only => [:new, :create]
@@ -8,17 +7,87 @@ class SubscriptionsController < BillingBaseController
   before_filter :confirm_self, :only => [:new, :create]
 
   def new
-    # don't show link to subscribe if they are already subscribed?
-    credit_card = @customer.default_credit_card #safe to assume default?
-    @payment_method_token = credit_card.token
-    @plans = Braintree::Plan.all
+    if current_user.braintree_customer_id
+      @client_token = Braintree::ClientToken.generate(customer_id: current_user.braintree_customer_id)
+    else
+      @client_token = Braintree::ClientToken.generate
+    end
+    @subscriptions = Braintree::Plan.all
   end
 
-  # show has no content, so not needed at this point.
-
   def create
-    @result = Braintree::Subscription.create( :payment_method_token => params[:payment_method_token], :plan_id => params[:plan_id] )
-    #if you want to test pastdue, can add :price => '2001', :trial_period => true,:trial_duration => 1,:trial_duration_unit => "day" and then wait a day
+    @result = Braintree::Subscription.create(
+      payment_method_token: braintree_customer.payment_methods.first.token,
+      plan_id: params[:plan_id],
+    )
+    if @result.success?
+      flash[:success] = "Congratulations! Your transaction has been successfully!"
+    else
+      flash[:error] = "Something went wrong while processing your donation. Please try again!"
+    end
+    redirect_to action: :new, locale: params[:locale]
+  end
+
+  def braintree_customer
+    if current_user.braintree_customer_id
+      Braintree::Customer.find current_user.braintree_customer_id
+    else
+      customer = Braintree::Customer.create(payment_method_nonce: params[:payment_method_nonce]).customer
+      current_user.update_attributes braintree_customer_id: customer.id
+      customer
+    end
+  end
+
+  def confirm
+    @result = Braintree::Subscription.sale(
+      payment_method_token: params[:payment_method_nonce],
+      plans_id: params[:plan_id],
+    )
+  end
+
+  def _confirm
+    make_subscription
+    if @result.success?
+      flash[:success] = "Congratulations! Your transaction has been successfully!"
+    else
+      flash[:error] = "Something went wrong while processing your donation. Please try again!"
+    end
+  redirect_to action: :new, locale: params[:locale]
+  end
+
+private
+
+  def make_subscription
+    unless current_user.has_payment_info?
+      subs_with_user_info
+    else
+      subs_without_user_info
+    end
+  end
+
+  def subs_with_user_info
+    # don't show link to subscribe if they are already subscribed?
+    @result = Braintree::Subscription.sale(
+    payment_method_token: params[:payment_method_nonce],
+    plans_id: Braintree::Plan.all,
+    customer: {
+       first_name: params[:first_name],
+       last_name: params[:last_name],
+       company: params[:company],
+       email: current_user.email,
+       phone: params[:phone]
+       },
+    options: {
+    store_in_vault: true
+    })
+    current_user.update_attributes(braintree_customer_id: @result.transaction.customer_details.id) if @result.success?
+  end
+
+  def subs_without_user_info
+    @result = Braintree::Subscription.sale(
+              payment_method_token: params[:payment_method_nonce],
+              plans_id: Braintree::Plan.all
+    )
   end
 
   def destroy
@@ -30,26 +99,16 @@ class SubscriptionsController < BillingBaseController
     @subscriptions = customer.subscriptions(nil, false)
   end
 
-  private
-
-  def fetch_subscription
-    @subscription = Braintree::Subscription.find params[:id]
-    @credit_card = Braintree::CreditCard.find @subscription.payment_method_token
-    @subscription_customer_id = @credit_card.customer_id
-    current_user_customer = Customer.find_by_user_id(current_user.id)
-    access_denied unless admin? or (current_user_customer and current_user_customer.braintree_customer_id == @subscription_customer_id)
-
-  end
 
   def confirm_cancel_subscription
     access_denied unless view_context.allow_cancel_subscription(@subscription)
   end
 
   def confirm_no_pending_active_pastdue_subscription
-    @customer = Customer.find_by_user_id(@user.id)
-    if subscription = @customer.subscriptions # will return pending, active or pastdue subscription, if it exists
-      redirect_to user_subscription_path(@user, subscription.id), :notice => 'You already have a subscription'
-    end
+    #@customer = Customer.find_by_user_id(@user.id)
+    #if subscription = @customer.subscriptions # will return pending, active or pastdue subscription, if it exists
+      #redirect_to user_subscription_path(@user, subscription.id), :notice => 'You already have a subscription'
+    #end
   end
 
   def confirm_self
-- 
cgit v1.2.3


From c10bbfa44442c86fda82c16524341d5f21b63664 Mon Sep 17 00:00:00 2001
From: claucece <soficeli0@gmail.com>
Date: Tue, 22 Sep 2015 10:48:14 -0500
Subject: subscriptions, translation

---
 .../billing/app/controllers/customer_controller.rb | 63 ++++------------------
 engines/billing/app/controllers/subscriptors.rb    |  9 ++++
 2 files changed, 18 insertions(+), 54 deletions(-)
 create mode 100644 engines/billing/app/controllers/subscriptors.rb

(limited to 'engines/billing/app/controllers')

diff --git a/engines/billing/app/controllers/customer_controller.rb b/engines/billing/app/controllers/customer_controller.rb
index 6cbcb44..3a82ff7 100644
--- a/engines/billing/app/controllers/customer_controller.rb
+++ b/engines/billing/app/controllers/customer_controller.rb
@@ -1,64 +1,19 @@
 class CustomerController < BillingBaseController
-  before_filter :require_login, :fetch_customer
-
-  def show
-    if @customer
-      @customer.with_braintree_data!
-      @default_cc = @customer.default_credit_card
-      @active_subscription = @customer.subscriptions
-      @transactions = @customer.braintree_customer.transactions
-    end
-  end
+  before_filter :require_login
 
   def new
-    if @customer.has_payment_info?
-      redirect_to edit_customer_path(@user), :notice => 'Here is your saved customer data'
-    else
-      fetch_new_transparent_redirect_data
-    end
-  end
-
-  def edit
-    fetch_edit_transparent_redirect_data
-  end
-
-  def confirm
-    @result = Braintree::TransparentRedirect.confirm(request.query_string)
-    if @result.success?
-      @customer.braintree_customer =  @result.customer
-      @customer.save
-      render :action => "confirm"
-    elsif @customer.has_payment_info?
-      fetch_edit_transparent_redirect_data
-      render :action => "edit"
+    if current_user.braintree_customer_id
+      Braintree::Customer.find current_user.braintree_customer_id
     else
-      fetch_new_transparent_redirect_data
-      render :action => "new"
+      customer = Braintree::Customer.create(payment_method_nonce: params[:payment_method_nonce]).customer
+      current_user.update_attributes braintree_customer_id: customer.id
+      customer
     end
   end
 
-  protected
-
-  def fetch_new_transparent_redirect_data
-    access_denied unless @user == current_user # admins cannot do this for others
-    @tr_data = Braintree::TransparentRedirect.
-      create_customer_data(:redirect_url => confirm_customer_url)
-  end
-
-  def fetch_edit_transparent_redirect_data
-    access_denied unless @user == current_user # admins cannot do this for others
-    @customer.with_braintree_data!
-    @default_cc = @customer.default_credit_card
-    @tr_data = Braintree::TransparentRedirect.
-      update_customer_data(:redirect_url => confirm_customer_url,
-                           :customer_id => @customer.braintree_customer_id) ##??
+  def show
+    if current_user.braintree_customer_id
+      Braintree::Customer.find current_user.braintree_customer_id
   end
-
-  def fetch_customer
-    @customer = Customer.find_by_user_id(@user.id)
-    if @user == current_user
-      @customer ||= Customer.new(user: @user)
-    end
-    access_denied unless (@customer and (@customer.user == current_user)) or admin?
   end
 end
diff --git a/engines/billing/app/controllers/subscriptors.rb b/engines/billing/app/controllers/subscriptors.rb
new file mode 100644
index 0000000..2e80e69
--- /dev/null
+++ b/engines/billing/app/controllers/subscriptors.rb
@@ -0,0 +1,9 @@
+def braintree_customer
+  if current_user.braintree_customer_id
+    Braintree::Customer.find current_user.braintree_customer_id
+  else
+    customer = Braintree::Customer.create(payment_method_nonce: params[:payment_method_nonce]).customer
+    current_user.update_attributes braintree_customer_id: customer.id
+    customer
+  end
+end
-- 
cgit v1.2.3


From 5a4f0fa64d36df1d60bdd693580e10ce55949b6a Mon Sep 17 00:00:00 2001
From: claucece <soficeli0@gmail.com>
Date: Tue, 22 Sep 2015 23:50:04 -0500
Subject: changed routes and links

---
 .../app/controllers/subscription_controller.rb     |  7 ++++
 .../app/controllers/subscriptions_controller.rb    | 40 ++++++----------------
 2 files changed, 17 insertions(+), 30 deletions(-)
 create mode 100644 engines/billing/app/controllers/subscription_controller.rb

(limited to 'engines/billing/app/controllers')

diff --git a/engines/billing/app/controllers/subscription_controller.rb b/engines/billing/app/controllers/subscription_controller.rb
new file mode 100644
index 0000000..5328c48
--- /dev/null
+++ b/engines/billing/app/controllers/subscription_controller.rb
@@ -0,0 +1,7 @@
+class SubscriptionsController < BillingBaseController
+
+before_filter :require_admin
+before_filter :require_login
+before_filter :confirm_cancel_subscription, :only => [:destroy]
+before_filter :confirm_no_pending_active_pastdue_subscription, :only => [:new, :create]
+before_filter :confirm_self, :only => [:new, :create]
diff --git a/engines/billing/app/controllers/subscriptions_controller.rb b/engines/billing/app/controllers/subscriptions_controller.rb
index 0a9b412..dda328a 100644
--- a/engines/billing/app/controllers/subscriptions_controller.rb
+++ b/engines/billing/app/controllers/subscriptions_controller.rb
@@ -1,16 +1,20 @@
 class SubscriptionsController < BillingBaseController
   before_filter :require_login
   before_filter :confirm_cancel_subscription, :only => [:destroy]
-  before_filter :confirm_self_or_admin, :only => [:index]
-  before_filter :confirm_no_pending_active_pastdue_subscription, :only => [:new, :create]
-  # for now, admins cannot create or destroy subscriptions for others:
-  before_filter :confirm_self, :only => [:new, :create]
+
+  def index
+    @subscriptions = Braintree::Plan.all
+  end
+
+  def show
+    @subscription = Braintree::Plan.all.find params[:subscription_id]
+  end
 
   def new
     if current_user.braintree_customer_id
       @client_token = Braintree::ClientToken.generate(customer_id: current_user.braintree_customer_id)
     else
-      @client_token = Braintree::ClientToken.generate
+     @client_token = Braintree::ClientToken.generate
     end
     @subscriptions = Braintree::Plan.all
   end
@@ -41,7 +45,7 @@ class SubscriptionsController < BillingBaseController
   def confirm
     @result = Braintree::Subscription.sale(
       payment_method_token: params[:payment_method_nonce],
-      plans_id: params[:plan_id],
+      plan_id: params[:plan_id],
     )
   end
 
@@ -94,29 +98,5 @@ private
     @result = Braintree::Subscription.cancel params[:id]
   end
 
-  def index
-    customer = Customer.find_by_user_id(@user.id)
-    @subscriptions = customer.subscriptions(nil, false)
-  end
-
-
-  def confirm_cancel_subscription
-    access_denied unless view_context.allow_cancel_subscription(@subscription)
-  end
-
-  def confirm_no_pending_active_pastdue_subscription
-    #@customer = Customer.find_by_user_id(@user.id)
-    #if subscription = @customer.subscriptions # will return pending, active or pastdue subscription, if it exists
-      #redirect_to user_subscription_path(@user, subscription.id), :notice => 'You already have a subscription'
-    #end
-  end
-
-  def confirm_self
-    @user == current_user
-  end
-
-  def confirm_self_or_admin
-    access_denied unless confirm_self or admin?
-  end
 
 end
-- 
cgit v1.2.3


From 577c1f3e92040ab79fcd67b818c7dc8531aaa211 Mon Sep 17 00:00:00 2001
From: claucece <soficeli0@gmail.com>
Date: Wed, 23 Sep 2015 23:57:44 -0500
Subject: add subs_index and start show

---
 engines/billing/app/controllers/subscriptions_controller.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'engines/billing/app/controllers')

diff --git a/engines/billing/app/controllers/subscriptions_controller.rb b/engines/billing/app/controllers/subscriptions_controller.rb
index dda328a..65db21b 100644
--- a/engines/billing/app/controllers/subscriptions_controller.rb
+++ b/engines/billing/app/controllers/subscriptions_controller.rb
@@ -7,7 +7,12 @@ class SubscriptionsController < BillingBaseController
   end
 
   def show
-    @subscription = Braintree::Plan.all.find params[:subscription_id]
+    @subscriptions = Braintree::Plan.all
+    @subscriptions = Braintree::Plan.all.find params[:subscription_id]
+  end
+
+  def search
+    @subscription = Braintree::Subscription.search params[:status]
   end
 
   def new
@@ -95,7 +100,7 @@ private
   end
 
   def destroy
-    @result = Braintree::Subscription.cancel params[:id]
+    @subscriptions = Braintree::Subscription.cancel params[:id]
   end
 
 
-- 
cgit v1.2.3


From b26d10fe7d87b570bd888fa2a2543f3675278f8b Mon Sep 17 00:00:00 2001
From: claucece <soficeli0@gmail.com>
Date: Fri, 25 Sep 2015 00:04:19 -0500
Subject: add subscriptions

---
 .../billing/app/controllers/payments_controller.rb |   4 +-
 .../app/controllers/subscription_controller.rb     |   7 --
 .../app/controllers/subscriptions_controller.rb    | 123 ++++++++-------------
 3 files changed, 46 insertions(+), 88 deletions(-)
 delete mode 100644 engines/billing/app/controllers/subscription_controller.rb

(limited to 'engines/billing/app/controllers')

diff --git a/engines/billing/app/controllers/payments_controller.rb b/engines/billing/app/controllers/payments_controller.rb
index 4a047ad..871f1b4 100644
--- a/engines/billing/app/controllers/payments_controller.rb
+++ b/engines/billing/app/controllers/payments_controller.rb
@@ -21,9 +21,9 @@ class PaymentsController < BillingBaseController
   def confirm
     make_transaction
     if @result.success?
-      flash[:success] = "Congratulations! Your transaction has been successfully!"
+      flash[:success] = I18n.t(:donation_sucess)
     else
-      flash[:error] = "Something went wrong while processing your donation. Please try again!"
+      flash[:error] = I18n.t(:donation_not_sucess)
     end
     redirect_to action: :new, locale: params[:locale]
   end
diff --git a/engines/billing/app/controllers/subscription_controller.rb b/engines/billing/app/controllers/subscription_controller.rb
deleted file mode 100644
index 5328c48..0000000
--- a/engines/billing/app/controllers/subscription_controller.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class SubscriptionsController < BillingBaseController
-
-before_filter :require_admin
-before_filter :require_login
-before_filter :confirm_cancel_subscription, :only => [:destroy]
-before_filter :confirm_no_pending_active_pastdue_subscription, :only => [:new, :create]
-before_filter :confirm_self, :only => [:new, :create]
diff --git a/engines/billing/app/controllers/subscriptions_controller.rb b/engines/billing/app/controllers/subscriptions_controller.rb
index 65db21b..1d29cac 100644
--- a/engines/billing/app/controllers/subscriptions_controller.rb
+++ b/engines/billing/app/controllers/subscriptions_controller.rb
@@ -1,107 +1,72 @@
 class SubscriptionsController < BillingBaseController
   before_filter :require_login
-  before_filter :confirm_cancel_subscription, :only => [:destroy]
+  before_filter :assign_user
+  before_filter :confirm_cancel_subscription, only: [:destroy]
+  before_filter :generate_client_token, only: [:show]
+  before_filter :get_braintree_customer, only: [:subscribe]
 
   def index
-    @subscriptions = Braintree::Plan.all
+    if @user.subscription_id
+      @subscription = Braintree::Subscription.find @user.subscription_id
+      @plan = Braintree::Plan.all.select{ |plan| plan.id == @subscription.plan_id }.first
+    else
+      @subscriptions = Braintree::Plan.all
+    end
   end
 
   def show
-    @subscriptions = Braintree::Plan.all
-    @subscriptions = Braintree::Plan.all.find params[:subscription_id]
-  end
-
-  def search
-    @subscription = Braintree::Subscription.search params[:status]
-  end
-
-  def new
-    if current_user.braintree_customer_id
-      @client_token = Braintree::ClientToken.generate(customer_id: current_user.braintree_customer_id)
-    else
-     @client_token = Braintree::ClientToken.generate
-    end
-    @subscriptions = Braintree::Plan.all
+    @plan = Braintree::Plan.all.select{ |plan| plan.id == params[:id] }.first
   end
 
-  def create
-    @result = Braintree::Subscription.create(
-      payment_method_token: braintree_customer.payment_methods.first.token,
-      plan_id: params[:plan_id],
-    )
+  def subscribe
+    @result = Braintree::Subscription.create(payment_method_token: @customer.payment_methods.first.token,
+                                             plan_id: params[:id])
     if @result.success?
-      flash[:success] = "Congratulations! Your transaction has been successfully!"
+      @user.update_attributes subscription_id: @result.subscription.id
+      flash[:success] = I18n.t(:subscription_sucess)
     else
-      flash[:error] = "Something went wrong while processing your donation. Please try again!"
+      flash[:error] = I18n.t(:subscription_not_sucess)
     end
-    redirect_to action: :new, locale: params[:locale]
+    redirect_to action: :index, locale: params[:locale]
   end
 
-  def braintree_customer
-    if current_user.braintree_customer_id
-      Braintree::Customer.find current_user.braintree_customer_id
+  def unsubscribe
+    @result = Braintree::Subscription.cancel(@user.subscription_id)
+    if @result.success?
+      @user.update_attributes subscription_id: nil
+      flash[:success] = I18n.t(:unsubscription_sucess)
     else
-      customer = Braintree::Customer.create(payment_method_nonce: params[:payment_method_nonce]).customer
-      current_user.update_attributes braintree_customer_id: customer.id
-      customer
+      flash[:error] = I18n.t(:unsubscription_not_sucess)
     end
+    redirect_to action: :index, locale: params[:locale]
   end
 
-  def confirm
-    @result = Braintree::Subscription.sale(
-      payment_method_token: params[:payment_method_nonce],
-      plan_id: params[:plan_id],
-    )
+  private
+  def assign_user
+    @user = current_user
   end
 
-  def _confirm
-    make_subscription
-    if @result.success?
-      flash[:success] = "Congratulations! Your transaction has been successfully!"
+  def generate_client_token
+    if current_user.braintree_customer_id
+      @client_token = Braintree::ClientToken.generate(customer_id: current_user.braintree_customer_id)
     else
-      flash[:error] = "Something went wrong while processing your donation. Please try again!"
+     @client_token = Braintree::ClientToken.generate
     end
-  redirect_to action: :new, locale: params[:locale]
   end
 
-private
-
-  def make_subscription
-    unless current_user.has_payment_info?
-      subs_with_user_info
+  def get_braintree_customer
+    if current_user.braintree_customer_id
+      @customer = Braintree::Customer.find(current_user.braintree_customer_id)
     else
-      subs_without_user_info
+      @customer = Braintree::Customer.create(
+                              payment_method_nonce: params[:payment_method_nonce],
+                              first_name: params[:first_name],
+                              last_name: params[:last_name],
+                              company: params[:company],
+                              email: current_user.email,
+                              phone: params[:phone]
+                            ).customer
+      current_user.update_attributes braintree_customer_id: @customer.id
     end
   end
-
-  def subs_with_user_info
-    # don't show link to subscribe if they are already subscribed?
-    @result = Braintree::Subscription.sale(
-    payment_method_token: params[:payment_method_nonce],
-    plans_id: Braintree::Plan.all,
-    customer: {
-       first_name: params[:first_name],
-       last_name: params[:last_name],
-       company: params[:company],
-       email: current_user.email,
-       phone: params[:phone]
-       },
-    options: {
-    store_in_vault: true
-    })
-    current_user.update_attributes(braintree_customer_id: @result.transaction.customer_details.id) if @result.success?
-  end
-
-  def subs_without_user_info
-    @result = Braintree::Subscription.sale(
-              payment_method_token: params[:payment_method_nonce],
-              plans_id: Braintree::Plan.all
-    )
-  end
-
-  def destroy
-    @subscriptions = Braintree::Subscription.cancel params[:id]
-  end
-
-
 end
-- 
cgit v1.2.3


From 6c4f02fd2d530c28899561fac40ca76075975dc8 Mon Sep 17 00:00:00 2001
From: claucece <soficeli0@gmail.com>
Date: Sun, 27 Sep 2015 23:04:55 -0500
Subject: update to haml, created translations, deleted files

---
 .../app/controllers/billing_admin_controller.rb    |  3 ++
 .../app/controllers/billing_base_controller.rb     |  3 ++
 .../app/controllers/credit_card_info_controller.rb | 35 ----------------------
 .../billing/app/controllers/customer_controller.rb | 19 ------------
 engines/billing/app/controllers/subscriptors.rb    |  9 ------
 5 files changed, 6 insertions(+), 63 deletions(-)
 delete mode 100644 engines/billing/app/controllers/credit_card_info_controller.rb
 delete mode 100644 engines/billing/app/controllers/customer_controller.rb
 delete mode 100644 engines/billing/app/controllers/subscriptors.rb

(limited to 'engines/billing/app/controllers')

diff --git a/engines/billing/app/controllers/billing_admin_controller.rb b/engines/billing/app/controllers/billing_admin_controller.rb
index e11d4ee..23740d6 100644
--- a/engines/billing/app/controllers/billing_admin_controller.rb
+++ b/engines/billing/app/controllers/billing_admin_controller.rb
@@ -1,6 +1,9 @@
 class BillingAdminController < BillingBaseController
   before_filter :require_admin
 
+  #not sure if this controller is still needed. Admin can easly acess
+  #braintree's dashboard and check subscriptions. Don't know if everything
+  #should be 'self contained' in web_app""
   def show
 
     br_atleast_90_days = Braintree::Subscription.search do |search|
diff --git a/engines/billing/app/controllers/billing_base_controller.rb b/engines/billing/app/controllers/billing_base_controller.rb
index 0453677..c343938 100644
--- a/engines/billing/app/controllers/billing_base_controller.rb
+++ b/engines/billing/app/controllers/billing_base_controller.rb
@@ -13,6 +13,9 @@ class BillingBaseController < ApplicationController
     elsif params[:id]
       @user = User.find(params[:id])
     else
+      #not sure if this is still needed. Donations work with either customer or
+      #anonymous_user. Subscriptions work with customer. Customer belongs to
+      #user.
       # TODO
       # hacky, what are cases where @user hasn't yet been set? certainly some cases with subscriptions and payments
       @user = current_user
diff --git a/engines/billing/app/controllers/credit_card_info_controller.rb b/engines/billing/app/controllers/credit_card_info_controller.rb
deleted file mode 100644
index fbaa6f1..0000000
--- a/engines/billing/app/controllers/credit_card_info_controller.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-class CreditCardInfoController < ApplicationController
-  before_filter :require_login, :set_user
-
-  def edit
-    @credit_card = Braintree::CreditCard.find(params[:id])
-    customer = Customer.find_by_user_id(@user.id)
-    if customer and customer.braintree_customer_id == @credit_card.customer_id
-      @tr_data = Braintree::TransparentRedirect.
-        update_credit_card_data(:redirect_url => confirm_credit_card_info_url,
-                                :payment_method_token => @credit_card.token)
-    else
-      access_denied
-    end
-
-  end
-
-  def confirm
-    @result = Braintree::TransparentRedirect.confirm(request.query_string)
-    if @result.success?
-      render :action => "confirm"
-    else
-      @credit_card = Braintree::CreditCard.find(@result.params[:payment_method_token])
-      render :action => "edit"
-    end
-  end
-
-
-  private
-
-    def set_user
-    # this assumes anybody, even an admin, will not access for another user.
-    @user = current_user
-  end
-
-end
diff --git a/engines/billing/app/controllers/customer_controller.rb b/engines/billing/app/controllers/customer_controller.rb
deleted file mode 100644
index 3a82ff7..0000000
--- a/engines/billing/app/controllers/customer_controller.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class CustomerController < BillingBaseController
-  before_filter :require_login
-
-  def new
-    if current_user.braintree_customer_id
-      Braintree::Customer.find current_user.braintree_customer_id
-    else
-      customer = Braintree::Customer.create(payment_method_nonce: params[:payment_method_nonce]).customer
-      current_user.update_attributes braintree_customer_id: customer.id
-      customer
-    end
-  end
-
-  def show
-    if current_user.braintree_customer_id
-      Braintree::Customer.find current_user.braintree_customer_id
-  end
-  end
-end
diff --git a/engines/billing/app/controllers/subscriptors.rb b/engines/billing/app/controllers/subscriptors.rb
deleted file mode 100644
index 2e80e69..0000000
--- a/engines/billing/app/controllers/subscriptors.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-def braintree_customer
-  if current_user.braintree_customer_id
-    Braintree::Customer.find current_user.braintree_customer_id
-  else
-    customer = Braintree::Customer.create(payment_method_nonce: params[:payment_method_nonce]).customer
-    current_user.update_attributes braintree_customer_id: customer.id
-    customer
-  end
-end
-- 
cgit v1.2.3