ui changes

1 files changed, 76 insertions, 17 deletions

diff --git a/StoneIsland/platforms/ios/www/js/lib/account/AccountView.js b/StoneIsland/platforms/ios/www/js/lib/account/AccountView.js
index cbd9a9c6..1c5c9f16 100644
--- a/StoneIsland/platforms/ios/www/js/lib/account/AccountView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/account/AccountView.js
@@ -16,43 +16,102 @@ var AccountView = View.extend({
     }
   },
   
-  populateAddresses: function(data){
-    console.log("populate addresses:", data)
+  addresses: [],
+  addressLookup: {},
+  ccs: [],
+  ccLookup: {},
+  
+  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")
+      cb && cb()
       return
     }
-    // console.log(data.AddressBook)
+    
+    this.addresses = data.AddressBook.addressBookItem
+    this.addressLookup = {}
     data.AddressBook.addressBookItem.forEach(function(item){
-      if (item.isDefault) {
-        // populate app.shipping.address
+      this.addressLookup[ item.Id ] = item
+      if (item.IsDefault) {
+        console.log("SHIPPING ADDRESS", item)
+        app.shipping.populate(item)
       }
-      else if (item.isBillingDefault) {
-        // populate app.billing.address
+      if (item.IsBillingDefault) {
+        console.log("BILLING ADDRESS")
+        app.payment.populate(item)
       }
+    }.bind(this))
+    
+    app.cart.shipping.populate()
+    
+    cb && cb()
+  },
+  
+  listCreditCards: function(cb){
+    sdk.payment.list_credit_cards({
+      success: function(data){
+        this.populateCreditCards(data, cb)
+      }.bind(this)
     })
   },
-
+  
+  populateCreditCards: function(data, cb){
+    console.log("populate ccs:", data.CreditCards)
+    this.ccs = data.CreditCards
+    this.ccLookup = {}
+    if (! data.CreditCards || ! data.CreditCards.length) {
+    }
+    else {
+      data.CreditCards.forEach(function(cc){
+        this.ccLookup[cc.Id] = cc
+      }.bind(this))
+      app.payment.populate( data.CreditCards[0] )
+      app.cart.payment.populate()
+    }
+    cb && cb()
+  },
+  
   logged_in: function(cb){
-    sdk.address.list({
-      success: this.populateAddresses.bind(this)
-    })
+    this.listAddresses()
+    this.listCreditCards()
     $("#nav .login").hide()
     $("#nav .account, #nav .logout").show()
-    if (app.last_view && app.last_view != app.login && app.last_view != app.signin && app.last_view != app.logout) {
-      app.view && app.view.hide && app.view.hide()
-      app.view = app.last_view
-      app.view.show()
+    if (! auth.deferred_product && app.last_view) {
+      if (app.last_view != app.login && app.last_view != app.signin && app.last_view != app.logout) {
+        app.view && app.view.hide && app.view.hide()
+        app.view = app.last_view
+        app.view.show()
+      }
     }
     else {
       cb && cb()
     }
     if ( ! auth.has_cart() ) {
-      auth.create_cart(auth.add_deferred_product_to_cart)
+      app.curtain.show("loading")
+      auth.create_cart(function(){
+        auth.add_deferred_product_to_cart(function(){
+          app.router.go("cart")
+          setTimeout(function(){
+            app.curtain.hide("loading")
+          }, 500)
+        })
+      })
     }
     else {
       if (auth.deferred_product) {
-        auth.add_deferred_product_to_cart()
+        auth.add_deferred_product_to_cart(function(){
+          app.router.go("cart")
+        })
       }
       else {
         app.cart.load()