validations for login, address

3 files changed, 16 insertions, 9 deletions

diff --git a/StoneIsland/www/js/lib/nav/AddressView.js b/StoneIsland/www/js/lib/nav/AddressView.js
index fd482378..e5467250 100644
--- a/StoneIsland/www/js/lib/nav/AddressView.js
+++ b/StoneIsland/www/js/lib/nav/AddressView.js
@@ -23,7 +23,17 @@ var AddressView = SerializableView.extend({
   deserialize: function(){
   },
   
-  validate: function(){
+  validate_presence: {
+    "Name": "Please enter your first name.",
+    "Surname": "Please enter your last name.",
+    "Address1": "Please enter your street address.",
+    "City": "Please enter your city.",
+    "State": "Please choose your state.",
+    "Phone": "Please enter your phone number.",
+  },
+  
+  validate_fields: function(errors){
+    if (data.Phone.replace(/[^0-9]/g, "").length < 10) { errors.push("Phone", "Phone numbers must be at least 10 digits.") }
   },
 
 })
diff --git a/StoneIsland/www/js/lib/nav/CreditCardView.js b/StoneIsland/www/js/lib/nav/CreditCardView.js
index e54c1805..20705a9e 100644
--- a/StoneIsland/www/js/lib/nav/CreditCardView.js
+++ b/StoneIsland/www/js/lib/nav/CreditCardView.js
@@ -8,20 +8,20 @@ var CreditCardView = View.extend({
   
   initialize: function(opt){
     this.parent = opt.parent
-    this.parent.$(".address").html(this.template)
+    this.parent.$(".cc").html(this.template)
   },
   
   populate: function(data){
-    this.parent.$(".address input").val("")
+    this.parent.$(".cc input").val("")
     Object.keys(data).forEach(function(key){
-      this.parent$(".address [name=" + key + "]").val(data[key])
+      this.parent$(".cc [name=" + key + "]").val(data[key])
     }.bind(this))
   },
   
-  deserialize: function(){
+  validate_presence: {
   },
   
-  serialize: function(){
+  validate_fields: function(errors){
   },
 
 })
diff --git a/StoneIsland/www/js/lib/nav/CurtainView.js b/StoneIsland/www/js/lib/nav/CurtainView.js
index ba10e232..ad478335 100644
--- a/StoneIsland/www/js/lib/nav/CurtainView.js
+++ b/StoneIsland/www/js/lib/nav/CurtainView.js
@@ -21,9 +21,6 @@ var CurtainView = View.extend({
     if (document.body.classList.contains("nav")) {
       app.nav.hide()
     }
-    else if (document.body.classList.contains("login")) {
-      app.login.hide()
-    }
   },
 
 })
\ No newline at end of file