changed the country and state selectors to angular on enterprises admin (new and edit screens) so that states are dynamically updated when country is changed

app/assets/javascripts/admin/enterprises/controllers/country_controller.js.coffee

@@ -0,0 +1,25 @@
+angular.module("admin.enterprises").controller 'countryCtrl', ($scope, availableCountries) ->
+
+  $scope.countries = availableCountries
+
+  $scope.countriesById = $scope.countries.reduce (obj, country) ->
+    obj[country.id] = country
+    obj
+  , {}
+
+  $scope.countryOnChange = (stateSelectElemId) ->
+    $scope.clearState() unless $scope.addressStateMatchesCountry()
+    $scope.refreshStateSelector(stateSelectElemId)
+
+  $scope.clearState = ->
+    $scope.enterprise_address_attributes_state = {}
+
+  $scope.addressStateMatchesCountry = ->
+    $scope.countriesById[$scope.enterprise_address_attributes_country.id].states.some (state) -> state.id == $scope.enterprise_address_attributes_state?.id
+
+  $scope.refreshStateSelector = (stateSelectElemId) ->
+  	# workaround select2 (using jQuery and setTimeout) to force a refresh of the selected value
+    setTimeout ->
+      selectedState = jQuery('#' + stateSelectElemId)
+      jQuery('#' + stateSelectElemId).select2("val", selectedState)
+    , 500

app/serializers/api/admin/enterprise_serializer.rb

@@ -5,6 +5,7 @@ class Api::Admin::EnterpriseSerializer < ActiveModel::Serializer
   attributes :preferred_product_selection_from_inventory_only
   attributes :owner, :contact, :users, :tag_groups, :default_tag_group
   attributes :require_login, :allow_guest_orders, :allow_order_changes
+  attributes :address
 
   has_one :owner, serializer: Api::Admin::UserSerializer
   has_many :users, serializer: Api::Admin::UserSerializer

app/views/admin/enterprises/_form_data.html.haml

@@ -3,3 +3,4 @@
 = admin_inject_payment_methods
 = admin_inject_shipping_methods
 = admin_inject_enterprise_permissions
+= admin_inject_available_countries(module: 'admin.enterprises')

app/views/admin/enterprises/_new_form.html.haml

@@ -87,15 +87,17 @@
       = af.text_field :city, { placeholder: t(:city_placeholder)}
     .five.columns.omega
       = af.text_field :zipcode, { placeholder: t(:postcode_placeholder)}
-  .row
-    .three.columns.alpha
-      = af.label :state_id, t(:state)
-      \/
-      = af.label :country_id, t(:country)
-    .four.columns
-      = af.collection_select :state_id, af.object.country.states, :id, :name, {}, :class => "select2 fullwidth"
-    .five.columns.omega
-      = af.collection_select :country_id, available_countries, :id, :name, {}, :class => "select2 fullwidth"
+  %div{ "ng-controller" => "countryCtrl" }
+    .row
+      .three.columns.alpha
+        = af.label :state_id, t(:state)
+        \/
+        = af.label :country_id, t(:country)
+      .four.columns
+        = af.collection_select :state_id, {}, :id, :name, {}, :class => "select2 fullwidth", "ng-options" => "s as s.name for s in countriesById[enterprise_address_attributes_country.id].states track by s.id", "ng-model" => "enterprise_address_attributes_state"
+      .five.columns.omega
+        = af.collection_select :country_id, {}, :id, :name, {}, :class => "select2 fullwidth", "ng-options" => "c as c.name for c in countries track by c.id", "ng-model" => "enterprise_address_attributes_country", "ng-init" => "enterprise_address_attributes_country = { id: \"#{Spree::Config[:default_country_id]}\" }", "ng-change" => "countryOnChange('s2id_enterprise_address_attributes_state_id')"
+
 .row
   .twelve.columns.alpha
      

app/views/admin/enterprises/form/_address.html.haml

@@ -31,7 +31,8 @@
     \/
     = af.label :country_id, t(:country)
     %span.required *
-  .four.columns
-    = af.collection_select :state_id, af.object.country.states, :id, :name, {}, :class => "select2 fullwidth"
-  .four.columns.omega
-    = af.collection_select :country_id, available_countries, :id, :name, {}, :class => "select2 fullwidth"
+  %div{ "ng-controller" => "countryCtrl" }
+    .four.columns
+      = af.collection_select :state_id, {}, :id, :name, {}, :class => "select2 fullwidth", "ng-init" => "enterprise_address_attributes_state.id = Enterprise.address.address.state_id", "ng-options" => "s as s.name for s in countriesById[enterprise_address_attributes_country.id || Enterprise.address.address.country_id].states track by s.id", "ng-model" => "enterprise_address_attributes_state"
+    .four.columns.omega
+      = af.collection_select :country_id, {}, :id, :name, {}, :class => "select2 fullwidth", "ng-init" => "enterprise_address_attributes_country.id = Enterprise.address.address.country_id", "ng-options" => "c as c.name for c in countries track by c.id", "ng-model" => "enterprise_address_attributes_country", "ng-change" => "countryOnChange('s2id_enterprise_address_attributes_state_id')"

app/views/admin/enterprises/new.html.haml

@@ -6,6 +6,10 @@
 - content_for :page_actions do
   %li= button_link_to t('.back_link'), main_app.admin_enterprises_path, icon: 'icon-arrow-left'
 
+- content_for :app_wrapper_attrs do
+  = "ng-app='admin.enterprises'"
+
+= admin_inject_available_countries(module: 'admin.enterprises')
 
 -# Form
 

spec/features/admin/enterprises_spec.rb

@@ -53,7 +53,7 @@ feature %q{
     fill_in 'enterprise_address_attributes_address1', :with => '35 Ballantyne St'
     fill_in 'enterprise_address_attributes_city', :with => 'Thornbury'
     fill_in 'enterprise_address_attributes_zipcode', :with => '3072'
-    select2_search 'Australia', :from => 'Country'
+    # default country (Australia in this test) should be selected by default
     select2_search 'Victoria', :from => 'State'
 
     click_button 'Create'
@@ -342,6 +342,8 @@ feature %q{
         fill_in 'enterprise_address_attributes_address1', with: 'z'
         fill_in 'enterprise_address_attributes_city', with: 'z'
         fill_in 'enterprise_address_attributes_zipcode', with: 'z'
+        select2_select 'Australia', from: 'enterprise_address_attributes_country_id'
+        select2_select 'Victoria', from: 'enterprise_address_attributes_state_id'
       end
 
       scenario "without violating rules" do