diff options
| author | azul <azul@leap.se> | 2015-10-19 11:19:43 +0200 |
|---|---|---|
| committer | azul <azul@leap.se> | 2015-10-19 11:19:43 +0200 |
| commit | 04302654c223dba1c9a06922afaa7462966ea122 (patch) | |
| tree | edd493015ce03bb1fb80cc61aa3076fdf8fc467f /app/views | |
| parent | c2cc1a48a4faeff4088cdf5f56e6b0382acfb346 (diff) | |
| parent | 8abadb0fe7618e978d9d297ce62fb6c0228c7191 (diff) | |
Merge pull request #198 from claucece/develop
Braintree_implementation
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/_footer.html.haml | 1 | ||||
| -rw-r--r-- | app/views/layouts/_navigation.html.haml | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index fa523d4..3bba21f 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -15,3 +15,4 @@ = link_to icon('comment') + t(:contact), contact_path - if paid_service_level? = link_to icon('shopping-cart') + t(:pricing), pricing_path + = link_to icon('barcode') + t(:Donations), new_payment_path diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index dccba0c..63a361a 100644 --- a/app/views/layouts/_navigation.html.haml +++ b/app/views/layouts/_navigation.html.haml @@ -7,6 +7,8 @@ = link_to_navigation ".tickets", auto_tickets_path, active: controller?(:tickets) - if APP_CONFIG[:billing] - = link_to_navigation :billing_settings, billing_top_link(@user), - active: controller?(:customer, :payments, :subscriptions, :credit_card_info) + = link_to_navigation :donations, new_payment_path, + 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 |