form finalize

7 files changed, 48 insertions, 41 deletions

diff --git a/StoneIsland/www/css/blogs.css b/StoneIsland/www/css/blogs.css
index d81dc587..99f420d7 100644
--- a/StoneIsland/www/css/blogs.css
+++ b/StoneIsland/www/css/blogs.css
@@ -215,7 +215,7 @@ ul.links {
 }
 #archive .menu {
   background: rgba(255,255,255,0.8);
-  position: absolute;;
+  position: absolute;
   top: 0; left: 0;
   height: 100%;
   width: 100%;
@@ -224,9 +224,11 @@ ul.links {
   transition: opacity 0.2s;
 }
 #archive .menu .items {
-  border-top: 1px solid black;
   width: 100%;
 }
+#archive .menu .item:first-of-type {
+  border-top: 1px solid black;
+}
 #archive .menu .item {
   width: 100%;
   text-align: center;
diff --git a/StoneIsland/www/css/cart.css b/StoneIsland/www/css/cart.css
index 7b0df653..ff331418 100644
--- a/StoneIsland/www/css/cart.css
+++ b/StoneIsland/www/css/cart.css
@@ -51,7 +51,8 @@ border-right: 1px solid #bbb
 
 .full .cart_body { display: block; }
 .empty .cart_empty { display: block; }
-#cart h1 span { display: none }
+#cart h1 .full_msg,
+#cart h1 .empty_msg { display: none }
 .cart_body {
   display: none;
 }
diff --git a/StoneIsland/www/js/lib/account/ProfileView.js b/StoneIsland/www/js/lib/account/ProfileView.js
index 9150f874..ad0705d3 100644
--- a/StoneIsland/www/js/lib/account/ProfileView.js
+++ b/StoneIsland/www/js/lib/account/ProfileView.js
@@ -36,19 +36,7 @@ var ProfileView = FormView.extend({
     data.YooxLetter = data.YooxLetter || "false"
   },
 
-  save: function(e){
-    e && e.preventDefault()
-
-    var valid = this.validate()
-    if (valid.errors.length) {
-      this.show_errors(valid.errors)
-      return
-    }
-    else {
-      this.hide_errors()
-    }
-    
-    var data = valid.data
+  finalize: function(data){
     if (data.CurrentPassword && (data.NewPassword || data.Email !== auth.user.Email)) {
       data.NewPassword = data.NewPassword || data.CurrentPassword
       data.NewEmail = data.NewEmail || auth.user.Email
@@ -65,30 +53,19 @@ var ProfileView = FormView.extend({
       })
     }
 
-    var submissible_data = _.pick(valid.data, "Name Surname BirthDay Gender YooxLetter".split(" "))
+    var submissible_data = _.pick(data, "Name Surname BirthDay Gender YooxLetter".split(" "))
     
-    submissible_data.idUser = auth.user_id
-    submissible_data.AccessToken = auth.access_token
-    submissible_data.Premium = "false"
-    submissible_data.LanguageId = ""
-    submissible_data.SiteCode = "STONEISLAND_US"
-    submissible_data.FuriganaName = ""
-    submissible_data.FuriganaSurname = ""
-    submissible_data.UserPromocode = ""
+//     submissible_data.idUser = auth.user_id
+//     submissible_data.AccessToken = auth.access_token
+//     submissible_data.Premium = "false"
+//     submissible_data.LanguageId = ""
+//     submissible_data.SiteCode = "STONEISLAND_US"
+//     submissible_data.FuriganaName = ""
+//     submissible_data.FuriganaSurname = ""
+//     submissible_data.UserPromocode = ""
     submissible_data.DataProfiling = "true"
-
-    app.curtain.show("loading")
-    sdk.account.update({
-      data: submissible_data,
-      success: function(data){
-        app.curtain.hide("loading")
-        this.success(data)
-      }.bind(this),
-      error: function(data){
-        app.curtain.hide("loading")
-        this.error(data)
-      }.bind(this),
-    })
+    
+    return submissible_data
   },
   
   success: function(data){
diff --git a/StoneIsland/www/js/lib/account/ShippingView.js b/StoneIsland/www/js/lib/account/ShippingView.js
index f5bf1661..f9089875 100644
--- a/StoneIsland/www/js/lib/account/ShippingView.js
+++ b/StoneIsland/www/js/lib/account/ShippingView.js
@@ -4,6 +4,22 @@ var ShippingView = FormView.extend({
 
   events: {
   },
+  
+  test_data: {
+    "Name":"name",
+    "Surname":"surname",
+    "Address":"address",
+    "IsDefault":false,
+    "IsBillingDefault":false,
+    "IsOwner":false,
+    "ZipCode":"88040",
+    "City":"City",
+    "Province":"Province",
+    "Phone":"Phone",
+    "Mobile":"Mobile",
+    "Mail":"Mail",
+    "UserId": sdk.auth.user_id,
+  },
 
   initialize: function(){
     this.$form = this.$("form")
diff --git a/StoneIsland/www/js/lib/auth/SignupView.js b/StoneIsland/www/js/lib/auth/SignupView.js
index 7f894c3c..7e6fc04d 100644
--- a/StoneIsland/www/js/lib/auth/SignupView.js
+++ b/StoneIsland/www/js/lib/auth/SignupView.js
@@ -61,7 +61,9 @@ var SignupView = FormView.extend({
     if (data.DataProfiling !== "true") { errors.push([ "DataProfiling", "You must consent to use this service." ]) }
     if (data.DataProfiling2 !== "true") { errors.push([ "DataProfiling2", "You must consent to use this service." ]) }
     if (! data.YooxLetter) { data.YooxLetter = false }
-    
+  },
+  
+  finalize: function(data){
     delete data.DataProfiling2
     delete data.ConfirmEmail
     
@@ -69,6 +71,7 @@ var SignupView = FormView.extend({
     
     this.last_data = data
     console.log(data)
+    return data
   },
   
   privacy_link: function(){
diff --git a/StoneIsland/www/js/lib/blogs/ArchiveView.js b/StoneIsland/www/js/lib/blogs/ArchiveView.js
index 3ba1dfb2..3db5c8da 100644
--- a/StoneIsland/www/js/lib/blogs/ArchiveView.js
+++ b/StoneIsland/www/js/lib/blogs/ArchiveView.js
@@ -52,7 +52,6 @@ var ArchiveView = ScrollableView.extend({
       this.$menu_items.append($t)
     }.bind(this))
     
-    
     this.back()
     this.deferScrollToTop()
   },
diff --git a/StoneIsland/www/js/lib/view/Serializable.js b/StoneIsland/www/js/lib/view/Serializable.js
index e9459229..8084b9f5 100644
--- a/StoneIsland/www/js/lib/view/Serializable.js
+++ b/StoneIsland/www/js/lib/view/Serializable.js
@@ -89,6 +89,10 @@ var SerializableView = View.extend({
     this.$msg.removeClass('alert-notice')
     this.$msg.html("")
   },
+  
+  finalize: function(data){
+    return data
+  },
 
   save: function(e){
     e && e.preventDefault()
@@ -102,9 +106,14 @@ var SerializableView = View.extend({
       this.hide_errors()
     }
     
+    var finalized_data = this.finalize(valid.data)
+    if (! finalized_data) {
+      return
+    }
+    
     app.curtain.show("loading")
     this.action({
-      data: valid.data,
+      data: finalized_data,
       success: function(data){
         app.curtain.hide("loading")
         this.success(data)