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
add migration and change saved_locale to selected_locale
wjwitek5d5ba24223da
diff --git a/api/app/serializers/spree/api/v2/platform/user_serializer.rb b/api/app/serializers/spree/api/v2/platform/user_serializer.rbindex 875bfdd1bb..25a4865dbe 100644--- a/api/app/serializers/spree/api/v2/platform/user_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/user_serializer.rb@@ -5,7 +5,7 @@ module Spreeclass UserSerializer < BaseSerializerset_type :user- attributes :email, :first_name, :last_name, :created_at, :updated_at, :public_metadata, :private_metadata, :saved_locale+ attributes :email, :first_name, :last_name, :created_at, :updated_at, :public_metadata, :private_metadata, :selected_localeattribute :average_order_value do |user, params|price_stats(user.report_values_for(:average_order_value, params[:store]))diff --git a/api/app/serializers/spree/v2/storefront/user_serializer.rb b/api/app/serializers/spree/v2/storefront/user_serializer.rbindex 2f8a1223dd..c3f88d400a 100644--- a/api/app/serializers/spree/v2/storefront/user_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/user_serializer.rb@@ -4,7 +4,7 @@ module Spreeclass UserSerializer < BaseSerializerset_type :user- attributes :email, :first_name, :saved_locale, :last_name, :public_metadata+ attributes :email, :first_name, :selected_locale, :last_name, :public_metadataattribute :store_credits do |user|user.total_available_store_creditdiff --git a/core/db/migrate/20221215151408_add_selected_locale_to_spree_users.rb b/core/db/migrate/20221215151408_add_selected_locale_to_spree_users.rbnew file mode 100644index 0000000000..c1e7546359--- /dev/null+++ b/core/db/migrate/20221215151408_add_selected_locale_to_spree_users.rb@@ -0,0 +1,5 @@+class AddSelectedLocaleToSpreeUsers < ActiveRecord::Migration[7.0]+ def change+ add_column :spree_users, :selected_locale, :string+ end+enddiff --git a/core/lib/spree/core/controller_helpers/locale.rb b/core/lib/spree/core/controller_helpers/locale.rbindex 63251e6edd..3602c63d36 100644--- a/core/lib/spree/core/controller_helpers/locale.rb+++ b/core/lib/spree/core/controller_helpers/locale.rb@@ -22,8 +22,8 @@ module Spreeenddef current_locale- @current_locale ||= if spree_current_user && supported_locale?(spree_current_user.saved_locale)- spree_current_user.saved_locale+ @current_locale ||= if spree_current_user && supported_locale?(spree_current_user.selected_locale)+ spree_current_user.selected_localeelsif params[:locale].present? && supported_locale?(params[:locale])params[:locale]elsif respond_to?(:config_locale, true) && config_locale.present?diff --git a/core/lib/spree/permitted_attributes.rb b/core/lib/spree/permitted_attributes.rbindex 0408aff9bb..330fe762e0 100644--- a/core/lib/spree/permitted_attributes.rb+++ b/core/lib/spree/permitted_attributes.rb@@ -147,7 +147,7 @@ module Spree# TODO: Should probably use something like Spree.user_class.attributes@@user_attributes = [:email, :bill_address_id, :ship_address_id, :password, :first_name, :last_name,- :password_confirmation, { public_metadata: {}, private_metadata: {} }, :saved_locale]+ :password_confirmation, { public_metadata: {}, private_metadata: {} }, :selected_locale]@@variant_attributes = [:name, :presentation, :cost_price, :discontinue_on, :lock_version,