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

6 files changed, 85 insertions, 30 deletions

diff --git a/StoneIsland/platforms/ios/www/js/sdk/_sdk.js b/StoneIsland/platforms/ios/www/js/sdk/_sdk.js
index 27773310..b7880e50 100644
--- a/StoneIsland/platforms/ios/www/js/sdk/_sdk.js
+++ b/StoneIsland/platforms/ios/www/js/sdk/_sdk.js
@@ -13,7 +13,7 @@ var sdk = (function(){
         break
       default:
       case 'development':
-        endpoint = "http://api.yoox.biz/"
+        endpoint = "/"
         break
       case 'production':
         endpoint = "https://secure.api.yoox.biz/"
diff --git a/StoneIsland/platforms/ios/www/js/sdk/address.js b/StoneIsland/platforms/ios/www/js/sdk/address.js
index f4e36376..4fb12ad0 100644
--- a/StoneIsland/platforms/ios/www/js/sdk/address.js
+++ b/StoneIsland/platforms/ios/www/js/sdk/address.js
@@ -1,6 +1,23 @@
 sdk.address = (function(){
   var address = {}
   
+  address.list = function(opt){
+    return $.ajax({
+      method: "GET",
+      url: sdk.path("Account.API/1.5", "users/" + auth.user_id + "/addressBook.json"),
+      headers: {
+        "x-yoox-appname": auth.appname,
+        "x-yoox-account-token": auth.access_token,
+      },
+      data: opt.data,
+      success: function(data){
+        // console.log(data)
+        opt.success(data)
+      },
+      error: opt.error,
+    })
+  }
+
   address.add = function(opt){
     return $.ajax({
       method: "POST",
@@ -18,15 +35,15 @@ sdk.address = (function(){
     })
   }
 
-  address.list = function(opt){
+  address.update = function(opt){
     return $.ajax({
-      method: "GET",
-      url: sdk.path("Account.API/1.5", "users/" + auth.user_id + "/addressBook.json"),
+      method: "PUT",
+      url: sdk.path("Account.API/1.5", "users/" + auth.user_id + "/addressBook/item.json"),
       headers: {
         "x-yoox-appname": auth.appname,
         "x-yoox-account-token": auth.access_token,
       },
-      data: opt.data,
+      data: JSON.stringify( opt.data ),
       success: function(data){
         // console.log(data)
         opt.success(data)
@@ -34,7 +51,24 @@ sdk.address = (function(){
       error: opt.error,
     })
   }
-  
+
+  address.destroy = function(opt){
+    return $.ajax({
+      method: "DELETE",
+      url: sdk.path("Account.API/1.5", "users/" + auth.user_id + "/" + opt.id + "/addressBook.json"),
+      headers: {
+        "x-yoox-appname": auth.appname,
+        "x-yoox-account-token": auth.access_token,
+      },
+      data: JSON.stringify( opt.data ),
+      success: function(data){
+        // console.log(data)
+        opt.success(data)
+      },
+      error: opt.error,
+    })
+  }
+
   return address
 
 })()
\ No newline at end of file
diff --git a/StoneIsland/platforms/ios/www/js/sdk/auth.js b/StoneIsland/platforms/ios/www/js/sdk/auth.js
index 8a72dd46..87ce60ea 100644
--- a/StoneIsland/platforms/ios/www/js/sdk/auth.js
+++ b/StoneIsland/platforms/ios/www/js/sdk/auth.js
@@ -95,15 +95,20 @@ var auth = sdk.auth = (function(){
   auth.add_deferred_product_to_cart = function(cb){
     // auth.deferred_product
     if (! auth.deferred_product) {
+        console.log("VV NO DEF PROD")
       cb && cb()
       return
     }
     sdk.cart.add_item({
       data: auth.deferred_product,
       success: function(){
-        console.log("ADDED")
+        console.log("ADDED ITEM")
         cb && cb()
-      }
+      },
+      error: function(data){
+        console.log("ERROR ADDING ITEM", data)
+        cb && cb()
+      },
     })
     auth.deferred_product = null
     app.header.increment_cart_count()
@@ -112,13 +117,12 @@ var auth = sdk.auth = (function(){
   auth.log_out = function(){
     auth.clear_user()
     auth.clear_cart()
-    auth.view_logged_out()
   }
   auth.logged_in = function(){
-    return (auth.user_id !== -1) && (auth.user_id !== "undefined")
+    return (auth.user_id && auth.user_id !== -1 && auth.user_id !== "undefined")
   }
   auth.has_cart = function(){
-    return (sdk.cart.id !== -1) && (sdk.cart.id !== "undefined")
+    return (sdk.cart.id && sdk.cart.id !== -1 && sdk.cart.id !== "undefined")
   }
   
   return auth
diff --git a/StoneIsland/platforms/ios/www/js/sdk/cart.js b/StoneIsland/platforms/ios/www/js/sdk/cart.js
index bbd03299..a5e85089 100644
--- a/StoneIsland/platforms/ios/www/js/sdk/cart.js
+++ b/StoneIsland/platforms/ios/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",
@@ -163,6 +162,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 +180,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 +188,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 +208,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/platforms/ios/www/js/sdk/payment.js b/StoneIsland/platforms/ios/www/js/sdk/payment.js
index d0951017..283fee92 100644
--- a/StoneIsland/platforms/ios/www/js/sdk/payment.js
+++ b/StoneIsland/platforms/ios/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",
@@ -30,8 +28,6 @@ sdk.payment = (function(){
       },
       data: opt.data,
       success: function(data){
-        console.log("listing credit cards")
-        console.log(data)
         opt.success(data)
       },
       error: opt.error,
diff --git a/StoneIsland/platforms/ios/www/js/sdk/shipping.js b/StoneIsland/platforms/ios/www/js/sdk/shipping.js
index a4615531..28a0db76 100644
--- a/StoneIsland/platforms/ios/www/js/sdk/shipping.js
+++ b/StoneIsland/platforms/ios/www/js/sdk/shipping.js
@@ -70,12 +70,9 @@ sdk.shipping = (function() {
         "x-yoox-appname": auth.appname,
         "x-yoox-cart-token": sdk.cart.token,
       },
-      // temporarily commented out
-      /*
       data: JSON.stringify({
         "Id": opt.id,
       }),
-      */
       success: function(data){
         //console.log(data)
         opt.success(data)