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.

Drop `currency_select` gem dependency (#13146)

Damian Legawiec9a2f6dc9a4df
diff --git a/admin/app/helpers/spree/admin/base_helper.rb b/admin/app/helpers/spree/admin/base_helper.rb
index 30ab479f1a..4d4fec33aa 100644
--- a/admin/app/helpers/spree/admin/base_helper.rb
+++ b/admin/app/helpers/spree/admin/base_helper.rb
@@ -225,7 +225,7 @@ module Spree
case key
when :currency
content_tag(:div, form.label("preferred_#{key}", Spree.t(key, scope: i18n_scope)) +
- form.currency_select("preferred_#{key}", current_store.supported_currencies.split(','), {}, { class: 'custom-select', disabled: current_store.supported_currencies.split(',').count == 1 }),
+ form.select("preferred_#{key}", current_store.supported_currencies.split(','), {}, { data: { controller: 'autocomplete-select' }, disabled: current_store.supported_currencies.split(',').count == 1 }),
class: 'form-group', id: [object.class.to_s.parameterize, 'preference', key].join('-'))
else
if object.preference_type(key).to_sym == :boolean
diff --git a/admin/app/views/spree/admin/stores/new.html.erb b/admin/app/views/spree/admin/stores/new.html.erb
index 3fac488b02..d5f3a9a6a7 100644
--- a/admin/app/views/spree/admin/stores/new.html.erb
+++ b/admin/app/views/spree/admin/stores/new.html.erb
@@ -32,7 +32,7 @@
<div class="form-group">
<%= f.label :default_currency, Spree.t(:currency) %>
- <%= f.currency_select :default_currency, preferred_currencies, {}, { data: { controller: 'autocomplete-select', enable_button_target: 'input', store_form_target: 'currency' } } %>
+ <%= f.select :default_currency, currency_options, {}, { data: { controller: 'autocomplete-select', enable_button_target: 'input', store_form_target: 'currency' } } %>
</div>
<% if available_stores.any? %>
diff --git a/admin/lib/spree/admin.rb b/admin/lib/spree/admin.rb
index 8514d35cd0..483d9ad7f1 100644
--- a/admin/lib/spree/admin.rb
+++ b/admin/lib/spree/admin.rb
@@ -6,7 +6,6 @@ require 'sprockets/railtie'
require 'active_link_to'
require 'breadcrumbs_on_rails'
require 'chartkick'
-require 'currency_select'
require 'groupdate'
require 'hightop'
require 'importmap-rails'
diff --git a/admin/spree_admin.gemspec b/admin/spree_admin.gemspec
index 61d0fa3c6c..6e28518129 100644
--- a/admin/spree_admin.gemspec
+++ b/admin/spree_admin.gemspec
@@ -33,7 +33,6 @@ Gem::Specification.new do |s|
s.add_dependency 'bootstrap', '~> 4.6', '>= 4.6.2.1'
s.add_dependency 'breadcrumbs_on_rails', '~> 4.1'
s.add_dependency 'chartkick', '~> 5.0'
- s.add_dependency 'currency_select'
s.add_dependency 'dartsass-rails', '~> 0.5'
s.add_dependency 'groupdate', '~> 6.2'
s.add_dependency 'hightop', '~> 0.3'