From 6f5e2c2cdcbdb9ea4aca71f0bde2a935d979da3f Mon Sep 17 00:00:00 2001 From: jessib Date: Tue, 6 Aug 2013 14:21:08 -0700 Subject: Some more tweaks to have billing code work, and allow admins to view but not edit for other users. --- billing/app/views/subscriptions/_subscription_details.html.haml | 2 +- billing/app/views/subscriptions/index.html.haml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'billing/app/views/subscriptions') diff --git a/billing/app/views/subscriptions/_subscription_details.html.haml b/billing/app/views/subscriptions/_subscription_details.html.haml index fb18210..6eda7ca 100644 --- a/billing/app/views/subscriptions/_subscription_details.html.haml +++ b/billing/app/views/subscriptions/_subscription_details.html.haml @@ -1,5 +1,5 @@ %p - = link_to subscription.id, subscription_path(subscription.id) + = link_to subscription.id, user_subscription_path(@user, subscription.id) Balance: = number_to_currency(subscription.balance) Bill on: diff --git a/billing/app/views/subscriptions/index.html.haml b/billing/app/views/subscriptions/index.html.haml index 0e84619..87771e5 100644 --- a/billing/app/views/subscriptions/index.html.haml +++ b/billing/app/views/subscriptions/index.html.haml @@ -1,7 +1,8 @@ +%h2=t :all_subscriptions - active = false - @subscriptions.each do |s| - if s.status == 'Active' - active = true = render :partial => "subscription_details", :locals => {:subscription => s} -- if !active +- if !active and @user == current_user = link_to 'subscribe to plan', new_subscription_path, :class => :btn \ No newline at end of file -- cgit v1.2.3