Merge branch 'master' of https://github.com/okfocus/stone-island

1 files changed, 5 insertions, 1 deletions

diff --git a/StoneIsland/www/js/lib/cart/CartSummary.js b/StoneIsland/www/js/lib/cart/CartSummary.js
index 72c44405..0ad57020 100644
--- a/StoneIsland/www/js/lib/cart/CartSummary.js
+++ b/StoneIsland/www/js/lib/cart/CartSummary.js
@@ -119,6 +119,10 @@ var CartSummary = ScrollableView.extend({
       }.bind(this))
     }.bind(this))
     
+    if (data.Cart.Receiver && data.Cart.Receiver.City) {
+      app.cart.shipping.load_form( data )
+    }
+    
     this.updateTotals()
 
     this.el.className = "full"
@@ -133,7 +137,7 @@ var CartSummary = ScrollableView.extend({
   updateTotals: function(){
     var subtotal = this.data.Cart.Totals.TotalWithoutPromotions
     var shipping_cost = this.data.Cart.DeliveryMethod.Selected.Amount.Total
-    var tax = 0
+    var tax = this.data.Cart.Totals.TotalSalesTax
     var total = this.data.Cart.Totals.TotalToPay
     
     this.$subtotal.html( as_cash(subtotal) )