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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Extract Locale URLs logic into LocaleUrls concern
Damian Legawiecba3eaee27da8
diff --git a/frontend/app/controllers/concerns/spree/locale_urls.rb b/frontend/app/controllers/concerns/spree/locale_urls.rbnew file mode 100644index 0000000000..dda4f9a7b2--- /dev/null+++ b/frontend/app/controllers/concerns/spree/locale_urls.rb@@ -0,0 +1,23 @@+module Spree+ module LocaleUrls+ extend ActiveSupport::Concern++ included do+ before_action :redirect_to_default_locale+ end++ private++ def default_url_options+ return super if locale_param.nil?++ super.merge(locale: locale_param)+ end++ def redirect_to_default_locale+ return if params[:locale].blank? || supported_locale?(params[:locale])++ redirect_to url_for(request.parameters.merge(locale: nil))+ end+ end+enddiff --git a/frontend/app/controllers/spree/store_controller.rb b/frontend/app/controllers/spree/store_controller.rbindex e5949c824f..5face1ccce 100644--- a/frontend/app/controllers/spree/store_controller.rb+++ b/frontend/app/controllers/spree/store_controller.rb@@ -1,6 +1,8 @@module Spreeclass StoreController < Spree::BaseControllerinclude Spree::Core::ControllerHelpers::Order+ include Spree::LocaleUrls+helper 'spree/locale'helper 'spree/currency'@@ -29,12 +31,6 @@ module Spreerender json: current_order(create_order_if_necessary: true) # force creation of order if doesn't existsend- def default_url_options- return super if locale_param.nil?-- super.merge(locale: locale_param)- end-protecteddef config_locale@@ -52,11 +48,5 @@ module Spreedef store_last_modified(current_store.updated_at || Time.current).utcend-- def redirect_to_default_locale- return if params[:locale].blank? || supported_locale?(params[:locale])-- redirect_to url_for(request.parameters.merge(locale: nil))- endendend