From 968ff73d07a1195b69a0bd6a0459720d13b1cf73 Mon Sep 17 00:00:00 2001 From: Filippo Liverani Date: Fri, 30 Oct 2020 16:06:27 +0100 Subject: [PATCH] Remove config to toggle Address name fields behaviour --- .../solidus/install/templates/config/initializers/spree.rb.tt | 3 --- core/lib/spree/app_configuration.rb | 4 ---- core/lib/spree/testing_support/dummy_app.rb | 1 - 3 files changed, 8 deletions(-) diff --git a/core/lib/generators/solidus/install/templates/config/initializers/spree.rb.tt b/core/lib/generators/solidus/install/templates/config/initializers/spree.rb.tt index 07bdb3da584..b3f50910dfd 100644 --- a/core/lib/generators/solidus/install/templates/config/initializers/spree.rb.tt +++ b/core/lib/generators/solidus/install/templates/config/initializers/spree.rb.tt @@ -10,9 +10,6 @@ Spree.config do |config| # from address for transactional emails config.mails_from = "store@example.com" - # Use combined first and last name attribute in HTML views and API responses - config.use_combined_first_and_last_name_in_address = true - # Use legacy Spree::Order state machine config.use_legacy_order_state_machine = false diff --git a/core/lib/spree/app_configuration.rb b/core/lib/spree/app_configuration.rb index b6b47746883..d06516b454b 100644 --- a/core/lib/spree/app_configuration.rb +++ b/core/lib/spree/app_configuration.rb @@ -307,10 +307,6 @@ class AppConfiguration < Preferences::Configuration # @return [] Track on_hand values for variants / products. (default: true) preference :track_inventory_levels, :boolean, default: true - # @!attribute [rw] use_combined_first_and_last_name_in_address - # @return [Boolean] Use Spree::Address combined first and last name in HTML views and - # API responses. (default: +false+) - preference :use_combined_first_and_last_name_in_address, :boolean, default: false # @!attribute [rw] use_legacy_order_state_machine # @return [Boolean] Uses the legacy order state machine from Spree::Order::Checkout diff --git a/core/lib/spree/testing_support/dummy_app.rb b/core/lib/spree/testing_support/dummy_app.rb index 3dff94fd34f..97d0f940574 100644 --- a/core/lib/spree/testing_support/dummy_app.rb +++ b/core/lib/spree/testing_support/dummy_app.rb @@ -119,7 +119,6 @@ class Application < ::Rails::Application config.raise_with_invalid_currency = false config.redirect_back_on_unauthorized = true config.run_order_validations_on_order_updater = true - config.use_combined_first_and_last_name_in_address = true config.use_legacy_order_state_machine = false config.use_custom_cancancan_actions = false config.consider_actionless_promotion_active = false