diff options
| author | jessib <jessib@riseup.net> | 2013-10-08 14:33:02 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-10-08 14:33:02 -0700 |
| commit | 4e471f6b35c012d2825f6be19e24ecd5fef8d636 (patch) | |
| tree | 0b420eba4e89094e0f1407aa09094d40b068fa5b /billing/app/views | |
| parent | 8b378d916caeaf7fd4b1da2aea45eab4b0ccbb39 (diff) | |
Consider pending & past due subscriptions as 'active' in the sense that they should prevent one from adding a new subscription.
Diffstat (limited to 'billing/app/views')
| -rw-r--r-- | billing/app/views/customer/show.html.haml | 2 | ||||
| -rw-r--r-- | billing/app/views/subscriptions/index.html.haml | 8 | ||||
| -rw-r--r-- | billing/app/views/subscriptions/show.html.haml | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/billing/app/views/customer/show.html.haml b/billing/app/views/customer/show.html.haml index 243bd3b..562dc4b 100644 --- a/billing/app/views/customer/show.html.haml +++ b/billing/app/views/customer/show.html.haml @@ -18,7 +18,7 @@ = render :partial => "subscriptions/subscription_details", :locals => {:subscription => @active_subscription} - else %p - = t(:no_active_subscription) + = t(:no_relevant_subscription) - if current_user == @user %p .form-actions diff --git a/billing/app/views/subscriptions/index.html.haml b/billing/app/views/subscriptions/index.html.haml index 87771e5..3d4e8fd 100644 --- a/billing/app/views/subscriptions/index.html.haml +++ b/billing/app/views/subscriptions/index.html.haml @@ -1,8 +1,8 @@ %h2=t :all_subscriptions -- active = false +- pending_active_pastdue = false - @subscriptions.each do |s| - - if s.status == 'Active' - - active = true + - if ['Pending', 'Active','Past Due'].include? s.status + - pending_active_pastdue = true = render :partial => "subscription_details", :locals => {:subscription => s} -- if !active and @user == current_user +- if !pending_active_pastdue and @user == current_user = link_to 'subscribe to plan', new_subscription_path, :class => :btn
\ No newline at end of file diff --git a/billing/app/views/subscriptions/show.html.haml b/billing/app/views/subscriptions/show.html.haml index 39f4d1a..b258e47 100644 --- a/billing/app/views/subscriptions/show.html.haml +++ b/billing/app/views/subscriptions/show.html.haml @@ -3,4 +3,4 @@ Current Subscription = render :partial => "subscription_details", :locals => {:subscription => @subscription} -= link_to t(:cancel_subscription), user_subscription_path(@user, @subscription.id), :confirm => t(:are_you_sure), :method => :delete, :class => 'btn btn-danger' if @subscription.status == 'Active' # permission check or should that just be on show? += link_to t(:cancel_subscription), user_subscription_path(@user, @subscription.id), :confirm => t(:are_you_sure), :method => :delete, :class => 'btn btn-danger' if ['Active', 'Pending'].include? @subscription.status # permission check or should that just be on show? # should you be able to cancel pending subscription? |