summaryrefslogtreecommitdiff
path: root/billing/app/views
diff options
context:
space:
mode:
Diffstat (limited to 'billing/app/views')
-rw-r--r--billing/app/views/customers/_subscription.html.haml1
-rw-r--r--billing/app/views/customers/show.html.haml8
-rw-r--r--billing/app/views/subscriptions/index.html.haml2
3 files changed, 6 insertions, 5 deletions
diff --git a/billing/app/views/customers/_subscription.html.haml b/billing/app/views/customers/_subscription.html.haml
deleted file mode 100644
index a57f6e9..0000000
--- a/billing/app/views/customers/_subscription.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= render :partial => "subscriptions/subscription_details", :locals => {:subscription => subscription}
diff --git a/billing/app/views/customers/show.html.haml b/billing/app/views/customers/show.html.haml
index 7416682..b36ebaf 100644
--- a/billing/app/views/customers/show.html.haml
+++ b/billing/app/views/customers/show.html.haml
@@ -2,7 +2,7 @@
= link_to 'Make Payment', new_payment_path, :class => :btn
%h3 Transaction History
= render(:partial => "transaction", :collection => @transactions) # show subset with link to see more
-- if @subscriptions.any?
- %h3 Active Subscriptions
- = # todo: won't really have multiple subscriptions
- = render(:partial => "subscription", :collection => @subscriptions) \ No newline at end of file
+- if @active_subscription
+ %h3 Active Subscription
+ = render :partial => "subscriptions/subscription_details", :locals => {:subscription => @active_subscription}
+ = link_to 'All subscriptions', subscriptions_path \ No newline at end of file
diff --git a/billing/app/views/subscriptions/index.html.haml b/billing/app/views/subscriptions/index.html.haml
new file mode 100644
index 0000000..c885f90
--- /dev/null
+++ b/billing/app/views/subscriptions/index.html.haml
@@ -0,0 +1,2 @@
+- @subscriptions.each do |s|
+ = render :partial => "subscription_details", :locals => {:subscription => s} \ No newline at end of file