Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Remove `country_select` dependency (#12584)

Damian Legawiec7fda3596723d
diff --git a/admin/app/views/spree/admin/promotion_rules/forms/_country.html.erb b/admin/app/views/spree/admin/promotion_rules/forms/_country.html.erb
index cb5d8ab378..411de7e6ad 100644
--- a/admin/app/views/spree/admin/promotion_rules/forms/_country.html.erb
+++ b/admin/app/views/spree/admin/promotion_rules/forms/_country.html.erb
@@ -1,8 +1,7 @@
<div class="form-group">
<%= f.label :preferred_country_iso, Spree.t(:country) %>
- <%= f.country_select(:preferred_country_iso,
- { selected: f.object.preferred_country_iso },
- { data: { controller: 'autocomplete-select' }
- }) %>
+ <%= f.select :preferred_country_iso,
+ available_countries_iso.map { |iso| [Spree.t(iso, scope: 'country_names', default: iso), iso] },
+ { selected: f.object.preferred_country_iso || current_store.default_country_iso },
+ { data: { controller: 'autocomplete-select' } } %>
</div>
-
diff --git a/admin/lib/spree/admin.rb b/admin/lib/spree/admin.rb
index 51ae985d52..0b246abc23 100644
--- a/admin/lib/spree/admin.rb
+++ b/admin/lib/spree/admin.rb
@@ -5,7 +5,6 @@ require 'sprockets/railtie'
require 'active_link_to'
require 'chartkick'
-require 'country_select'
require 'currency_select'
require 'groupdate'
require 'hightop'
diff --git a/admin/spree_admin.gemspec b/admin/spree_admin.gemspec
index b9957b49ab..f176c6b387 100644
--- a/admin/spree_admin.gemspec
+++ b/admin/spree_admin.gemspec
@@ -32,7 +32,6 @@ Gem::Specification.new do |s|
s.add_dependency 'active_link_to'
s.add_dependency 'bootstrap', '~> 4.6', '>= 4.6.2.1'
s.add_dependency 'chartkick', '~> 5.0'
- s.add_dependency 'country_select', '~> 8.0'
s.add_dependency 'currency_select'
s.add_dependency 'dartsass-rails', '~> 0.5'
s.add_dependency 'groupdate', '~> 6.2'