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.

Fix displaying currencies on the store credit form (#12429)

Łukasz Adamczyk83382b67e14f
diff --git a/admin/app/controllers/spree/admin/base_controller.rb b/admin/app/controllers/spree/admin/base_controller.rb
index 62fe0a17e8..7a6774f2b9 100644
--- a/admin/app/controllers/spree/admin/base_controller.rb
+++ b/admin/app/controllers/spree/admin/base_controller.rb
@@ -6,6 +6,7 @@ module Spree
include Spree::Core::ControllerHelpers::StrongParameters
include Spree::Core::ControllerHelpers::Locale
include Spree::Core::ControllerHelpers::Currency
+ include Spree::Core::ControllerHelpers::Turbo
respond_to :html
diff --git a/admin/app/views/spree/admin/store_credits/_form.html.erb b/admin/app/views/spree/admin/store_credits/_form.html.erb
index 76cade39b3..616451ef91 100644
--- a/admin/app/views/spree/admin/store_credits/_form.html.erb
+++ b/admin/app/views/spree/admin/store_credits/_form.html.erb
@@ -1,5 +1,5 @@
<div data-hook='admin_store_credit_form_fields'>
- <div class="row mb-2">
+ <div class="row mb-3">
<div class="col-6">
<div class="form-group">
<%= f.label :amount, raw(Spree.t(:amount) + required_span_tag) %>
@@ -11,7 +11,7 @@
<div class="col-6">
<div class="form-group">
<%= f.label :currency, raw(Spree.t(:currency) + required_span_tag), class: 'form-label' %>
- <%= f.currency_select :currency, preferred_currencies, {}, { data: { controller: 'autocomplete-select', enable_button_target: 'input', store_form_target: 'currency' } } %>
+ <%= f.select :currency, preferred_currencies_select_options, {}, { data: { controller: 'autocomplete-select', enable_button_target: 'input', store_form_target: 'currency' } } %>
</div>
</div>
</div>
diff --git a/core/app/controllers/spree/base_controller.rb b/core/app/controllers/spree/base_controller.rb
index 265ac5f8ad..d32f857627 100644
--- a/core/app/controllers/spree/base_controller.rb
+++ b/core/app/controllers/spree/base_controller.rb
@@ -9,4 +9,5 @@ class Spree::BaseController < ApplicationController
include Spree::Core::ControllerHelpers::StrongParameters
include Spree::Core::ControllerHelpers::Locale
include Spree::Core::ControllerHelpers::Currency
+ include Spree::Core::ControllerHelpers::Turbo
end
diff --git a/core/app/helpers/spree/currency_helper.rb b/core/app/helpers/spree/currency_helper.rb
index 11365cc7ae..4459ef5dc1 100644
--- a/core/app/helpers/spree/currency_helper.rb
+++ b/core/app/helpers/spree/currency_helper.rb
@@ -35,6 +35,10 @@ module Spree
@preferred_currencies ||= current_store.supported_currencies_list
end
+ def preferred_currencies_select_options
+ preferred_currencies.map { |currency| ["#{currency.name} - #{currency.iso_code}", currency] }
+ end
+
def currency_money(currency = current_currency)
::Money::Currency.find(currency)
end
diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
index cebca6b933..1a71e0b200 100644
--- a/core/lib/spree/core.rb
+++ b/core/lib/spree/core.rb
@@ -188,6 +188,7 @@ require 'spree/core/controller_helpers/store'
require 'spree/core/controller_helpers/strong_parameters'
require 'spree/core/controller_helpers/locale'
require 'spree/core/controller_helpers/currency'
+require 'spree/core/controller_helpers/turbo'
require 'spree/core/preferences/store'
require 'spree/core/preferences/scoped_store'
diff --git a/core/lib/spree/core/controller_helpers/turbo.rb b/core/lib/spree/core/controller_helpers/turbo.rb
new file mode 100644
index 0000000000..e3b1a3aa90
--- /dev/null
+++ b/core/lib/spree/core/controller_helpers/turbo.rb
@@ -0,0 +1,19 @@
+module Spree
+ module Core
+ module ControllerHelpers
+ module Turbo
+ extend ActiveSupport::Concern
+
+ included do
+ if defined?(helper_method)
+ helper_method :turbo_frame_request?, :turbo_stream_request?
+ end
+ end
+
+ def turbo_stream_request?
+ request.format.turbo_stream?
+ end
+ end
+ end
+ end
+end
diff --git a/storefront/app/controllers/spree/store_controller.rb b/storefront/app/controllers/spree/store_controller.rb
index 760aca7947..353ce652aa 100644
--- a/storefront/app/controllers/spree/store_controller.rb
+++ b/storefront/app/controllers/spree/store_controller.rb
@@ -28,8 +28,6 @@ module Spree
:storefront_products_scope, :storefront_products,
:default_products_sort, :default_products_finder_params
- helper_method :turbo_frame_request?, :turbo_stream_request?
-
before_action :redirect_to_default_locale
before_action :render_404_if_store_not_exists
rescue_from ActionController::InvalidAuthenticityToken, with: :invalid_authenticity_token
@@ -85,10 +83,6 @@ module Spree
@products_filters_params ||= permitted_products_params[:filter]&.compact_blank || {}
end
- def turbo_stream_request?
- request.format.turbo_stream?
- end
-
protected
def choose_layout