Merge branch 'master' of https://github.com/okfocus/stone-island

13 files changed, 143 insertions, 32 deletions

diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js
index 1426cd5a..546bd637 100644
--- a/StoneIsland/www/js/index.js
+++ b/StoneIsland/www/js/index.js
@@ -5,7 +5,7 @@ var app = (function(){
     app.bind()
     app.build()
     
-    sdk.init({ env: "development" })
+    sdk.init({ env: "test" })
     
     app.iscroll_options = {
       mouseWheel: true,
diff --git a/StoneIsland/www/js/lib/account/AccountView.js b/StoneIsland/www/js/lib/account/AccountView.js
index 116d5ba1..1c5c9f16 100644
--- a/StoneIsland/www/js/lib/account/AccountView.js
+++ b/StoneIsland/www/js/lib/account/AccountView.js
@@ -66,7 +66,7 @@ var AccountView = View.extend({
   },
   
   populateCreditCards: function(data, cb){
-    console.log(data)
+    console.log("populate ccs:", data.CreditCards)
     this.ccs = data.CreditCards
     this.ccLookup = {}
     if (! data.CreditCards || ! data.CreditCards.length) {
diff --git a/StoneIsland/www/js/lib/account/ProfileView.js b/StoneIsland/www/js/lib/account/ProfileView.js
index 999e8d65..da25fefc 100644
--- a/StoneIsland/www/js/lib/account/ProfileView.js
+++ b/StoneIsland/www/js/lib/account/ProfileView.js
@@ -5,6 +5,8 @@ var ProfileView = FormView.extend({
   events: {
   },
   
+  action: sdk.account.update,
+  
   initialize: function(){
     this.$form = this.$("form")
     this.$msg = this.$(".msg")
@@ -30,7 +32,7 @@ var ProfileView = FormView.extend({
     if (! data.CurrentPassword && (data.NewPassword || data.Email !== auth.user.Email)) { errors.push([ "CurrentPassword", "Please enter your current password." ]) }
     if (data.CurrentPassword && ! data.NewPassword) { errors.push([ "NewPassword", "Please enter your new password." ]) }
     if (data.NewPassword && data.NewPassword.length < 7) { errors.push([ "CurrentPassword", "New password must be 7 characters or more." ]) }
-    if (data.Gender === "NONE") { errors.push([ "Gender", "Please supply your gender." ]) }
+    // if (data.Gender === "NONE") { errors.push([ "Gender", "Please supply your gender." ]) }
   },
 
   finalize: function(data){
@@ -50,7 +52,8 @@ var ProfileView = FormView.extend({
       })
     }
 
-    var submissible_data = _.pick(data, "Name Surname BirthDay Gender YooxLetter".split(" "))
+    var submissible_data = _.pick(data, "Name Surname BirthDay YooxLetter".split(" "))
+    submissible_data.Gender = "U"
 //     submissible_data.idUser = auth.user_id
 //     submissible_data.AccessToken = auth.access_token
 //     submissible_data.Premium = "false"
diff --git a/StoneIsland/www/js/lib/auth/SignupView.js b/StoneIsland/www/js/lib/auth/SignupView.js
index 7e6fc04d..22b310de 100644
--- a/StoneIsland/www/js/lib/auth/SignupView.js
+++ b/StoneIsland/www/js/lib/auth/SignupView.js
@@ -57,7 +57,7 @@ var SignupView = FormView.extend({
     if (data.Password !== data.Password2) { errors.push([ "Password2", "Passwords don't match." ]) }
     if (! data.Email.match("@")) { errors.push([ "Email", "Email address is not valid." ]) }
     if (data.Email.toLowerCase() !== data.ConfirmEmail.toLowerCase()) { errors.push([ "ConfirmEmail", "Email addresses don't match." ]) }
-    if (data.Gender === "NONE") { errors.push([ "Gender", "Please supply your gender." ]) }
+    // if (data.Gender === "NONE") { errors.push([ "Gender", "Please supply your gender." ]) }
     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 }
@@ -67,6 +67,7 @@ var SignupView = FormView.extend({
     delete data.DataProfiling2
     delete data.ConfirmEmail
     
+    data.Gender = "U"
     data.BirthDay += "T00:00:00Z"
     
     this.last_data = data
diff --git a/StoneIsland/www/js/lib/blogs/BlogView.js b/StoneIsland/www/js/lib/blogs/BlogView.js
index 19666f8b..3cfab914 100644
--- a/StoneIsland/www/js/lib/blogs/BlogView.js
+++ b/StoneIsland/www/js/lib/blogs/BlogView.js
@@ -42,6 +42,16 @@ var BlogView = View.extend({
     if (data.store[0].StoreIsOpen !== "true") {
       app.closed.storeIsClosed = true
     }
+    var fits_large = (data.store[0].FitsLarge === "true")
+    
+    app.product.$fit.toggle( fits_large )
+    app.product.$sizing.toggle( fits_large )
+    
+    if (data.store[0].BackgroundIsGray === "true") {
+      app.collection.$el.addClass("gray")
+      app.product.gallery.$el.addClass("gray")
+    }
+    
   },
 
 })
\ No newline at end of file
diff --git a/StoneIsland/www/js/lib/cart/CartPayment.js b/StoneIsland/www/js/lib/cart/CartPayment.js
index 62dfe32d..fec5e1d1 100644
--- a/StoneIsland/www/js/lib/cart/CartPayment.js
+++ b/StoneIsland/www/js/lib/cart/CartPayment.js
@@ -11,7 +11,7 @@ var CartPayment = FormView.extend({
   cc_list_mode: false,
   
   events: {
-    "change [name=same_as_shipping]": "toggle_shipping",
+    "change [name=SameAsShipping]": "toggle_shipping",
     "click .address_dropdown": "toggle_address",
     "click .cc_dropdown": "toggle_cc",
   },
@@ -20,10 +20,14 @@ var CartPayment = FormView.extend({
     this.parent = opt.parent
     this.$form = this.$("form")
     this.$msg = this.$(".msg")
+    this.$same_as_shipping = this.$("[name=SameAsShipping]")
+    this.$billing_address_rapper = this.$(".billing_address_rapper")
     this.$address_list = this.$(".address_list")
     this.$address_form = this.$(".address")
+    this.$address_dropdown = this.$(".address_dropdown")
     this.$cc_list = this.$(".cc_list")
     this.$cc_form = this.$(".cc")
+    this.$cc_dropdown = this.$(".cc_dropdown")
 
     this.address = new AddressView ({ parent: this, checkPhone: false })
     this.cc = new CreditCardView ({ parent: this })
@@ -32,13 +36,6 @@ var CartPayment = FormView.extend({
     this.cc.disabled = true
   },
 
-  // sdk.cart.set_credit_card
-  // sdk.payment.list_credit_cards
-  // sdk.payment.add_credit_card
-  // sdk.payment.delete_credit_card
-  // sdk.payment.get_payment_types
-  // sdk.cart.use_stored_credit_card
-
   show: function(){
     document.body.className = "cart"
     app.cart.el.className = "payment"
@@ -48,11 +45,20 @@ var CartPayment = FormView.extend({
     this.populate()
     this.deferScrollToTop()
   },
+  
+  toggle_shipping: function(){
+    setTimeout(function(){
+      var state = this.$same_as_shipping.prop("checked")
+      this.$billing_address_rapper.toggle( ! state )
+    }.bind(this))
+  },
 
   toggle_address: function(state){
     if (! app.account.ccs.length) {
       state = false
     }
+    // this.$address_dropdown.toggle( !! app.account.ccs.length )
+
     this.address_list_mode = typeof state == "boolean" ? state : ! this.list_mode
     this.address.disabled = this.address_list_mode
     this.$address_form.toggle(! this.address_list_mode)
@@ -63,6 +69,8 @@ var CartPayment = FormView.extend({
     if (! app.account.ccs.length) {
       state = false
     }
+    // this.$cc_dropdown.toggle( !! app.account.ccs.length )
+
     this.cc_list_mode = typeof state == "boolean" ? state : ! this.cc_list_mode
     this.cc.disabled = this.cc_list_mode
     this.$cc_form.toggle(! this.cc_list_mode)
@@ -70,6 +78,12 @@ var CartPayment = FormView.extend({
   },
 
   populate: function(){
+    this.$(".save_as_default").show()
+    this.$address_list.empty()
+    this.$cc_list.empty()
+    this.toggle_address( !! app.account.ccs.length )
+    this.toggle_cc( !! app.account.ccs.length )
+
     app.account.ccs.forEach(function(cc){
       console.log(cc)
 
@@ -91,6 +105,40 @@ var CartPayment = FormView.extend({
       this.$cc_list.append(cc_t)
     })
   },
+
+  finalize: function(data){
+    var shipping_info = {}, address_data, address_id, cc_info = {}, cc_data, cc_id
+    var shipping_type = $("[name=ShippingType]").filter(function(){ return $(this).prop("checked") }).val()
+
+    if (this.list_mode) {
+      address_id = $("[name=AddressId]").filter(function(){ return $(this).prop("checked") }).val()
+      address_data = app.account.addressLookup[ address_id ]
+    }
+    else {
+      address_data = data
+    }
+    if (this.cc_list_mode) {
+      cc_id = $("[name=CCId]").filter(function(){ return $(this).prop("checked") }).val()
+      cc_data = app.account.ccLookup[ cc_id ]
+    }
+    else {
+      cc_data = data
+    }
+    
+    shipping_info.Name = address_data.Name
+    shipping_info.Surname = address_data.Surname
+    shipping_info.Email = auth.user.Email
+    shipping_info.Phone = address_data.Phone
+    shipping_info.Mobile = address_data.Phone
+    shipping_info.StreetWithNumber = address_data.Address
+    shipping_info.PostalCode = address_data.ZipCode
+    shipping_info.City = address_data.City
+    shipping_info.Province = address_data.Province
+    shipping_info.Region = address_data.Province
+    shipping_info.CountryCode = "US"
+    
+    return shipping_info
+  },
   
   success: function(){
     app.router.go('cart/confirm')
diff --git a/StoneIsland/www/js/lib/cart/CartShipping.js b/StoneIsland/www/js/lib/cart/CartShipping.js
index e52eec4c..1a9653e1 100644
--- a/StoneIsland/www/js/lib/cart/CartShipping.js
+++ b/StoneIsland/www/js/lib/cart/CartShipping.js
@@ -58,7 +58,7 @@ var CartShipping = FormView.extend({
       state = false
     }
     this.list_mode = typeof state == "boolean" ? state : ! this.list_mode
-    this.$dropdown_wrapper.toggle( ! app.account.addresses.length )
+    this.$dropdown_wrapper.toggle( !! app.account.addresses.length )
     this.address.disabled = this.list_mode
     this.$address_form.toggle(! this.list_mode)
     this.$address_list.toggle(this.list_mode)
@@ -93,16 +93,17 @@ var CartShipping = FormView.extend({
     
     shipping_info.Name = address_data.Name
     shipping_info.Surname = address_data.Surname
-    shipping_info.Email = address_data.Name
+    shipping_info.Email = auth.user.Email
     shipping_info.Phone = address_data.Phone
     shipping_info.Mobile = address_data.Phone
     shipping_info.StreetWithNumber = address_data.Address
     shipping_info.PostalCode = address_data.ZipCode
     shipping_info.City = address_data.City
+    shipping_info.Province = address_data.Province
     shipping_info.Region = address_data.Province
     shipping_info.CountryCode = "US"
     
-    return address_data
+    return shipping_info
   },
   
   success: function(){
diff --git a/StoneIsland/www/js/lib/cart/CartSummary.js b/StoneIsland/www/js/lib/cart/CartSummary.js
index 7872d32c..9a24afa5 100644
--- a/StoneIsland/www/js/lib/cart/CartSummary.js
+++ b/StoneIsland/www/js/lib/cart/CartSummary.js
@@ -158,6 +158,8 @@ var CartSummary = ScrollableView.extend({
     var $el = $( e.currentTarget ).closest(".cart_item_row")
     var data = $el.data()
 
+    console.log(this.data.Cart)
+
     this.data.Cart.Totals.TotalWithoutPromotions -= data.price
     this.data.Cart.Totals.TotalToPay -= data.price    
     this.data.Cart.Items = this.data.Cart.Items.filter(function(item){
@@ -173,13 +175,14 @@ var CartSummary = ScrollableView.extend({
       this.empty()
     }
     
+    app.curtain.show("loading")
     sdk.cart.delete_item({
       data: {
         Code10: data.code,
         Size: data.size,
       },
       success: function(){
-        console.log("damn")
+        app.curtain.hide("loading")
       },
     })
   },
diff --git a/StoneIsland/www/js/lib/nav/IntroView.js b/StoneIsland/www/js/lib/nav/IntroView.js
index 87e68959..2d8dca43 100644
--- a/StoneIsland/www/js/lib/nav/IntroView.js
+++ b/StoneIsland/www/js/lib/nav/IntroView.js
@@ -34,6 +34,7 @@ var IntroView = View.extend({
     else {
       heading = e.alpha || 0
     }
+    heading = - heading
     this.compass.style[transformProp] = "translateZ(0) translateX(-50%) translateY(-50%) rotate(" + heading + "deg)"
   },
   
diff --git a/StoneIsland/www/js/lib/products/CollectionView.js b/StoneIsland/www/js/lib/products/CollectionView.js
index 8ea03bd4..e35b789d 100644
--- a/StoneIsland/www/js/lib/products/CollectionView.js
+++ b/StoneIsland/www/js/lib/products/CollectionView.js
@@ -36,7 +36,7 @@ var CollectionView = ScrollableView.extend({
     this.fetch()
   },
   
-  ok: function(){
+  save: function(){
     this.filterView.filter()
   },
     
diff --git a/StoneIsland/www/js/lib/products/ProductView.js b/StoneIsland/www/js/lib/products/ProductView.js
index e151c208..eacfe989 100644
--- a/StoneIsland/www/js/lib/products/ProductView.js
+++ b/StoneIsland/www/js/lib/products/ProductView.js
@@ -4,6 +4,7 @@ var ProductView = ScrollableView.extend({
   el: "#product",
   
   events: {
+    "click .fit": "scroll_to_bottom",
     "click .size": "select_size",
     "click .color": "select_color",
     "click .share": "share",
@@ -20,6 +21,8 @@ var ProductView = ScrollableView.extend({
     this.$size = this.$(".size")
     this.$color = this.$(".color")
     this.$body = this.$(".body")
+    this.$fit = this.$(".fit")
+    this.$sizing = this.$(".sizing")
   },
 
   show: function(){
@@ -242,6 +245,9 @@ var ProductView = ScrollableView.extend({
     app.router.go('store')
   },
   
+  scroll_to_bottom: function(){
+  },
+  
   share: function(){
   },
 
diff --git a/StoneIsland/www/js/sdk/cart.js b/StoneIsland/www/js/sdk/cart.js
index bbd03299..3ff2e1d2 100644
--- a/StoneIsland/www/js/sdk/cart.js
+++ b/StoneIsland/www/js/sdk/cart.js
@@ -105,7 +105,6 @@ sdk.cart = (function(){
     })
   }
 
-  // NOTE: data might be wrapped in a Receiver object
   cart.set_shipping_address = function(opt){
     return $.ajax({
       method: "PUT",
@@ -141,6 +140,22 @@ sdk.cart = (function(){
     })
   }
 
+  cart.get_card_types = function(opt){
+    return $.ajax({
+      method: "GET",
+      url: sdk.path("Cart.API/1.6", "cardTypes.json"),
+      headers: {
+        "x-yoox-appname": auth.appname,
+        "x-yoox-cart-token": cart.token,
+      },
+      data: "",
+      success: function(data){
+        opt.success(data)
+      },
+      error: opt.error,
+    })
+  }
+
   // use with full CC data if not storing it in wallet
   cart.set_credit_card = function(opt){
     return $.ajax({
@@ -163,6 +178,17 @@ sdk.cart = (function(){
   // NB: if "verification number" is 1, use CVV/CID/CVC security code
   // if "verification number" is 2, use "Issue Number"
   cart.use_stored_credit_card = function(opt){
+    var data = {
+      "Guid": opt.data.guid,
+      "UserId": auth.user_id,
+      "AccessToken": auth.access_token,
+    }
+    if (opt.data.cvv) {
+      data["Cvv"] = opt.data.cvv
+    }
+    if (opt.data.issue) {
+      data["Issue"] = opt.data.issue
+    }
     return $.ajax({
       method: "PUT",
       url: sdk.path("Cart.API/1.6", "carts/" + cart.id + "/userCreditCard.json"),
@@ -170,13 +196,7 @@ sdk.cart = (function(){
         "x-yoox-appname": auth.appname,
         "x-yoox-cart-token": cart.token,
       },
-      data: JSON.stringify({ // NB may be wrapped in UserCreditCard object
-        "Guid": opt.guid,
-        "UserId": auth.user_id,
-        "AccessToken": auth.access_token,
-        "Cvv": opt.cvv,
-        "Issue": opt.issue,
-      }),
+      data: JSON.stringify(data),
       success: function(data){
         // console.log(data)
         opt.success(data)
@@ -184,17 +204,17 @@ sdk.cart = (function(){
       error: opt.error,
     })
   }
-  
-  cart.finalize = function(opt){
+
+  cart.secure_finalize = function(opt){
     return $.ajax({
-      method: "PUT",
+      method: "POST",
       url: sdk.path("Cart.API/1.6", "carts/" + cart.id + "/secureFinalizer.json"),
       headers: {
         "x-yoox-appname": auth.appname,
         "x-yoox-cart-token": cart.token,
         "x-yoox-device": auth.device,
       },
-      data: JSON.stringify( opt.data ),
+      data: JSON.stringify( opt.data || {} ),
       success: function(data){
         console.log(data)
         // order number is:
@@ -204,5 +224,25 @@ sdk.cart = (function(){
       error: opt.error,
     })
   }
+
+  cart.finalize = function(opt){
+    return $.ajax({
+      method: "POST",
+      url: sdk.path("Cart.API/1.6", "carts/" + cart.id + "/finalizer.json"),
+      headers: {
+        "x-yoox-appname": auth.appname,
+        "x-yoox-cart-token": cart.token,
+      },
+      data: JSON.stringify( opt.data || {} ),
+      success: function(data){
+        console.log(data)
+        // order number is:
+        // "Info": "2905Y07FA13020"
+        opt.success(data)
+      },
+      error: opt.error,
+    })
+  }
+  
   return cart
 })()
\ No newline at end of file
diff --git a/StoneIsland/www/js/sdk/payment.js b/StoneIsland/www/js/sdk/payment.js
index dcf7d7d4..283fee92 100644
--- a/StoneIsland/www/js/sdk/payment.js
+++ b/StoneIsland/www/js/sdk/payment.js
@@ -18,8 +18,6 @@ sdk.payment = (function(){
     })
   }
   
-  // LISTING A CREDIT CARD ONCE A CARD HAS BEEN ADDED PRODUCES ERROR
-  
   payment.list_credit_cards = function(opt){
     return $.ajax({
       method: "GET",