Merge pull request #198 from claucece/develop

Braintree_implementation

2 files changed, 12 insertions, 0 deletions

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 3daee0f..4bb1e79 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -9,6 +9,9 @@ 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 :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
@@ -177,6 +180,10 @@ class User < CouchRest::Model::Base
 
   end
 
+  def has_payment_info?
+    braintree_customer_id
+  end
+
   protected
 
   ##