4 files changed, 24 insertions, 3 deletions
diff --git a/StoneIsland/www/js/lib/cart/CartConfirm.js b/StoneIsland/www/js/lib/cart/CartConfirm.js
index aa6ec9e4..8a6b3c0e 100644
--- a/StoneIsland/www/js/lib/cart/CartConfirm.js
+++ b/StoneIsland/www/js/lib/cart/CartConfirm.js
@@ -16,9 +16,13 @@ var CartConfirm = FormView.extend({
     app.footer.show("PLACE ORDER", "CANCEL")
     window.location.hash = "#/cart/confirm"
     this.deferScrollToTop()
+
+    app.curtain.show("loading")
+    promise(sdk.cart.get_status).then( this.populate.bind(this) )
   },
 
   populate: function(){
+    app.curtain.hide("loading")
   },
 
   save: function(){
diff --git a/StoneIsland/www/js/lib/cart/CartPayment.js b/StoneIsland/www/js/lib/cart/CartPayment.js
index e65c7e8e..749594bc 100644
--- a/StoneIsland/www/js/lib/cart/CartPayment.js
+++ b/StoneIsland/www/js/lib/cart/CartPayment.js
@@ -134,8 +134,6 @@ var CartPayment = FormView.extend({
         "cvv": this.$("[name=CvvConfirm]"),
       }
       
-      console.log("got card on file")
-      
       app.curtain.show("loading")
       promise(sdk.cart.use_stored_credit_card, { data: card_on_file }).then(function(data){
         app.curtain.hide("loading")
@@ -159,7 +157,7 @@ var CartPayment = FormView.extend({
       "HolderZip": address_data.ZipCode,
       "HolderISOCountry": CANADIAN_LOOKUP[ address_data.Province ] ? "CA" : "US",
       "HolderEmail": auth.user.Email,
-      "CardNumber": "",
+      "CardNumber": cc_data['Number'],
       "Type": cc_data.Type,
       "ExpirationMonth": cc_data.ExpirationMonth,
       "ExpirationYear": cc_data.ExpirationYear,
diff --git a/StoneIsland/www/js/lib/cart/CartShipping.js b/StoneIsland/www/js/lib/cart/CartShipping.js
index ec9394da..dfc5cb3a 100644
--- a/StoneIsland/www/js/lib/cart/CartShipping.js
+++ b/StoneIsland/www/js/lib/cart/CartShipping.js
@@ -54,6 +54,21 @@ var CartShipping = FormView.extend({
     }.bind(this))
   },
   
+  load_form: function(cart_data){
+    var data = cart_data.Cart.Receiver
+    var addy = data.StreetWithNumber.split("\n")
+    data.Address1 = addy[0] || ""
+    data.Address2 = addy[1] || ""
+    data.ZipCode = data.PostalCode
+    data.Province = data.Region
+    this.load_data(data)
+    
+    if (cart_data.DeliveryMethod.Selected && cart_data.DeliveryMethod.Type) {
+      $("#standard-shipping").prop("checked", cart_data.DeliveryMethod.Type == 1)
+      $("#express-shipping").prop("checked", cart_data.DeliveryMethod.Type == 2)
+    }
+  },
+  
   toggle_dropdown: function(state){
     if (! app.account.addresses.length) {
       state = false
diff --git a/StoneIsland/www/js/lib/cart/CartSummary.js b/StoneIsland/www/js/lib/cart/CartSummary.js
index cfd34bd7..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"