From 0fe1678cd37c8e917cb28eed9eb28777d3a92283 Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Tue, 1 Oct 2013 13:56:59 -0700
Subject: Allow admins to view past-due subscriptions.

---
 billing/app/helpers/billing_helper.rb | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'billing/app/helpers')

diff --git a/billing/app/helpers/billing_helper.rb b/billing/app/helpers/billing_helper.rb
index 3c0691f..1dd3f38 100644
--- a/billing/app/helpers/billing_helper.rb
+++ b/billing/app/helpers/billing_helper.rb
@@ -9,6 +9,15 @@ module BillingHelper
     form_for object, options, &block
   end
 
+  def billing_top_link(user)
+    # for admins, top link will show special admin information, which has link to show their own customer information
+    if (admin? and user == current_user)
+      billing_admin_path
+    else
+      show_or_new_customer_link(user)
+    end
+  end
+
   def show_or_new_customer_link(user)
     # Link to show if user is admin viewing another user, or user is already a customer.
     # Otherwise link to create a new customer.
@@ -19,4 +28,22 @@ module BillingHelper
     end
   end
 
+  # a bit strange to put here, but we don't have a subscription model
+  def user_for_subscription(subscription)
+
+    if (transaction = subscription.transactions.first)
+      # much quicker, but will only work if there is already a transaction associated with subscription (should generally be)
+      braintree_customer = transaction.customer_details
+    else
+      search_results = Braintree::Customer.search do |search|
+        search.payment_method_token.is subscription.payment_method_token
+      end
+      braintree_customer = search_results.first
+    end
+
+    customer = Customer.find_by_braintree_customer_id(braintree_customer.id)
+    user = User.find(customer.user_id)
+
+  end
+
 end
-- 
cgit v1.2.3


From e4d422142fb2db2153916bed5826651e8418b7a0 Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Thu, 3 Oct 2013 12:06:57 -0700
Subject: Some refactoring of displayed of past-due subscriptions.

---
 billing/app/helpers/billing_helper.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'billing/app/helpers')

diff --git a/billing/app/helpers/billing_helper.rb b/billing/app/helpers/billing_helper.rb
index 1dd3f38..68ed5b8 100644
--- a/billing/app/helpers/billing_helper.rb
+++ b/billing/app/helpers/billing_helper.rb
@@ -46,4 +46,17 @@ module BillingHelper
 
   end
 
+  def show_set_user_subscriptions(set)
+    if set.empty?
+      return t(:none)
+    else
+      subscriptions_to_display = ''
+      set.each do |past_due_subscription|
+        subscriptions_to_display += render :partial => "subscriptions/subscription_details", :locals => {:subscription => past_due_subscription, :show_user => user_for_subscription(past_due_subscription)}
+      end
+     subscriptions_to_display.html_safe
+    end
+  end
+
+
 end
-- 
cgit v1.2.3


From 92cb054d53aaac6864a6a805d9cdd3919f4a38bc Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Thu, 17 Oct 2013 13:58:54 -0700
Subject: Some cleanup of code to deal with past due subscriptions.

---
 billing/app/helpers/billing_helper.rb | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

(limited to 'billing/app/helpers')

diff --git a/billing/app/helpers/billing_helper.rb b/billing/app/helpers/billing_helper.rb
index 68ed5b8..b9e5e2e 100644
--- a/billing/app/helpers/billing_helper.rb
+++ b/billing/app/helpers/billing_helper.rb
@@ -33,30 +33,19 @@ module BillingHelper
 
     if (transaction = subscription.transactions.first)
       # much quicker, but will only work if there is already a transaction associated with subscription (should generally be)
-      braintree_customer = transaction.customer_details
+      braintree_customer_id = transaction.customer_details.id
     else
-      search_results = Braintree::Customer.search do |search|
-        search.payment_method_token.is subscription.payment_method_token
-      end
-      braintree_customer = search_results.first
+      credit_card = Braintree::CreditCard.find(subscription.payment_method_token)
+      braintree_customer_id = credit_card.customer_id
     end
 
-    customer = Customer.find_by_braintree_customer_id(braintree_customer.id)
+    customer = Customer.find_by_braintree_customer_id(braintree_customer_id)
     user = User.find(customer.user_id)
 
   end
 
-  def show_set_user_subscriptions(set)
-    if set.empty?
-      return t(:none)
-    else
-      subscriptions_to_display = ''
-      set.each do |past_due_subscription|
-        subscriptions_to_display += render :partial => "subscriptions/subscription_details", :locals => {:subscription => past_due_subscription, :show_user => user_for_subscription(past_due_subscription)}
-      end
-     subscriptions_to_display.html_safe
-    end
+  def allow_cancel_subscription(subscription)
+    ['Active', 'Pending'].include? subscription.status or (admin? and subscription.status == 'Past Due')
   end
 
-
 end
-- 
cgit v1.2.3