addresses adding properly

1 files changed, 18 insertions, 12 deletions

diff --git a/StoneIsland/www/js/lib/account/AccountView.js b/StoneIsland/www/js/lib/account/AccountView.js
index e1d7ca71..ce976094 100644
--- a/StoneIsland/www/js/lib/account/AccountView.js
+++ b/StoneIsland/www/js/lib/account/AccountView.js
@@ -16,29 +16,35 @@ var AccountView = View.extend({
     }
   },
   
-  populateAddresses: function(data){
-    console.log("populate addresses:", data)
+  listAddresses: function(cb){
+    sdk.address.list({
+      success: function(data){
+        this.populateAddresses(data, cb)
+      }.bind(this)
+    })
+  },
+  
+  populateAddresses: function(data, cb){
+    console.log("populate addresses:", data.AddressBook.addressBookItem)
     if (! data.AddressBook) {
       console.log("no addresses")
       return
     }
-    // console.log(data.AddressBook)
     data.AddressBook.addressBookItem.forEach(function(item){
-      if (item.isDefault) {
-        // populate app.shipping.address
-        app.shipping.address.populate(item)
+      if (item.IsDefault) {
+        console.log("SHIPPING ADDRESS", item)
+        app.shipping.populate(item)
       }
-      else if (item.isBillingDefault) {
-        // populate app.billing.address
-        app.payment.address.populate(item)
+      if (item.IsBillingDefault) {
+        console.log("BILLING ADDRESS")
+        app.payment.populate(item)
       }
     })
+    cb && cb()
   },
 
   logged_in: function(cb){
-    sdk.address.list({
-      success: this.populateAddresses.bind(this)
-    })
+    this.listAddresses()
     $("#nav .login").hide()
     $("#nav .account, #nav .logout").show()
     if (! auth.deferred_product && app.last_view) {