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.

Renamed CurrencyHelpers to Currency plus moved currency methods from Store to Currency

Damian Legawiecafb11d800fb6
diff --git a/api/app/controllers/spree/api/base_controller.rb b/api/app/controllers/spree/api/base_controller.rb
index a934aad56c..5b355184c7 100644
--- a/api/app/controllers/spree/api/base_controller.rb
+++ b/api/app/controllers/spree/api/base_controller.rb
@@ -6,7 +6,7 @@ module Spree
include Spree::Api::ControllerSetup
include Spree::Core::ControllerHelpers::Store
include Spree::Core::ControllerHelpers::StrongParameters
- include Spree::Core::ControllerHelpers::CurrencyHelpers
+ include Spree::Core::ControllerHelpers::Currency
attr_accessor :current_api_user
diff --git a/api/app/controllers/spree/api/v2/base_controller.rb b/api/app/controllers/spree/api/v2/base_controller.rb
index a2a43080e9..8f8c86fc17 100644
--- a/api/app/controllers/spree/api/v2/base_controller.rb
+++ b/api/app/controllers/spree/api/v2/base_controller.rb
@@ -5,7 +5,7 @@ module Spree
include CanCan::ControllerAdditions
include Spree::Core::ControllerHelpers::StrongParameters
include Spree::Core::ControllerHelpers::Store
- include Spree::Core::ControllerHelpers::CurrencyHelpers
+ include Spree::Core::ControllerHelpers::Currency
rescue_from ActiveRecord::RecordNotFound, with: :record_not_found
rescue_from CanCan::AccessDenied, with: :access_denied
rescue_from Spree::Core::GatewayError, with: :gateway_error
diff --git a/core/app/controllers/spree/base_controller.rb b/core/app/controllers/spree/base_controller.rb
index 3daf2bbb9f..f79302d288 100644
--- a/core/app/controllers/spree/base_controller.rb
+++ b/core/app/controllers/spree/base_controller.rb
@@ -7,7 +7,7 @@ class Spree::BaseController < ApplicationController
include Spree::Core::ControllerHelpers::Search
include Spree::Core::ControllerHelpers::Store
include Spree::Core::ControllerHelpers::StrongParameters
- include Spree::Core::ControllerHelpers::CurrencyHelpers
+ include Spree::Core::ControllerHelpers::Currency
respond_to :html
end
diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
index 7d15275676..bae50b6306 100644
--- a/core/lib/spree/core.rb
+++ b/core/lib/spree/core.rb
@@ -105,4 +105,4 @@ require 'spree/core/controller_helpers/order'
require 'spree/core/controller_helpers/search'
require 'spree/core/controller_helpers/store'
require 'spree/core/controller_helpers/strong_parameters'
-require 'spree/core/controller_helpers/currency_helpers'
+require 'spree/core/controller_helpers/currency'
diff --git a/core/lib/spree/core/controller_helpers/currency.rb b/core/lib/spree/core/controller_helpers/currency.rb
new file mode 100644
index 0000000000..fe9050946c
--- /dev/null
+++ b/core/lib/spree/core/controller_helpers/currency.rb
@@ -0,0 +1,43 @@
+module Spree
+ module Core
+ module ControllerHelpers
+ module Currency
+ extend ActiveSupport::Concern
+
+ included do
+ helper_method :supported_currencies
+ helper_method :supported_currencies_for_all_stores
+ helper_method :current_currency
+ helper_method :supported_currency?
+ end
+
+ def current_currency
+ if defined?(session) && session.key?(:currency) && supported_currency?(session[:currency])
+ session[:currency]
+ elsif params[:currency].present? && supported_currency?(params[:currency])
+ params[:currency]
+ else
+ current_store.default_currency
+ end
+ end
+
+ def supported_currencies
+ current_store.supported_currencies_list
+ end
+
+ def supported_currencies_for_all_stores
+ @supported_currencies_for_all_stores ||= begin
+ (
+ Spree::Store.pluck(:supported_currencies).map { |c| c&.split(',') }.flatten + Spree::Store.pluck(:default_currency)
+ ).
+ compact.uniq.map { |code| ::Money::Currency.find(code.strip) }
+ end
+ end
+
+ def supported_currency?(currency_iso_code)
+ supported_currencies.map(&:iso_code).include?(currency_iso_code)
+ end
+ end
+ end
+ end
+end
diff --git a/core/lib/spree/core/controller_helpers/currency_helpers.rb b/core/lib/spree/core/controller_helpers/currency_helpers.rb
deleted file mode 100644
index 1e8fd309db..0000000000
--- a/core/lib/spree/core/controller_helpers/currency_helpers.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-module Spree
- module Core
- module ControllerHelpers
- module CurrencyHelpers
- def self.included(receiver)
- receiver.send :helper_method, :supported_currencies
- receiver.send :helper_method, :supported_currencies_for_all_stores
- end
-
- def supported_currencies
- current_store.supported_currencies_list
- end
-
- def supported_currencies_for_all_stores
- @supported_currencies_for_all_stores ||= begin
- (
- Spree::Store.pluck(:supported_currencies).map { |c| c&.split(',') }.flatten + Spree::Store.pluck(:default_currency)
- ).
- compact.uniq.map { |code| ::Money::Currency.find(code.strip) }
- end
- end
- end
- end
- end
-end
diff --git a/core/lib/spree/core/controller_helpers/store.rb b/core/lib/spree/core/controller_helpers/store.rb
index 2e47644cc4..19137de9f8 100644
--- a/core/lib/spree/core/controller_helpers/store.rb
+++ b/core/lib/spree/core/controller_helpers/store.rb
@@ -5,26 +5,10 @@ module Spree
extend ActiveSupport::Concern
included do
- helper_method :supported_currencies
- helper_method :current_currency
helper_method :current_store
helper_method :current_price_options
end
- def current_currency
- if defined?(session) && session.key?(:currency) && supported_currencies.map(&:iso_code).include?(session[:currency])
- session[:currency]
- elsif params[:currency].present? && supported_currencies.map(&:iso_code).include?(params[:currency])
- params[:currency]
- else
- current_store.default_currency
- end
- end
-
- def supported_currencies
- current_store.supported_currencies_list
- end
-
def current_store
@current_store ||= Spree::Store.current(request.env['SERVER_NAME'])
end
diff --git a/core/spec/lib/spree/core/controller_helpers/currency_spec.rb b/core/spec/lib/spree/core/controller_helpers/currency_spec.rb
new file mode 100644
index 0000000000..6b8da11529
--- /dev/null
+++ b/core/spec/lib/spree/core/controller_helpers/currency_spec.rb
@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+class FakesController < ApplicationController
+ include Spree::Core::ControllerHelpers::Auth
+ include Spree::Core::ControllerHelpers::Order
+ include Spree::Core::ControllerHelpers::Store
+ include Spree::Core::ControllerHelpers::Currency
+end
+
+describe Spree::Core::ControllerHelpers::Currency, type: :controller do
+ controller(FakesController) {}
+
+ describe '#current_currency' do
+ let!(:store) { create :store, default: true, default_currency: 'GBP' }
+
+ it 'returns current store default currency' do
+ expect(controller.current_currency).to eq('GBP')
+ end
+ end
+
+ describe '#supported_currencies' do
+ let(:currency) { 'EUR' }
+ let!(:store) { create :store, default: true, supported_currencies: currency }
+
+ it 'returns supported currencies' do
+ expect(controller.supported_currencies).to include(::Money::Currency.find(currency))
+ end
+ end
+end
diff --git a/core/spec/lib/spree/core/controller_helpers/store_spec.rb b/core/spec/lib/spree/core/controller_helpers/store_spec.rb
index 3e467b466c..23b968a21f 100644
--- a/core/spec/lib/spree/core/controller_helpers/store_spec.rb
+++ b/core/spec/lib/spree/core/controller_helpers/store_spec.rb
@@ -4,6 +4,7 @@ class FakesController < ApplicationController
include Spree::Core::ControllerHelpers::Auth
include Spree::Core::ControllerHelpers::Order
include Spree::Core::ControllerHelpers::Store
+ include Spree::Core::ControllerHelpers::Currency
before_action :set_current_order
end
@@ -19,23 +20,6 @@ describe Spree::Core::ControllerHelpers::Store, type: :controller do
end
end
- describe '#current_currency' do
- let!(:store) { create :store, default: true, default_currency: 'GBP' }
-
- it 'returns current store default currency' do
- expect(controller.current_currency).to eq('GBP')
- end
- end
-
- describe '#supported_currencies' do
- let(:currency) { 'EUR' }
- let!(:store) { create :store, default: true, supported_currencies: currency }
-
- it 'returns supported currencies' do
- expect(controller.supported_currencies).to include(::Money::Currency.find(currency))
- end
- end
-
describe '#current_price_options' do
subject(:current_price_options) { controller.current_price_options }