1 files changed, 6 insertions, 3 deletions
diff --git a/StoneIsland/www/js/lib/nav/AddressView.js b/StoneIsland/www/js/lib/nav/AddressView.js
index 51511204..02163d51 100755
--- a/StoneIsland/www/js/lib/nav/AddressView.js
+++ b/StoneIsland/www/js/lib/nav/AddressView.js
@@ -34,12 +34,15 @@ var AddressView = SerializableView.extend({
     "Address1": "Please enter your street address.",
     "City": "Please enter your city.",
     "ZipCode": "Please enter your zip code.",
+    "Phone": "Please enter your phone number.",
   },
   
   validate_fields: function(data, errors){
     if (this.disabled) { return }
     if (this.checkPhone) {
-      var phone_number = data.Phone ? data.Phone.replace(/[^0-9]/g, "").replace(/^[01]+/) : ""
+      var phone_number = data.Phone ? String(data.Phone).replace(/[^0-9]/g, "").replace(/^[01]+/, '') : ""
+      data.Phone = phone_number
+      this.$('[name=Phone]').val(phone_number)
       var phone_length = phone_number.length
       if (phone_length === 0 || ! data.Phone) {
         errors.push([ "Phone", "Please enter your phone number." ])
@@ -50,10 +53,10 @@ var AddressView = SerializableView.extend({
       else if (phone_length > 10) {
         errors.push([ "Phone", "International phone numbers are not accepted." ])
       }
-      else if (data.Phone[0] === '+') {
+      else if (phone_number.charAt(0) === '+') {
         errors.push([ "Phone", "Please enter a valid 10 digit US/Canada phone number. International phone numbers are not accepted." ])
       }
-      else if (phone_number[0] === '1') {
+      else if (phone_number.charAt(0) === '1') {
         errors.push([ "Phone", "Please enter a valid 10 digit US/Canada phone number. International phone numbers are not accepted." ])
       }
     }