1 files changed, 44 insertions, 18 deletions
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/account/AccountView.js b/StoneIsland/platforms/android/assets/www/js/lib/account/AccountView.js
index 7d3b719a..9e6f1714 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/account/AccountView.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/account/AccountView.js
@@ -21,11 +21,16 @@ var AccountView = View.extend({
   ccs: [],
   ccLookup: {},
   
-  listAddresses: function(cb){
+  listAddresses: function(opt){
     sdk.address.list({
       success: function(data){
-        this.populateAddresses(data, cb)
-      }.bind(this)
+        this.populateAddresses(data, opt.success)
+      }.bind(this),
+      error: function(data){
+        console.log("error listing addresses!")
+        console.log(data.responseText)
+        opt.error && opt.error()
+      }.bind(this),
     })
   },
   
@@ -53,6 +58,7 @@ var AccountView = View.extend({
     }.bind(this))
     
     app.cart.shipping.populate()
+    app.cart.payment.populate()
     
     cb && cb()
   },
@@ -98,25 +104,45 @@ var AccountView = View.extend({
     }
     if ( ! auth.has_cart() ) {
       app.curtain.show("loading")
-      auth.create_cart(function(){
-        if (auth.deferred_product) {
-          auth.add_deferred_product_to_cart(function(){
-            app.router.go("cart")
-            setTimeout(function(){
-              app.curtain.hide("loading")
-            }, 500)
-          })
-        }
-        else {
-          app.router.go("account/profile")
-          app.curtain.hide("loading")
-        }
+      auth.create_cart({
+        success: function(){
+          if (auth.deferred_product) {
+            auth.add_deferred_product_to_cart({
+              success: function(){
+                app.router.go("cart")
+                setTimeout(function(){
+                  app.curtain.hide("loading")
+                }, 500)
+              },
+              error: function(){
+                // TODO: should not be called because cart was just created
+                console.log("ERROR ADDING PRODUCT TO NEW CART")
+              },
+            })
+          }
+          else {
+            app.router.go("account/profile")
+            app.curtain.hide("loading")
+          }
+        },
+        error: function(){
+          // error CREATING cart...
+          console.log("ERROR CREATING CART")
+          auth.log_out()
+          app.account.logged_out()
+        },
       })
     }
     else {
       if (auth.deferred_product) {
-        auth.add_deferred_product_to_cart(function(){
-          app.router.go("cart")
+        auth.add_deferred_product_to_cart({
+          success: function(){
+            app.router.go("cart")
+          },
+          error: function(){
+            // TODO: cart might be invalid..
+            console.log("CALLED LOGGED_IN, HAD DEFERRED PRODUCT")
+          },
         })
       }
       else {