4 files changed, 25 insertions, 15 deletions

diff --git a/StoneIsland/www/js/sdk/_sdk.js b/StoneIsland/www/js/sdk/_sdk.js
index d50a99e0..27773310 100644
--- a/StoneIsland/www/js/sdk/_sdk.js
+++ b/StoneIsland/www/js/sdk/_sdk.js
@@ -35,4 +35,4 @@ var sdk = (function(){
   })
   
   return sdk
-})()
+})()
\ No newline at end of file
diff --git a/StoneIsland/www/js/sdk/account.js b/StoneIsland/www/js/sdk/account.js
index 4121bf9a..3b48b0d9 100644
--- a/StoneIsland/www/js/sdk/account.js
+++ b/StoneIsland/www/js/sdk/account.js
@@ -36,8 +36,8 @@ sdk.account = (function(){
       data: JSON.stringify( opt.data ),
       success: function(data){
         auth.user = data['UserFull']
-        auth.user_id = data['UserFull']['idUser']
-        auth.access_token = data['UserFull']['AccessToken']
+        user_id = data['UserFull']['idUser']
+        access_token = data['UserFull']['AccessToken']
         
         auth.set_user(user_id, access_token)
         
diff --git a/StoneIsland/www/js/sdk/auth.js b/StoneIsland/www/js/sdk/auth.js
index 66dd81e8..65505d81 100644
--- a/StoneIsland/www/js/sdk/auth.js
+++ b/StoneIsland/www/js/sdk/auth.js
@@ -24,7 +24,9 @@ var auth = sdk.auth = (function(){
   // android: cordova.file.externalRootDirectory api
   
   auth.init = function(fn){
+    console.log("AUTH INIT")
     auth.get_user(function(){
+      console.log("cool")
       if (auth.logged_in()) {
         auth.get_cart()
       }
@@ -71,34 +73,41 @@ var auth = sdk.auth = (function(){
     cb && cb()
   }
   auth.create_cart = function(cb){
-    if (auth.has_cart) { return cb() }
-    sdk.cart.initialize().done(function(){
-      sdk.cart.set_user().done(function(){
-        auth.set_cart(sdk.cart.id, sdk.cart.token, function(){
-          cb && cb()
+    if (auth.has_cart()) { return cb() }
+    sdk.cart.initialize({
+      success: function(data){
+        sdk.cart.set_user({
+          success: function(){
+            auth.set_cart(sdk.cart.id, sdk.cart.token, function(){
+              cb && cb()
+            })
+          }
         })
-      })
+      }
     })
   }
-  auth.defer_add_to_cart = function(){
+  auth.add_deferred_product_to_cart = function(){
     // auth.deferred_product
     sdk.cart.add_item({
-      data: {
-        Code10: auth.deferred_product.code,
-        Size: auth.deferred_product.size,
+      data: auth.deferred_product,
+      success: function(){
+        console.log("ADDED")
       }
     })
+    auth.deferred_product = null
+    app.header.increment_cart_count()
   }
+  
   auth.log_out = function(){
     auth.clear_user()
     auth.clear_cart()
     auth.view_logged_out()
   }
   auth.logged_in = function(){
-    return (auth.user_id !== -1)
+    return (auth.user_id !== -1) && (auth.user_id !== "undefined")
   }
   auth.has_cart = function(){
-    return (cart.id !== -1)
+    return (sdk.cart.id !== -1) && (sdk.cart.id !== "undefined")
   }
   
   return auth
diff --git a/StoneIsland/www/js/sdk/cart.js b/StoneIsland/www/js/sdk/cart.js
index 52b31a14..3f53d9d5 100644
--- a/StoneIsland/www/js/sdk/cart.js
+++ b/StoneIsland/www/js/sdk/cart.js
@@ -18,6 +18,7 @@ sdk.cart = (function(){
       success: function(data){
         cart.id = data["CartSession"]["CartId"]
         cart.token = data["CartSession"]["CartToken"]
+        auth.set_cart( cart.id, cart.token )
         opt.success(data)
       },
       error: opt.error,