diff options
| author | claucece <soficeli0@gmail.com> | 2015-09-25 00:04:19 -0500 |
|---|---|---|
| committer | claucece <soficeli0@gmail.com> | 2015-10-05 22:41:20 -0500 |
| commit | b26d10fe7d87b570bd888fa2a2543f3675278f8b (patch) | |
| tree | 2b73a88026b78ef5f78a881ac7c0eac91d6632ac /app | |
| parent | 577c1f3e92040ab79fcd67b818c7dc8531aaa211 (diff) | |
add subscriptions
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/user.rb | 2 | ||||
| -rw-r--r-- | app/views/layouts/_navigation.html.haml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 391b2a5..4bb1e79 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -10,6 +10,8 @@ class User < CouchRest::Model::Base property :contact_email_key, String, :accessible => true property :invite_code, String, :accessible => true property :braintree_customer_id, Integer, :accessible => true + property :subscription_id, String, :accessible => true + property :enabled, TrueClass, :default => true # these will be null by default but we shouldn't ever pull them directly, but only via the methods that will return the full ServiceLevel diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index 6dbd837..63a361a 100644 --- a/app/views/layouts/_navigation.html.haml +++ b/app/views/layouts/_navigation.html.haml @@ -8,7 +8,7 @@ active: controller?(:tickets) - if APP_CONFIG[:billing] = link_to_navigation :donations, new_payment_path, - active: (controller?(:payments) and action?(:new)) + active: (controller?(:donations) and action?(:new)) = link_to_navigation :subscriptions, billing_top_link(@braintree_customer_id), active: controller?(:subscriptions) = link_to_navigation :logout, logout_path, method: :delete |