diff options
| author | Rene Ae <aehtyb@gmail.com> | 2015-11-30 15:24:27 -0600 |
|---|---|---|
| committer | Rene Ae <aehtyb@gmail.com> | 2015-11-30 15:24:27 -0600 |
| commit | 9d0e54228c79d151c30c527ea83efa7479793686 (patch) | |
| tree | 3baf83427cd61cb1994e8551eefba5cd21d1a65b /StoneIsland/www/js/lib/cart/CartShipping.js | |
| parent | b208cb0283c23d68e8013c0dd5ddd4e5e6df8950 (diff) | |
| parent | d26e72aea3b3127c95c5ba7069c95f73cf52a2fd (diff) | |
Merge branch 'master' of https://github.com/okfocus/stone-island
Diffstat (limited to 'StoneIsland/www/js/lib/cart/CartShipping.js')
| -rw-r--r-- | StoneIsland/www/js/lib/cart/CartShipping.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/StoneIsland/www/js/lib/cart/CartShipping.js b/StoneIsland/www/js/lib/cart/CartShipping.js index e52eec4c..1a9653e1 100644 --- a/StoneIsland/www/js/lib/cart/CartShipping.js +++ b/StoneIsland/www/js/lib/cart/CartShipping.js @@ -58,7 +58,7 @@ var CartShipping = FormView.extend({ state = false } this.list_mode = typeof state == "boolean" ? state : ! this.list_mode - this.$dropdown_wrapper.toggle( ! app.account.addresses.length ) + this.$dropdown_wrapper.toggle( !! app.account.addresses.length ) this.address.disabled = this.list_mode this.$address_form.toggle(! this.list_mode) this.$address_list.toggle(this.list_mode) @@ -93,16 +93,17 @@ var CartShipping = FormView.extend({ shipping_info.Name = address_data.Name shipping_info.Surname = address_data.Surname - shipping_info.Email = address_data.Name + shipping_info.Email = auth.user.Email shipping_info.Phone = address_data.Phone shipping_info.Mobile = address_data.Phone shipping_info.StreetWithNumber = address_data.Address shipping_info.PostalCode = address_data.ZipCode shipping_info.City = address_data.City + shipping_info.Province = address_data.Province shipping_info.Region = address_data.Province shipping_info.CountryCode = "US" - return address_data + return shipping_info }, success: function(){ |