cart loading

3 files changed, 5 insertions, 9 deletions

diff --git a/StoneIsland/www/css/cart.css b/StoneIsland/www/css/cart.css
index ca44b6f6..78637f5f 100644
--- a/StoneIsland/www/css/cart.css
+++ b/StoneIsland/www/css/cart.css
@@ -60,7 +60,6 @@ border-right: 1px solid #bbb
   margin: 0;
 }
 
-
 #cart.payment #cart_payment { display: block }
 #cart_payment {
   display: none;
diff --git a/StoneIsland/www/css/index.css b/StoneIsland/www/css/index.css
index 1d1e9f83..0d855aeb 100644
--- a/StoneIsland/www/css/index.css
+++ b/StoneIsland/www/css/index.css
@@ -28,7 +28,6 @@ body {
   margin-left: -40px;
   display: none;
 }
-
 .loader:before {
   content: '';
   border-radius: 50%;
@@ -40,6 +39,7 @@ body {
   height: 80px;
   display: block;
 }
+.loading .loader { display: block; }
 @keyframes loading {
   to {transform: rotate(360deg)}
 } 
diff --git a/StoneIsland/www/js/lib/cart/CartSummary.js b/StoneIsland/www/js/lib/cart/CartSummary.js
index 7a5a1cfe..e70f152a 100644
--- a/StoneIsland/www/js/lib/cart/CartSummary.js
+++ b/StoneIsland/www/js/lib/cart/CartSummary.js
@@ -36,7 +36,7 @@ var CartSummary = ScrollableView.extend({
   },
   
   load: function(){
-    this.$loader.show()
+    this.el.className = "loading"
     app.footer.show("SHIPPING >", "CANCEL")
     sdk.cart.get_status({
       success: this.populate.bind(this),
@@ -49,8 +49,6 @@ var CartSummary = ScrollableView.extend({
 
     console.log("CART", data)
 
-    this.$loader.hide()
-
     this.update_counts()
     
     this.$rows.empty()
@@ -111,7 +109,7 @@ var CartSummary = ScrollableView.extend({
       }.bind(this))
     }.bind(this))
     
-    var subtotal = data.Cart.Totals.TotalToPay
+    var subtotal = data.Cart.Totals.TotalWithoutPromotions
     var shipping_cost = data.Cart.DeliveryMethod.Selected.Amount.Total
     var tax = 0
     var total = data.Cart.Totals.TotalToPay
@@ -121,7 +119,7 @@ var CartSummary = ScrollableView.extend({
     this.$tax.html( as_cash(tax) )
     this.$total.html( as_cash(total) )
 
-    this.$el.removeClass("empty").addClass("full")
+    this.el.className = "full"
     this.deferScrollToTop()
   },
   
@@ -131,11 +129,10 @@ var CartSummary = ScrollableView.extend({
   },
   
   empty: function(){
-    this.$loader.hide()
     app.footer.hide()
     app.header.set_cart_count(0)
     this.parent.$itemcount.html("0 ITEMS")
-    this.$el.addClass("empty").removeClass("full")
+    this.el.className = "empty"
   },
 
   save: function(){