add to cart race condition

1 files changed, 17 insertions, 7 deletions

diff --git a/StoneIsland/www/js/lib/products/ProductView.js b/StoneIsland/www/js/lib/products/ProductView.js
index cf6c1a90..c99ff0ab 100644
--- a/StoneIsland/www/js/lib/products/ProductView.js
+++ b/StoneIsland/www/js/lib/products/ProductView.js
@@ -211,11 +211,16 @@ var ProductView = ScrollableView.extend({
       app.last_view = app.cart
     }
     else if ( ! auth.has_cart() ) {
-      auth.create_cart(auth.add_deferred_product_to_cart)
+      auth.create_cart(function(){
+        auth.add_deferred_product_to_cart(function(){
+          app.router.go("cart")
+        })
+      })
     }
     else {
-      app.go("cart")
-      auth.add_deferred_product_to_cart()
+      auth.add_deferred_product_to_cart(function(){
+        app.router.go("cart")
+      })
     }
   },
   
@@ -223,15 +228,20 @@ var ProductView = ScrollableView.extend({
   cancel: function(){
     auth.deferred_product = { Size: this.size, Code10: this.code }
     if ( ! auth.logged_in() ) {
-      app.go("account/login")
+      app.router.go("account/login")
       app.last_view = app.cart
     }
     else if ( ! auth.has_cart() ) {
-      auth.create_cart(auth.add_deferred_product_to_cart)
+      auth.create_cart(function(){
+        auth.add_deferred_product_to_cart(function(){
+          app.router.go("cart")
+        })
+      })
     }
     else {
-      app.go("cart")
-      auth.add_deferred_product_to_cart()
+      auth.add_deferred_product_to_cart(function(){
+        app.router.go("cart")
+      })
     }
   },