From ffac38d93442685d53025fbea6c6f85f44687ced Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 1 Sep 2020 16:06:49 +0100
Subject: [PATCH] Remove option to enter state_name for countries without
 states

Thisis not supported in OFN
---
 .../admin/spree/orders/address_states.js      | 29 +++++++------------
 .../customer_details/_address_form.html.haml  |  5 +---
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/app/assets/javascripts/admin/spree/orders/address_states.js b/app/assets/javascripts/admin/spree/orders/address_states.js
index 845c501f7f..ef1cf6b367 100644
--- a/app/assets/javascripts/admin/spree/orders/address_states.js
+++ b/app/assets/javascripts/admin/spree/orders/address_states.js
@@ -1,26 +1,17 @@
 var update_state = function(region) {
   var country        = $('span#' + region + 'country .select2').select2('val');
-
   var state_select   = $('span#' + region + 'state select.select2');
-  var state_input    = $('span#' + region + 'state input.state_name');
 
   $.get(Spree.routes.states_search + "?country_id=" + country, function(states) {
-    if (states.length > 0) {
-      state_select.html('');
-      var states_with_blank = [{name: '', id: ''}].concat(states);
-      $.each(states_with_blank, function(pos,state) {
-        var opt = $(document.createElement('option'))
-                  .attr('value', state.id)
-                  .html(state.name);
-        state_select.append(opt);
-      });
-      state_select.prop("disabled", false).show();
-      state_select.select2();
-      state_input.hide().prop("disabled", true);
-
-    } else {
-      state_input.prop("disabled", false).show();
-      state_select.select2('destroy').hide();
-    }
+    state_select.html('');
+    var states_with_blank = [{name: '', id: ''}].concat(states);
+    $.each(states_with_blank, function(pos,state) {
+      var opt = $(document.createElement('option'))
+                .attr('value', state.id)
+                .html(state.name);
+      state_select.append(opt);
+    });
+    state_select.prop("disabled", false).show();
+    state_select.select2();
   })
 };
diff --git a/app/views/spree/admin/orders/customer_details/_address_form.html.haml b/app/views/spree/admin/orders/customer_details/_address_form.html.haml
index d804946766..18bd0970b6 100644
--- a/app/views/spree/admin/orders/customer_details/_address_form.html.haml
+++ b/app/views/spree/admin/orders/customer_details/_address_form.html.haml
@@ -39,10 +39,7 @@
   %div{class: "field"}
     = f.label :state_id, Spree.t(:state) + ':'
     %span{id: "#{s_or_b}state"}
-      = f.text_field :state_name,                                                      |
-         style: "display: #{f.object.country.states.empty? ? 'block' : 'none' };",  |
-        disabled: !f.object.country.states.empty?, class: 'fullwidth state_name' |
-      = f.collection_select :state_id, f.object.country.states.sort, :id, :name, {include_blank: true}, {class: 'select2 fullwidth', style: "display: #{f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty?}
+      = f.collection_select :state_id, f.object.country.states.sort, :id, :name, {include_blank: true}, {class: 'select2 fullwidth', disabled: f.object.country.states.empty?}
   %div{class: "field"}
     = f.label :phone, Spree.t(:phone) + ':'
     = f.phone_field :phone, class: 'fullwidth'