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
Rename show_store_currency_selector to show_store_selector
Damian Legawiec821b04c3d65d
diff --git a/backend/app/controllers/spree/admin/general_settings_controller.rb b/backend/app/controllers/spree/admin/general_settings_controller.rbindex 689fd60832..7dee44ef16 100644--- a/backend/app/controllers/spree/admin/general_settings_controller.rb+++ b/backend/app/controllers/spree/admin/general_settings_controller.rb@@ -27,7 +27,7 @@ module Spreeenddef render(*args)- @preferences_currency |= [:show_store_currency_selector]+ @preferences_currency |= [:show_store_selector]superenddiff --git a/backend/app/views/spree/admin/general_settings/edit.html.erb b/backend/app/views/spree/admin/general_settings/edit.html.erbindex 918a76c73f..1043e0b33e 100644--- a/backend/app/views/spree/admin/general_settings/edit.html.erb+++ b/backend/app/views/spree/admin/general_settings/edit.html.erb@@ -84,13 +84,13 @@</div><div class="card-body"><div class="alert alert-warning col-12">- <%= Spree.t('show_store_currency_selector.long') %>+ <%= Spree.t('show_store_selector.long') %></div><div class="form-group"><div class="checkbox"><label>- <%= check_box('', :show_store_currency_selector, { checked: Spree::Config.show_store_currency_selector }) %>- <%= Spree.t('show_store_currency_selector.short') %>+ <%= check_box('', :show_store_selector, { checked: Spree::Config.show_store_selector }) %>+ <%= Spree.t('show_store_selector.short') %></label></div></div>diff --git a/backend/spec/features/admin/general_settings/prices_settings_updating_spec.rb b/backend/spec/features/admin/general_settings/prices_settings_updating_spec.rbindex 287a6de83f..93c8688e95 100644--- a/backend/spec/features/admin/general_settings/prices_settings_updating_spec.rb+++ b/backend/spec/features/admin/general_settings/prices_settings_updating_spec.rb@@ -7,7 +7,7 @@ describe 'Updating currencies settings', type: :feature, js: true dodescribe 'enabling currency settings' dobefore doreset_spree_preferences do |config|- config.show_store_currency_selector = false+ config.show_store_selector = falseendend@@ -15,35 +15,35 @@ describe 'Updating currencies settings', type: :feature, js: true dovisit spree.edit_admin_general_settings_path# Test initial state- expect(page).to have_unchecked_field('show_store_currency_selector')+ expect(page).to have_unchecked_field('show_store_selector')# Interact with the form- check('show_store_currency_selector')+ check('show_store_selector')click_button 'Update'# Test final stateexpect(page).to have_content 'General Settings has been successfully updated!'- expect(page).to have_checked_field('show_store_currency_selector')+ expect(page).to have_checked_field('show_store_selector')endenddescribe 'disabling currency settings' dobefore doreset_spree_preferences do |config|- config.show_store_currency_selector = true+ config.show_store_selector = trueendendit 'allows to disable currency settings' dovisit spree.edit_admin_general_settings_path- expect(page).to have_checked_field('show_store_currency_selector')+ expect(page).to have_checked_field('show_store_selector')- uncheck('show_store_currency_selector')+ uncheck('show_store_selector')click_button 'Update'expect(page).to have_content 'General Settings has been successfully updated!'- expect(page).to have_unchecked_field('show_store_currency_selector')+ expect(page).to have_unchecked_field('show_store_selector')endendenddiff --git a/core/app/models/spree/app_configuration.rb b/core/app/models/spree/app_configuration.rbindex 2ff58fa79e..4bcd1095de 100644--- a/core/app/models/spree/app_configuration.rb+++ b/core/app/models/spree/app_configuration.rb@@ -68,8 +68,8 @@ module Spreepreference :non_expiring_credit_types, :array, default: []preference :credit_to_new_allocation, :boolean, default: false- # Multi currency configurations- preference :show_store_currency_selector, :boolean, default: false+ # Multi store configurations+ preference :show_store_selector, :boolean, default: false# searcher_class allows spree extension writers to provide their own Search classdef searcher_classdiff --git a/core/config/locales/en.yml b/core/config/locales/en.ymlindex 0c2d4e7424..6d741d1bf1 100644--- a/core/config/locales/en.yml+++ b/core/config/locales/en.yml@@ -1582,7 +1582,7 @@ en:show_only_considered_risky: Only show risky ordersshow_property: Show Propertyshow_rate_in_label: Show rate in label- show_store_currency_selector:+ show_store_selector:short: Show Store selectorlong: Display the Store selector in the main nav bar of Storefront and allow users to change Store and Currencysign_up: Sign Updiff --git a/frontend/app/controllers/spree/currency_controller.rb b/frontend/app/controllers/spree/currency_controller.rbindex 697dc72987..cab88b9b78 100644--- a/frontend/app/controllers/spree/currency_controller.rb+++ b/frontend/app/controllers/spree/currency_controller.rb@@ -4,7 +4,7 @@ module Spree@currency = supported_currencies.find { |currency| currency.iso_code == params[:currency] }# Make sure that we update the current order, so the currency change is reflected.current_order&.update(currency: @currency.iso_code)- session[:currency] = params[:currency] if Spree::Config[:show_store_currency_selector]+ session[:currency] = params[:currency] if Spree::Config[:show_store_selector]respond_to do |format|format.json { render json: [email protected]? }format.html dodiff --git a/frontend/app/views/spree/shared/_change_store.html.erb b/frontend/app/views/spree/shared/_change_store.html.erbindex de347993b2..5484c4d387 100644--- a/frontend/app/views/spree/shared/_change_store.html.erb+++ b/frontend/app/views/spree/shared/_change_store.html.erb@@ -1,4 +1,4 @@-<% if Spree::Config.show_store_currency_selector && stores.size > 1 %>+<% if Spree::Config.show_store_selector && stores.size > 1 %><li class="d-none d-xl-block change-store"><div class="dropdown navbar-right-dropdown"><button id="stores-button" type="button" data-toggle="dropdown" class="navbar-right-dropdown-toggle" aria-label="<%= Spree.t('nav_bar.change_country')%>">diff --git a/frontend/spec/features/main_nav_bar_spec.rb b/frontend/spec/features/main_nav_bar_spec.rbindex 0bea127338..452bee569a 100644--- a/frontend/spec/features/main_nav_bar_spec.rb+++ b/frontend/spec/features/main_nav_bar_spec.rb@@ -12,12 +12,12 @@ describe 'Main navigation bar', type: :feature doendend- context 'when show_store_currency_selector preference is set to true' do+ context 'when show_store_selector preference is set to true' dolet!(:stores) { create_list(:store, stores_number, default_country: create(:country)) }before doreset_spree_preferences do |config|- config.show_store_currency_selector = true+ config.show_store_selector = trueendvisit spree.root_path@@ -51,12 +51,12 @@ describe 'Main navigation bar', type: :feature doendend- context 'when show_store_currency_selector preference is set to false' do+ context 'when show_store_selector preference is set to false' dolet!(:stores) { create_list(:store, stores_number) }before doreset_spree_preferences do |config|- config.show_store_currency_selector = false+ config.show_store_selector = falseendvisit spree.root_pathdiff --git a/frontend/spec/features/order_prices_spec.rb b/frontend/spec/features/order_prices_spec.rbindex 88170519e8..28ca5eb0bf 100644--- a/frontend/spec/features/order_prices_spec.rb+++ b/frontend/spec/features/order_prices_spec.rb@@ -6,7 +6,7 @@ xdescribe 'Order', type: :feature, js: true dobefore doreset_spree_preferences do |config|- config.show_store_currency_selector = true+ config.show_store_selector = trueendcreate(:price, variant: product.master, currency: 'EUR', amount: 16.00)diff --git a/frontend/spec/features/product_prices_spec.rb b/frontend/spec/features/product_prices_spec.rbindex fa65b88144..35686247da 100644--- a/frontend/spec/features/product_prices_spec.rb+++ b/frontend/spec/features/product_prices_spec.rb@@ -8,7 +8,7 @@ describe 'Product with prices in multiple currencies', type: :feature, js: truebefore doreset_spree_preferences do |config|- config.show_store_currency_selector = true+ config.show_store_selector = trueendcreate(:price, variant: product.master, currency: 'EUR', amount: 16.00)create(:price, variant: product.master, currency: 'GBP', amount: 23.00)@@ -23,10 +23,10 @@ describe 'Product with prices in multiple currencies', type: :feature, js: trueexpect(page).to have_text '£23.00'end- context 'and :show_store_currency_selector is false' do+ context 'and :show_store_selector is false' dobefore doreset_spree_preferences do |config|- config.show_store_currency_selector = false+ config.show_store_selector = falseendenddiff --git a/guides/src/content/developer/core/preferences.md b/guides/src/content/developer/core/preferences.mdindex ebdb02e4cf..b325a4d07e 100644--- a/guides/src/content/developer/core/preferences.md+++ b/guides/src/content/developer/core/preferences.md@@ -426,7 +426,7 @@ Determines if, on the admin listing screen, only completed orders should be showDetermines if the variant's full price or price difference from a product should be displayed on the product's show page. Defaults to `false`.-`show_store_currency_selector`+`show_store_selector`Display the Store selector in the main nav bar of Storefront and allow users to change Store and Currency. Defaults to `false`.