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.

In Rails 7 `helper_method` is not available in API controllers

Damian Legawiec35fb14db468c
diff --git a/core/lib/spree/core/controller_helpers/auth.rb b/core/lib/spree/core/controller_helpers/auth.rb
index 05f44f26ad..19b41847a7 100644
--- a/core/lib/spree/core/controller_helpers/auth.rb
+++ b/core/lib/spree/core/controller_helpers/auth.rb
@@ -7,7 +7,9 @@ module Spree
included do
before_action :set_token
- helper_method :try_spree_current_user
+ if defined?(helper_method)
+ helper_method :try_spree_current_user
+ end
rescue_from CanCan::AccessDenied do |_exception|
redirect_unauthorized_access
diff --git a/core/lib/spree/core/controller_helpers/currency.rb b/core/lib/spree/core/controller_helpers/currency.rb
index 1a223a2799..d59ef343bb 100644
--- a/core/lib/spree/core/controller_helpers/currency.rb
+++ b/core/lib/spree/core/controller_helpers/currency.rb
@@ -5,11 +5,13 @@ module Spree
extend ActiveSupport::Concern
included do
- helper_method :supported_currencies
- helper_method :supported_currencies_for_all_stores
- helper_method :current_currency
- helper_method :supported_currency?
- helper_method :currency_param
+ if defined?(helper_method)
+ helper_method :supported_currencies
+ helper_method :supported_currencies_for_all_stores
+ helper_method :current_currency
+ helper_method :supported_currency?
+ helper_method :currency_param
+ end
end
def current_currency
diff --git a/core/lib/spree/core/controller_helpers/locale.rb b/core/lib/spree/core/controller_helpers/locale.rb
index 975efec5e3..0a5b20a7d2 100644
--- a/core/lib/spree/core/controller_helpers/locale.rb
+++ b/core/lib/spree/core/controller_helpers/locale.rb
@@ -7,12 +7,14 @@ module Spree
included do
before_action :set_locale
- helper_method :supported_locales
- helper_method :supported_locales_for_all_stores
- helper_method :current_locale
- helper_method :supported_locale?
- helper_method :available_locales
- helper_method :locale_param
+ if defined?(helper_method)
+ helper_method :supported_locales
+ helper_method :supported_locales_for_all_stores
+ helper_method :current_locale
+ helper_method :supported_locale?
+ helper_method :available_locales
+ helper_method :locale_param
+ end
end
def set_locale
diff --git a/core/lib/spree/core/controller_helpers/order.rb b/core/lib/spree/core/controller_helpers/order.rb
index a0edb1fc79..8a1ba74f93 100644
--- a/core/lib/spree/core/controller_helpers/order.rb
+++ b/core/lib/spree/core/controller_helpers/order.rb
@@ -5,8 +5,10 @@ module Spree
extend ActiveSupport::Concern
included do
- helper_method :current_order
- helper_method :simple_current_order
+ if defined?(helper_method)
+ helper_method :current_order
+ helper_method :simple_current_order
+ end
end
# Used in the link_to_cart helper.
diff --git a/core/lib/spree/core/controller_helpers/store.rb b/core/lib/spree/core/controller_helpers/store.rb
index f5a2d54321..d5153c4aaf 100644
--- a/core/lib/spree/core/controller_helpers/store.rb
+++ b/core/lib/spree/core/controller_helpers/store.rb
@@ -5,9 +5,11 @@ module Spree
extend ActiveSupport::Concern
included do
- helper_method :current_store
- helper_method :current_price_options
- helper_method :available_menus
+ if defined?(helper_method)
+ helper_method :current_store
+ helper_method :current_price_options
+ helper_method :available_menus
+ end
end
def current_store