From e91c313f1e0e39e0ca302c3bab89e4cca8461e51 Mon Sep 17 00:00:00 2001 From: Bing Xie Date: Thu, 8 Sep 2016 15:40:50 +1000 Subject: [PATCH] Fix state_id and country_id type bug --- .../darkswarm/services/current_order.js.coffee | 11 ++++++++++- app/controllers/checkout_controller.rb | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/darkswarm/services/current_order.js.coffee b/app/assets/javascripts/darkswarm/services/current_order.js.coffee index 6570ddcd06..24447a6ebe 100644 --- a/app/assets/javascripts/darkswarm/services/current_order.js.coffee +++ b/app/assets/javascripts/darkswarm/services/current_order.js.coffee @@ -1,4 +1,13 @@ Darkswarm.factory 'CurrentOrder', (currentOrder) -> # Populate Currentorder.order from json in page. This is probably redundant now. new class CurrentOrder - order: currentOrder + constructor: -> + if currentOrder.bill_address + currentOrder.bill_address.state_id = currentOrder.bill_address.state_id + '' + currentOrder.bill_address.country_id = currentOrder.bill_address.country_id + '' + + if currentOrder.ship_address + currentOrder.ship_address.state_id = currentOrder.ship_address.state_id + '' + currentOrder.ship_address.country_id = currentOrder.ship_address.country_id + '' + + @order = currentOrder diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb index 578d0e5596..097f037561 100644 --- a/app/controllers/checkout_controller.rb +++ b/app/controllers/checkout_controller.rb @@ -156,7 +156,7 @@ class CheckoutController < Spree::CheckoutController last_used_bill_address = lua.last_used_bill_address.andand.clone last_used_ship_address = lua.last_used_ship_address.andand.clone - preferred_bill_address, preferred_ship_address = spree_current_user.bill_address, spree_current_user.ship_address if spree_current_user.respond_to?(:bill_address) && spree_current_user.respond_to?(:ship_address) + preferred_bill_address, preferred_ship_address = spree_current_user.bill_address, spree_current_user.ship_address @order.bill_address ||= preferred_bill_address || last_used_bill_address || Spree::Address.default @order.ship_address ||= preferred_ship_address || last_used_ship_address || Spree::Address.default end