From 80d755da0d18f0f4469f8fe0eec0d351911bdb6c Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Fri, 16 Sep 2016 10:55:11 +1000
Subject: [PATCH] Convert state_id and country_id in serializer

---
 .../javascripts/darkswarm/services/cart.js.coffee  |  4 ++--
 .../darkswarm/services/checkout.js.coffee          |  2 +-
 .../darkswarm/services/current_order.js.coffee     | 14 +-------------
 app/serializers/api/address_serializer.rb          |  8 ++++++++
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/services/cart.js.coffee b/app/assets/javascripts/darkswarm/services/cart.js.coffee
index 59955ba8a3..456d567bb7 100644
--- a/app/assets/javascripts/darkswarm/services/cart.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/cart.js.coffee
@@ -4,8 +4,8 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $roo
     dirty: false
     update_running: false
     update_enqueued: false
-    order: CurrentOrder.getOrder()
-    line_items: CurrentOrder.getOrder()?.line_items || []
+    order: CurrentOrder.order
+    line_items: CurrentOrder.order?.line_items || []
 
     constructor: ->
       for line_item in @line_items
diff --git a/app/assets/javascripts/darkswarm/services/checkout.js.coffee b/app/assets/javascripts/darkswarm/services/checkout.js.coffee
index bb0880d05b..82aaa19d62 100644
--- a/app/assets/javascripts/darkswarm/services/checkout.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/checkout.js.coffee
@@ -2,7 +2,7 @@ Darkswarm.factory 'Checkout', (CurrentOrder, ShippingMethods, PaymentMethods, $h
   new class Checkout
     errors: {}
     secrets: {}
-    order: CurrentOrder.getOrder()
+    order: CurrentOrder.order
     ship_address_same_as_billing: 'YES'
     default_bill_address: 'NO'
     default_ship_address: 'NO'
diff --git a/app/assets/javascripts/darkswarm/services/current_order.js.coffee b/app/assets/javascripts/darkswarm/services/current_order.js.coffee
index d4ac2be0e7..6570ddcd06 100644
--- a/app/assets/javascripts/darkswarm/services/current_order.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/current_order.js.coffee
@@ -1,16 +1,4 @@
 Darkswarm.factory 'CurrentOrder', (currentOrder) ->
   # Populate Currentorder.order from json in page. This is probably redundant now.
   new class CurrentOrder
-    # order: currentOrder
-
-    getOrder: ->
-      if currentOrder && 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 && currentOrder.ship_address
-        currentOrder.ship_address.state_id = currentOrder.ship_address.state_id + ''
-        currentOrder.ship_address.country_id = currentOrder.ship_address.country_id + ''
-
-      currentOrder
-
+    order: currentOrder
diff --git a/app/serializers/api/address_serializer.rb b/app/serializers/api/address_serializer.rb
index 66e4267e1f..3ad93881e0 100644
--- a/app/serializers/api/address_serializer.rb
+++ b/app/serializers/api/address_serializer.rb
@@ -9,4 +9,12 @@ class Api::AddressSerializer < ActiveModel::Serializer
   def state_name
     object.state.andand.abbr
   end
+
+  def state_id
+    object.state_id.andand.to_s
+  end
+
+  def country_id
+    object.country_id.andand.to_s
+  end
 end