From 0a8b671803c9517ea06d1f6c003db3bf16aed1d2 Mon Sep 17 00:00:00 2001 From: claucece Date: Tue, 15 Sep 2015 23:18:32 -0500 Subject: Donation button --- app/views/layouts/_footer.html.haml | 1 + 1 file changed, 1 insertion(+) (limited to 'app') 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 -- cgit v1.2.3 From 234cb9af5f11953f93910e79143fcb842e924248 Mon Sep 17 00:00:00 2001 From: claucece Date: Wed, 16 Sep 2015 00:13:01 -0500 Subject: added payment_info, _customer_form, sucess instances --- app/models/user.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app') diff --git a/app/models/user.rb b/app/models/user.rb index 3daee0f..b5bbadf 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -177,6 +177,10 @@ class User < CouchRest::Model::Base end + def has_payment_info? + braintree_customer_id + end + protected ## -- cgit v1.2.3 From 4b7fdbee260f703c8d09bec60c55003b2c5528bd Mon Sep 17 00:00:00 2001 From: claucece Date: Wed, 16 Sep 2015 00:20:45 -0500 Subject: correctly set up comments --- app/models/user.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'app') diff --git a/app/models/user.rb b/app/models/user.rb index b5bbadf..52eabf2 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -176,11 +176,10 @@ class User < CouchRest::Model::Base @message.save if @message end - - def has_payment_info? - braintree_customer_id - end - + + # def has_payment_info? + # braintree_customer_id + # end protected ## -- cgit v1.2.3 From f55fd33542c68fc8fc4519d622a41ef9517ebee3 Mon Sep 17 00:00:00 2001 From: claucece Date: Fri, 18 Sep 2015 17:33:05 -0500 Subject: added customers, recurring payment and payment_info --- app/assets/javascripts/srp | 2 +- app/models/anonymous_user.rb | 5 +++++ app/models/user.rb | 10 ++++++---- 3 files changed, 12 insertions(+), 5 deletions(-) (limited to 'app') diff --git a/app/assets/javascripts/srp b/app/assets/javascripts/srp index 9e1a417..8f33d32 160000 --- a/app/assets/javascripts/srp +++ b/app/assets/javascripts/srp @@ -1 +1 @@ -Subproject commit 9e1a41733468d4a3f5102b04277b9cd7b52d0a45 +Subproject commit 8f33d32d40b1e21ae7fb9a92c78a275422af4217 diff --git a/app/models/anonymous_user.rb b/app/models/anonymous_user.rb index 0c1f540..73e95e5 100644 --- a/app/models/anonymous_user.rb +++ b/app/models/anonymous_user.rb @@ -12,6 +12,10 @@ class AnonymousUser < Object def id nil end + + def has_payment_info? + false + end def email nil @@ -32,4 +36,5 @@ class AnonymousUser < Object def is_anonymous? true end + end diff --git a/app/models/user.rb b/app/models/user.rb index 52eabf2..391b2a5 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -9,6 +9,7 @@ class User < CouchRest::Model::Base property :contact_email, String, :accessible => true property :contact_email_key, String, :accessible => true property :invite_code, String, :accessible => true + property :braintree_customer_id, Integer, :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 @@ -176,10 +177,11 @@ class User < CouchRest::Model::Base @message.save if @message end - - # def has_payment_info? - # braintree_customer_id - # end + + def has_payment_info? + braintree_customer_id + end + protected ## -- cgit v1.2.3 From 2e1d21f53f0f96fba544b592fde84af2f4879a24 Mon Sep 17 00:00:00 2001 From: claucece Date: Mon, 21 Sep 2015 23:27:05 -0500 Subject: subscriptions, haml and translations --- app/views/layouts/_navigation.html.haml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app') diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index dccba0c..0b81831 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 :donations, new_payment_path, + active: (controller?(:payments) and action?(:new)) = link_to_navigation :billing_settings, billing_top_link(@user), - active: controller?(:customer, :payments, :subscriptions, :credit_card_info) + active: controller?(:subscriptions) = link_to_navigation :logout, logout_path, method: :delete -- cgit v1.2.3 From c10bbfa44442c86fda82c16524341d5f21b63664 Mon Sep 17 00:00:00 2001 From: claucece Date: Tue, 22 Sep 2015 10:48:14 -0500 Subject: subscriptions, translation --- app/views/layouts/_navigation.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index 0b81831..68d841a 100644 --- a/app/views/layouts/_navigation.html.haml +++ b/app/views/layouts/_navigation.html.haml @@ -9,6 +9,6 @@ - if APP_CONFIG[:billing] = link_to_navigation :donations, new_payment_path, active: (controller?(:payments) and action?(:new)) - = link_to_navigation :billing_settings, billing_top_link(@user), + = link_to_navigation :subscriptions, billing_top_link(@user), active: controller?(:subscriptions) = link_to_navigation :logout, logout_path, method: :delete -- cgit v1.2.3 From 5a4f0fa64d36df1d60bdd693580e10ce55949b6a Mon Sep 17 00:00:00 2001 From: claucece Date: Tue, 22 Sep 2015 23:50:04 -0500 Subject: changed routes and links --- app/views/layouts/_navigation.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index 68d841a..6dbd837 100644 --- a/app/views/layouts/_navigation.html.haml +++ b/app/views/layouts/_navigation.html.haml @@ -9,6 +9,6 @@ - if APP_CONFIG[:billing] = link_to_navigation :donations, new_payment_path, active: (controller?(:payments) and action?(:new)) - = link_to_navigation :subscriptions, billing_top_link(@user), + = link_to_navigation :subscriptions, billing_top_link(@braintree_customer_id), active: controller?(:subscriptions) = link_to_navigation :logout, logout_path, method: :delete -- cgit v1.2.3 From b26d10fe7d87b570bd888fa2a2543f3675278f8b Mon Sep 17 00:00:00 2001 From: claucece Date: Fri, 25 Sep 2015 00:04:19 -0500 Subject: add subscriptions --- app/models/user.rb | 2 ++ app/views/layouts/_navigation.html.haml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'app') 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 -- cgit v1.2.3 From 34fca623f6dc1fcdae5bf15dc7ed41294b8a2f1c Mon Sep 17 00:00:00 2001 From: claucece Date: Sun, 27 Sep 2015 23:09:26 -0500 Subject: add a comment regarding home --- app/views/home/_content.html.haml | 1 + 1 file changed, 1 insertion(+) (limited to 'app') diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml index d96a1e0..a3a42e5 100644 --- a/app/views/home/_content.html.haml +++ b/app/views/home/_content.html.haml @@ -5,6 +5,7 @@ .row-fluid = home_page_buttons +/ needed? - if Rails.env == 'development' .row-fluid %hr -- cgit v1.2.3 From 2d4765030451934aaba643f7131eb6f8d6442b28 Mon Sep 17 00:00:00 2001 From: claucece Date: Mon, 28 Sep 2015 10:43:28 -0500 Subject: deleted comment --- app/views/home/_content.html.haml | 1 - 1 file changed, 1 deletion(-) (limited to 'app') diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml index a3a42e5..d96a1e0 100644 --- a/app/views/home/_content.html.haml +++ b/app/views/home/_content.html.haml @@ -5,7 +5,6 @@ .row-fluid = home_page_buttons -/ needed? - if Rails.env == 'development' .row-fluid %hr -- cgit v1.2.3 From 8abadb0fe7618e978d9d297ce62fb6c0228c7191 Mon Sep 17 00:00:00 2001 From: claucece Date: Wed, 14 Oct 2015 14:49:56 -0500 Subject: Reverting submodule update --- app/assets/javascripts/srp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/assets/javascripts/srp b/app/assets/javascripts/srp index 8f33d32..9e1a417 160000 --- a/app/assets/javascripts/srp +++ b/app/assets/javascripts/srp @@ -1 +1 @@ -Subproject commit 8f33d32d40b1e21ae7fb9a92c78a275422af4217 +Subproject commit 9e1a41733468d4a3f5102b04277b9cd7b52d0a45 -- cgit v1.2.3