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
Fixed saving theme preferences in page builder (#12754)
Damian Legawiecb446084d42e0
diff --git a/admin/app/controllers/spree/admin/stores_controller.rb b/admin/app/controllers/spree/admin/stores_controller.rbindex 4a5f15ce94..d5a0a3776c 100644--- a/admin/app/controllers/spree/admin/stores_controller.rb+++ b/admin/app/controllers/spree/admin/stores_controller.rb@@ -68,7 +68,7 @@ module Spreeprotecteddef permitted_store_params- params.require(:store).permit(permitted_store_attributes)+ params.require(:store).permit(permitted_store_attributes + current_store.preferences.keys.map { |key| "preferred_#{key}" })endprivatediff --git a/admin/app/controllers/spree/admin/themes_controller.rb b/admin/app/controllers/spree/admin/themes_controller.rbindex 5b1f13f0a5..8f53a035c3 100644--- a/admin/app/controllers/spree/admin/themes_controller.rb+++ b/admin/app/controllers/spree/admin/themes_controller.rb@@ -75,7 +75,7 @@ module Spreeenddef permitted_resource_params- params.require(:theme).permit(permitted_theme_attributes)+ params.require(:theme).permit(permitted_theme_attributes + @object.preferences.keys.map { |key| "preferred_#{key}" })endendenddiff --git a/admin/spec/controllers/spree/admin/stores_controller_spec.rb b/admin/spec/controllers/spree/admin/stores_controller_spec.rbindex 3f99456bf0..c1003de569 100644--- a/admin/spec/controllers/spree/admin/stores_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/stores_controller_spec.rb@@ -52,7 +52,10 @@ describe Spree::Admin::StoresController doname: 'New Store Name',default_currency: 'GBR',default_country_iso: 'GB',- default_locale: 'pl'+ default_locale: 'pl',+ preferred_timezone: 'Europe/Warsaw',+ preferred_weight_unit: 'kg',+ preferred_unit_system: 'metric'}end@@ -69,6 +72,10 @@ describe Spree::Admin::StoresController doexpect(store.default_currency).to eq('GBR')expect(store.default_country).to eq(uk_country)expect(store.default_locale).to eq('pl')++ expect(store.preferred_timezone).to eq('Europe/Warsaw')+ expect(store.preferred_weight_unit).to eq('kg')+ expect(store.preferred_unit_system).to eq('metric')endcontext 'when removing assets' dodiff --git a/admin/spec/controllers/spree/admin/themes_controller_spec.rb b/admin/spec/controllers/spree/admin/themes_controller_spec.rbindex 9b6423bd5a..3068fc9d42 100644--- a/admin/spec/controllers/spree/admin/themes_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/themes_controller_spec.rb@@ -34,6 +34,15 @@ RSpec.describe Spree::Admin::ThemesController, type: :controller doendend+ describe 'PUT #update' do+ it 'updates the theme' do+ expect do+ put :update, params: { id: theme.id, theme: { preferred_primary_color: '#0090FE', preferred_font_family: 'Inconsolata' }, format: :turbo_stream }+ end.to change { theme.reload.preferred_primary_color }.to('#0090FE')+ .and change { theme.reload.preferred_font_family }.to('Inconsolata')+ end+ end+describe 'PUT #publish' doit 'sets the theme as default' doput :publish, params: { id: theme.id }, format: :turbo_stream