summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
m---------app/assets/javascripts/srp0
-rw-r--r--app/models/anonymous_user.rb5
-rw-r--r--app/models/user.rb10
3 files changed, 11 insertions, 4 deletions
diff --git a/app/assets/javascripts/srp b/app/assets/javascripts/srp
-Subproject 9e1a41733468d4a3f5102b04277b9cd7b52d0a4
+Subproject 8f33d32d40b1e21ae7fb9a92c78a275422af421
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
##