6 files changed, 23 insertions, 2 deletions

diff --git a/StoneIsland/platforms/android/assets/www/js/lib/cart/CartConfirm.js b/StoneIsland/platforms/android/assets/www/js/lib/cart/CartConfirm.js
index b7eb8828..a82509af 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/cart/CartConfirm.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/cart/CartConfirm.js
@@ -32,6 +32,7 @@ var CartConfirm = FormView.extend({
     window.location.hash = "#/cart/confirm"
     this.deferScrollToTop()
 
+    app.view = this
     app.curtain.show("loading")
     promise(sdk.cart.get_status).then( this.populate.bind(this) )
   },
@@ -127,9 +128,12 @@ var CartConfirm = FormView.extend({
   },
 
   save: function(){
+    app.curtain.show("loading")
     promise(sdk.cart.finalize, {}).then(function(){
+      app.curtain.hide("loading")
       app.router.go('cart/thanks')
     }.bind(this)).error(function(data){
+      app.curtain.hide("loading")
       // {"Header":{"StatusCode":403,"Description":"403 Forbidden"},"Error":{"Description":"GenericApiError:CartAlreadyClosed"}}
       // {"Header":{"StatusCode":409,"Description":"304 NotModified"},"Error":{"Description":"FinalizationError:\\"Item has been removed from cart because it is no longer available.\\"\\n235"}}'
       // {"Header":{"StatusCode":409,"Description":"304 NotModified"},"Error":{"Description":"FinalizationError:\"The cart cannot be empty.\"\n233"}}
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/cart/CartPayment.js b/StoneIsland/platforms/android/assets/www/js/lib/cart/CartPayment.js
index ab454246..a19e69a5 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/cart/CartPayment.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/cart/CartPayment.js
@@ -44,6 +44,7 @@ var CartPayment = FormView.extend({
     app.footer.show("CONFIRM >")
     window.location.hash = "#/cart/payment"
 
+    app.view = this
     this.populate()
     this.deferScrollToTop()
   },
@@ -138,7 +139,9 @@ var CartPayment = FormView.extend({
         this.success()
       }.bind(this)).error(function(data){
         app.curtain.hide("loading")
+        console.log("card payment error")
         console.log(data)
+        app.cart.payment.show_errors([["","There was a problem with your credit card."]])
       }.bind(this))
       
       return
@@ -173,6 +176,7 @@ var CartPayment = FormView.extend({
   },
   
   error: function(data){
+    console.log("card payment error")
     console.log(data)
     app.cart.payment.show_errors([["Number","There was a problem with your credit card."]])
   },
@@ -181,5 +185,4 @@ var CartPayment = FormView.extend({
     app.router.go('cart/shipping')
   },
 
-
 })
\ No newline at end of file
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/cart/CartShipping.js b/StoneIsland/platforms/android/assets/www/js/lib/cart/CartShipping.js
index 1f60307e..fd227324 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/cart/CartShipping.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/cart/CartShipping.js
@@ -30,6 +30,7 @@ var CartShipping = FormView.extend({
     app.cart.el.className = "shipping"
     app.footer.show("PAYMENT >")
     window.location.hash = "#/cart/shipping"
+    app.view = this
     this.populate()
     this.deferScrollToTop()
   },
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/cart/CartSummary.js b/StoneIsland/platforms/android/assets/www/js/lib/cart/CartSummary.js
index 01887d95..9b5da7b7 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/cart/CartSummary.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/cart/CartSummary.js
@@ -28,6 +28,7 @@ var CartSummary = ScrollableView.extend({
     document.body.className = "cart"
     app.cart.el.className = "summary"
     window.location.hash = "#/cart/summary"
+    app.view = this
     if (auth.has_cart()) {
       this.load()
     }
@@ -170,6 +171,9 @@ var CartSummary = ScrollableView.extend({
   remove_item: function(e){
     var $el = $( e.currentTarget ).closest(".cart_item_row")
     var data = $el.data()
+    
+    console.log("REMOVE FROM CART")
+    console.log(data.size + " " + data.code)
 
     console.log(this.data.Cart)
 
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/cart/CartThanks.js b/StoneIsland/platforms/android/assets/www/js/lib/cart/CartThanks.js
index eb95197b..03a45d4d 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/cart/CartThanks.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/cart/CartThanks.js
@@ -12,10 +12,13 @@ var CartThanks = View.extend({
   show: function(){
     document.body.className = "cart"
     app.cart.el.className = "thanks"
+    app.header.set_cart_count(0)
     app.footer.show("< BACK TO COLLECTION")
     app.footer.hide()
-    
+        
     app.orders.loaded = false
+    
+    sdk.auth.clear_cart()
   },
   
   ok: function(){
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/cart/CartView.js b/StoneIsland/platforms/android/assets/www/js/lib/cart/CartView.js
index 1b08e418..6ed8238f 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/cart/CartView.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/cart/CartView.js
@@ -30,11 +30,17 @@ var CartView = View.extend({
       }.bind(this),
       error: function(data){
         console.log(data)
+        auth.clear_cart()
       },
     })
   },
 
   show: function(){
+    if (! navigator.onLine) {
+      app.closed.showElement()
+      app.closed.setMessage("PLEASE GO ONLINE TO<br>VIEW YOUR CART.", "")
+      return
+    }
     document.body.className = "cart"
     this.show_summary()
   },