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 for persisting markets supported locales

Damian Legawiec79b2facb6293
diff --git a/backend/engines/admin/app/controllers/spree/admin/markets_controller.rb b/backend/engines/admin/app/controllers/spree/admin/markets_controller.rb
index c74f7c4281..2499388c36 100644
--- a/backend/engines/admin/app/controllers/spree/admin/markets_controller.rb
+++ b/backend/engines/admin/app/controllers/spree/admin/markets_controller.rb
@@ -4,6 +4,7 @@ module Spree
include Spree::Admin::SettingsConcern
before_action :load_data, except: :index
+ before_action :normalize_supported_locales, only: [:create, :update]
protected
@@ -14,6 +15,14 @@ module Spree
def permitted_resource_params
params.require(:market).permit(permitted_market_attributes)
end
+
+ private
+
+ def normalize_supported_locales
+ if params.dig(:market, :supported_locales)&.is_a?(Array)
+ params[:market][:supported_locales] = params[:market][:supported_locales].compact.uniq.reject(&:blank?).join(',')
+ end
+ end
end
end
end
diff --git a/backend/engines/admin/spec/controllers/spree/admin/markets_controller_spec.rb b/backend/engines/admin/spec/controllers/spree/admin/markets_controller_spec.rb
index 99b10b9b2e..9720eb12c2 100644
--- a/backend/engines/admin/spec/controllers/spree/admin/markets_controller_spec.rb
+++ b/backend/engines/admin/spec/controllers/spree/admin/markets_controller_spec.rb
@@ -62,6 +62,21 @@ RSpec.describe Spree::Admin::MarketsController, type: :controller do
expect(response).to have_http_status(:redirect)
end
+ it 'normalizes supported_locales from array to comma-separated string' do
+ post :create, params: {
+ market: {
+ name: 'Multilingual',
+ country_ids: [country.id],
+ currency: 'USD',
+ default_locale: 'en',
+ supported_locales: ['en', 'fr', 'de']
+ }
+ }
+ market = Spree::Market.last
+ expect(market.supported_locales).to eq('en,fr,de')
+ expect(market.supported_locales_list).to contain_exactly('de', 'en', 'fr')
+ end
+
context 'with invalid params' do
it 'renders new' do
post :create, params: { market: { name: '' } }