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
Simplify Spree Core API to set/read modules such as payment_methods, … (#13296)
Damian Legawiec0730dcecd164
diff --git a/admin/app/controllers/spree/admin/integrations_controller.rb b/admin/app/controllers/spree/admin/integrations_controller.rbindex 49c182eae9..181792a48c 100644--- a/admin/app/controllers/spree/admin/integrations_controller.rb+++ b/admin/app/controllers/spree/admin/integrations_controller.rb@@ -16,7 +16,7 @@ module Spreeprivatedef allowed_integration_types- @allowed_integration_types ||= Rails.application.config.spree.integrations.map { |klass| [klass.to_s, klass] }.to_h+ @allowed_integration_types ||= Spree.integrations.map { |klass| [klass.to_s, klass] }.to_henddef require_integration_typediff --git a/admin/app/controllers/spree/admin/metafields_controller.rb b/admin/app/controllers/spree/admin/metafields_controller.rbindex 9b350d6128..5829c3110f 100644--- a/admin/app/controllers/spree/admin/metafields_controller.rb+++ b/admin/app/controllers/spree/admin/metafields_controller.rb@@ -28,7 +28,7 @@ module Spreeenddef allowed_model_classes- @allowed_model_classes ||= Rails.application.config.spree.metafield_enabled_resources+ @allowed_model_classes ||= Spree.metafield_enabled_resourcesenddef update_turbo_stream_enabled?diff --git a/admin/app/controllers/spree/admin/page_blocks_controller.rb b/admin/app/controllers/spree/admin/page_blocks_controller.rbindex 92c36ac418..d71c2e2b12 100644--- a/admin/app/controllers/spree/admin/page_blocks_controller.rb+++ b/admin/app/controllers/spree/admin/page_blocks_controller.rb@@ -40,7 +40,7 @@ module Spreedef allowed_types[- *Rails.application.config.spree.page_blocks,+ *Spree.page_builder.page_blocks,*parent&.available_blocks_to_add].uniq.sort_by(&:name)enddiff --git a/admin/app/controllers/spree/admin/payment_methods_controller.rb b/admin/app/controllers/spree/admin/payment_methods_controller.rbindex f75174ef92..b155436208 100644--- a/admin/app/controllers/spree/admin/payment_methods_controller.rb+++ b/admin/app/controllers/spree/admin/payment_methods_controller.rb@@ -33,7 +33,7 @@ module Spreedef allowed_payment_types# We need to map to strings, otherwise some weird things happen with STI# where Rails can't find the ancestor class when we try to save the payment method.- Rails.application.config.spree.payment_methods.map(&:to_s)+ Spree.payment_methods.map(&:to_s)enddef permitted_resource_paramsdiff --git a/admin/app/controllers/spree/admin/promotion_actions_controller.rb b/admin/app/controllers/spree/admin/promotion_actions_controller.rbindex d5f75de39a..db878e3a22 100644--- a/admin/app/controllers/spree/admin/promotion_actions_controller.rb+++ b/admin/app/controllers/spree/admin/promotion_actions_controller.rb@@ -30,7 +30,7 @@ module Spreeenddef allowed_action_types- Rails.application.config.spree.promotions.actions+ Spree.promotions.actionsenddef location_after_savediff --git a/admin/app/controllers/spree/admin/promotion_rules_controller.rb b/admin/app/controllers/spree/admin/promotion_rules_controller.rbindex 06a13d0bf6..50e81143a3 100644--- a/admin/app/controllers/spree/admin/promotion_rules_controller.rb+++ b/admin/app/controllers/spree/admin/promotion_rules_controller.rb@@ -28,7 +28,7 @@ module Spreeenddef allowed_rule_types- Rails.application.config.spree.promotions.rules+ Spree.promotions.rulesenddef location_after_savediff --git a/admin/app/controllers/spree/admin/promotions_controller.rb b/admin/app/controllers/spree/admin/promotions_controller.rbindex 1c890c5ab3..1023d18e70 100644--- a/admin/app/controllers/spree/admin/promotions_controller.rb+++ b/admin/app/controllers/spree/admin/promotions_controller.rb@@ -28,7 +28,7 @@ module Spreeenddef load_form_data- @promotion_rules = Rails.application.config.spree.promotions.rules+ @promotion_rules = Spree.promotions.rules@rule_types = @promotion_rules.map do |promotion_rule|[Spree.t("promotion_rule_types.#{promotion_rule.to_s.demodulize.underscore}.name"), promotion_rule.to_s]enddiff --git a/admin/app/controllers/spree/admin/reports_controller.rb b/admin/app/controllers/spree/admin/reports_controller.rbindex 46dce01fbd..a3e7638d2b 100644--- a/admin/app/controllers/spree/admin/reports_controller.rb+++ b/admin/app/controllers/spree/admin/reports_controller.rb@@ -54,7 +54,7 @@ module Spreeenddef allowed_report_types- Rails.application.config.spree.reports.map(&:to_s)+ Spree.reports.map(&:to_s)enddef permitted_resource_paramsdiff --git a/admin/app/controllers/spree/admin/taxons_controller.rb b/admin/app/controllers/spree/admin/taxons_controller.rbindex b1b379b9d1..aa673fc6e3 100644--- a/admin/app/controllers/spree/admin/taxons_controller.rb+++ b/admin/app/controllers/spree/admin/taxons_controller.rb@@ -97,7 +97,7 @@ module Spreeenddef load_form_data- @taxon_rules = Rails.application.config.spree.taxon_rules+ @taxon_rules = Spree.taxon_rules@rule_types = @taxon_rules.map do |taxon_rule|[Spree.t("admin.taxon_rules.#{taxon_rule.to_s.demodulize.underscore}"), taxon_rule.to_s]enddiff --git a/admin/app/controllers/spree/admin/translations_controller.rb b/admin/app/controllers/spree/admin/translations_controller.rbindex 0f67617abf..fdbcc4f737 100644--- a/admin/app/controllers/spree/admin/translations_controller.rb+++ b/admin/app/controllers/spree/admin/translations_controller.rb@@ -42,7 +42,7 @@ module Spree# Allowed translatable resources configured in Spreedef allowed_model_classes- Rails.application.config.spree.translatable_resources+ Spree.translatable_resourcesend# Determine the translation locale to usediff --git a/admin/app/helpers/spree/admin/base_helper.rb b/admin/app/helpers/spree/admin/base_helper.rbindex f137d3fc98..8817fa46f9 100644--- a/admin/app/helpers/spree/admin/base_helper.rb+++ b/admin/app/helpers/spree/admin/base_helper.rb@@ -4,7 +4,7 @@ module Spreeinclude Spree::ImagesHelperdef render_admin_partials(section, options = {})- Spree::Admin.partials.send(section.to_s.gsub('_partials', '').to_sym).map do |partial|+ Spree.admin.partials.send(section.to_s.gsub('_partials', '').to_sym).map do |partial|render partial, optionsend.join.html_safeenddiff --git a/admin/app/helpers/spree/admin/promotion_actions_helper.rb b/admin/app/helpers/spree/admin/promotion_actions_helper.rbindex 43e0f9475f..66a5740313 100644--- a/admin/app/helpers/spree/admin/promotion_actions_helper.rb+++ b/admin/app/helpers/spree/admin/promotion_actions_helper.rb@@ -3,7 +3,7 @@ module Spreemodule PromotionActionsHelperdef options_for_promotion_action_types(promotion)existing = promotion.actions.pluck(:type)- Rails.application.config.spree.promotions.actions.map(&:name).reject { |r| existing.include? r }+ Spree.promotions.actions.map(&:name).reject { |r| existing.include? r }endendenddiff --git a/admin/app/helpers/spree/admin/promotion_rules_helper.rb b/admin/app/helpers/spree/admin/promotion_rules_helper.rbindex 935fc2db3f..6f447e9af0 100644--- a/admin/app/helpers/spree/admin/promotion_rules_helper.rb+++ b/admin/app/helpers/spree/admin/promotion_rules_helper.rb@@ -3,7 +3,7 @@ module Spreemodule PromotionRulesHelperdef options_for_promotion_rule_types(promotion)existing = promotion.rules.pluck(:type)- Rails.application.config.spree.promotions.rules.map(&:name).reject { |r| existing.include? r }+ Spree.promotions.rules.map(&:name).reject { |r| existing.include? r }enddef active_options_for_option_value_promotion_rule(promotion_rule)diff --git a/admin/app/helpers/spree/admin/translations_helper.rb b/admin/app/helpers/spree/admin/translations_helper.rbindex dcc653f10d..c7f7c13231 100644--- a/admin/app/helpers/spree/admin/translations_helper.rb+++ b/admin/app/helpers/spree/admin/translations_helper.rb@@ -2,7 +2,7 @@ module Spreemodule Adminmodule TranslationsHelperdef link_to_edit_translations(resource, options = {})- return unless Rails.application.config.spree.translatable_resources.map(&:name).include?(resource.class.name)+ return unless Spree.translatable_resources.map(&:name).include?(resource.class.name)return unless can?(:update, resource)return unless can?(:update, :translations)diff --git a/admin/app/views/spree/admin/themes/_theme.html.erb b/admin/app/views/spree/admin/themes/_theme.html.erbindex 453445c34f..1e4633f5a3 100644--- a/admin/app/views/spree/admin/themes/_theme.html.erb+++ b/admin/app/views/spree/admin/themes/_theme.html.erb@@ -39,7 +39,7 @@<div class="d-flex justify-content-end w-100"><%= link_to Spree.t('actions.publish'), publish_admin_theme_path(theme), class: 'btn btn-sm btn-light mr-2', data: { turbo_method: :put } unless theme.default? %><%= dropdown do %>- <%= dropdown_toggle class: 'btn-light btn-sm' do %>+ <%= dropdown_toggle class: 'btn-light btn-sm h-100' do %><%= icon('dots-vertical', class: 'mr-0') %><% end %><%= dropdown_menu do %>diff --git a/admin/lib/spree/admin.rb b/admin/lib/spree/admin.rbindex 678de437e4..a36d88dabd 100644--- a/admin/lib/spree/admin.rb+++ b/admin/lib/spree/admin.rb@@ -23,6 +23,19 @@ require 'spree/core/partials'require 'tinymce-rails'module Spree+ def self.admin+ @admin ||= AdminConfig.new+ end++ class AdminConfig+ def partials+ @partials ||= Spree::Core::Partials.new(+ Rails.application.config.spree_admin,+ Spree::Admin::Engine::Environment+ )+ end+ end+module Admindef self.navigationRails.application.config.spree_admin.navigation@@ -31,12 +44,5 @@ module Spreedef self.navigation=(navigation)Rails.application.config.spree_admin.navigation = navigationend-- def self.partials- @partials ||= Spree::Core::Partials.new(- Rails.application.config.spree_admin,- Spree::Admin::Engine::Environment- )- endendenddiff --git a/admin/spec/controllers/spree/admin/promotion_actions_controller_spec.rb b/admin/spec/controllers/spree/admin/promotion_actions_controller_spec.rbindex 05f41edd97..91ec0decff 100644--- a/admin/spec/controllers/spree/admin/promotion_actions_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/promotion_actions_controller_spec.rb@@ -155,7 +155,7 @@ RSpec.describe Spree::Admin::PromotionActionsController, type: :controller dodescribe 'helper methods' doit 'provides allowed_action_types' doget :new, params: { promotion_id: promotion.id }- expect(controller.send(:allowed_action_types)).to eq(Rails.application.config.spree.promotions.actions)+ expect(controller.send(:allowed_action_types)).to eq(Spree.promotions.actions)endendenddiff --git a/admin/spec/controllers/spree/admin/promotion_rules_controller_spec.rb b/admin/spec/controllers/spree/admin/promotion_rules_controller_spec.rbindex 361dff4d0b..4997396b3e 100644--- a/admin/spec/controllers/spree/admin/promotion_rules_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/promotion_rules_controller_spec.rb@@ -159,7 +159,7 @@ RSpec.describe Spree::Admin::PromotionRulesController, type: :controller dodescribe 'helper methods' doit 'provides allowed_rule_types' doget :new, params: { promotion_id: promotion.id }- expect(controller.send(:allowed_rule_types)).to eq(Rails.application.config.spree.promotions.rules)+ expect(controller.send(:allowed_rule_types)).to eq(Spree.promotions.rules)endendenddiff --git a/cli/lib/spree_cli/templates/extension/config/initializers/spree.rb.tt b/cli/lib/spree_cli/templates/extension/config/initializers/spree.rb.ttindex c8785973a8..c7c242fce9 100644--- a/cli/lib/spree_cli/templates/extension/config/initializers/spree.rb.tt+++ b/cli/lib/spree_cli/templates/extension/config/initializers/spree.rb.tt@@ -1,32 +1,32 @@# Uncomment lines below to add your own custom business logic# such as promotions, shipping methods, etc.Rails.application.config.after_initialize do- # Rails.application.config.spree.shipping_methods << Spree::ShippingMethods::SuperExpensiveNotVeryFastShipping- # Rails.application.config.spree.payment_methods << Spree::PaymentMethods::VerySafeAndReliablePaymentMethod+ # Spree.shipping_methods << Spree::ShippingMethods::SuperExpensiveNotVeryFastShipping+ # Spree.payment_methods << Spree::PaymentMethods::VerySafeAndReliablePaymentMethod- # Rails.application.config.spree.calculators.tax_rates << Spree::TaxRates::FinanceTeamForcedMeToCodeThis+ # Spree.calculators.tax_rates << Spree::TaxRates::FinanceTeamForcedMeToCodeThis- # Rails.application.config.spree.stock_splitters << Spree::Stock::Splitters::SecretLogicSplitter+ # Spree.stock_splitters << Spree::Stock::Splitters::SecretLogicSplitter- # Rails.application.config.spree.adjusters << Spree::Adjustable::Adjuster::TaxTheRich+ # Spree.adjusters << Spree::Adjustable::Adjuster::TaxTheRich# Custom promotions- # Rails.application.config.spree.calculators.promotion_actions_create_adjustments << Spree::Calculators::PromotionActions::CreateAdjustments::AddDiscountForFriends- # Rails.application.config.spree.calculators.promotion_actions_create_item_adjustments << Spree::Calculators::PromotionActions::CreateItemAdjustments::FinanceTeamForcedMeToCodeThis- # Rails.application.config.spree.promotions.rules << Spree::Promotions::Rules::OnlyForVIPCustomers- # Rails.application.config.spree.promotions.actions << Spree::Promotions::Actions::GiftWithPurchase+ # Spree.calculators.promotion_actions_create_adjustments << Spree::Calculators::PromotionActions::CreateAdjustments::AddDiscountForFriends+ # Spree.calculators.promotion_actions_create_item_adjustments << Spree::Calculators::PromotionActions::CreateItemAdjustments::FinanceTeamForcedMeToCodeThis+ # Spree.promotions.rules << Spree::Promotions::Rules::OnlyForVIPCustomers+ # Spree.promotions.actions << Spree::Promotions::Actions::GiftWithPurchase- # Rails.application.config.spree.taxon_rules << Spree::TaxonRules::ProductsWithColor+ # Spree.taxon_rules << Spree::TaxonRules::ProductsWithColor- # Rails.application.config.spree.exports << Spree::Exports::Payments- # Rails.application.config.spree.reports << Spree::Reports::MassivelyOvercomplexReportForCfo+ # Spree.exports << Spree::Exports::Payments+ # Spree.reports << Spree::Reports::MassivelyOvercomplexReportForCfo# Themes and page builder- # Rails.application.config.spree.themes << Spree::Themes::NewShinyTheme- # Rails.application.config.spree.theme_layout_sections << Spree::PageSections::SuperImportantCeoBio- # Rails.application.config.spree.page_sections << Spree::PageSections::ContactFormToGetInTouch- # Rails.application.config.spree.page_blocks << Spree::PageBlocks::BigRedButtonToCallSales+ # Spree.page_builder.themes << Spree::Themes::NewShinyTheme+ # Spree.page_builder.theme_layout_sections << Spree::PageSections::SuperImportantCeoBio+ # Spree.page_builder.page_sections << Spree::PageSections::ContactFormToGetInTouch+ # Spree.page_builder.page_blocks << Spree::PageBlocks::BigRedButtonToCallSales# Storefront partials- Rails.application.config.spree_storefront.head_partials << '<%= file_name %>/head'+ Spree.storefront.partials.head << '<%= file_name %>/head'enddiff --git a/core/app/helpers/spree/integrations_helper.rb b/core/app/helpers/spree/integrations_helper.rbindex 7214290d61..67c2612ab6 100644--- a/core/app/helpers/spree/integrations_helper.rb+++ b/core/app/helpers/spree/integrations_helper.rb@@ -9,7 +9,7 @@ module Spreeenddef grouped_available_store_integrations- Rails.application.config.spree.integrations.group_by(&:integration_group).sort_by { |group, _| group }+ Spree.integrations.group_by(&:integration_group).sort_by { |group, _| group }endendenddiff --git a/core/app/models/concerns/spree/calculated_adjustments.rb b/core/app/models/concerns/spree/calculated_adjustments.rbindex e0b101c240..1c60331c5a 100644--- a/core/app/models/concerns/spree/calculated_adjustments.rb+++ b/core/app/models/concerns/spree/calculated_adjustments.rb@@ -30,7 +30,7 @@ module Spreeenddef self.spree_calculators- Rails.application.config.spree.calculators+ Spree.calculatorsendendenddiff --git a/core/app/models/spree/address.rb b/core/app/models/spree/address.rbindex 10d6a73e83..7b9c9080c1 100644--- a/core/app/models/spree/address.rb+++ b/core/app/models/spree/address.rb@@ -76,7 +76,7 @@ module Spreeallow_nil: true }def address_validators- Rails.application.config.spree.validators.addresses.each do |validator|+ Spree.validators.addresses.each do |validator|validates_with validatorendenddiff --git a/core/app/models/spree/adjustable/adjustments_updater.rb b/core/app/models/spree/adjustable/adjustments_updater.rbindex 89c1bf4d58..7ea84ab4f7 100644--- a/core/app/models/spree/adjustable/adjustments_updater.rb+++ b/core/app/models/spree/adjustable/adjustments_updater.rb@@ -55,7 +55,7 @@ module Spreeenddef adjusters- Rails.application.config.spree.adjusters+ Spree.adjustersenddef tax_adjusterdiff --git a/core/app/models/spree/calculator.rb b/core/app/models/spree/calculator.rbindex b648760c28..2fe1bcbd21 100644--- a/core/app/models/spree/calculator.rb+++ b/core/app/models/spree/calculator.rb@@ -26,7 +26,7 @@ module Spree# Returns all calculators applicable for kind of workdef self.calculators- Rails.application.config.spree.calculators+ Spree.calculatorsenddef to_sdiff --git a/core/app/models/spree/data_feed.rb b/core/app/models/spree/data_feed.rbindex 75985a45cc..4491da4051 100644--- a/core/app/models/spree/data_feed.rb+++ b/core/app/models/spree/data_feed.rb@@ -33,7 +33,7 @@ module Spreeenddef available_types- Rails.application.config.spree.data_feed_types+ Spree.data_feed_typesendendenddiff --git a/core/app/models/spree/export.rb b/core/app/models/spree/export.rbindex 55a55dd991..e2a0ac561a 100644--- a/core/app/models/spree/export.rb+++ b/core/app/models/spree/export.rb@@ -175,7 +175,7 @@ module Spreeclass << selfdef available_types- Rails.application.config.spree.export_types+ Spree.export_typesenddef available_modelsdiff --git a/core/app/models/spree/import.rb b/core/app/models/spree/import.rbindex 27b84880b4..cfbe5ccd65 100644--- a/core/app/models/spree/import.rb+++ b/core/app/models/spree/import.rb@@ -224,7 +224,7 @@ module Spree# Returns the available types for the import# @return [Array<Class>]def available_types- Rails.application.config.spree.import_types+ Spree.import_typesend# Returns the available models for the importdiff --git a/core/app/models/spree/metafield_definition.rb b/core/app/models/spree/metafield_definition.rbindex 3edc0ba65a..8dc469197e 100644--- a/core/app/models/spree/metafield_definition.rb+++ b/core/app/models/spree/metafield_definition.rb@@ -61,13 +61,13 @@ module Spree# Returns the available types# @return [Array<Class>]def self.available_types- Rails.application.config.spree.metafield_types+ Spree.metafield_typesend# Returns the available resources# @return [Array<Class>]def self.available_resources- Rails.application.config.spree.metafield_enabled_resources+ Spree.metafield_enabled_resourcesendprivate@@ -81,7 +81,7 @@ module Spreeenddef set_default_type- self.metafield_type ||= Rails.application.config.spree.metafield_types.first.to_s+ self.metafield_type ||= Spree.metafield_types.first.to_senddef set_name_from_keydiff --git a/core/app/models/spree/payment_method.rb b/core/app/models/spree/payment_method.rbindex f7c743361c..bf459c9195 100644--- a/core/app/models/spree/payment_method.rb+++ b/core/app/models/spree/payment_method.rb@@ -29,7 +29,7 @@ module Spreehas_many :gateway_customers, class_name: 'Spree::GatewayCustomer', dependent: :destroydef self.providers- Rails.application.config.spree.payment_methods+ Spree.payment_methodsenddef provider_classdiff --git a/core/app/models/spree/stock/coordinator.rb b/core/app/models/spree/stock/coordinator.rbindex 611545b464..36540dd3f3 100644--- a/core/app/models/spree/stock/coordinator.rb+++ b/core/app/models/spree/stock/coordinator.rb@@ -60,7 +60,7 @@ module Spreedef splitters(_stock_location)# extension point to return custom splitters for a location- Rails.application.config.spree.stock_splitters+ Spree.stock_splittersendendenddiff --git a/core/app/models/spree/theme.rb b/core/app/models/spree/theme.rbindex 64303e93b2..5e68327f35 100644--- a/core/app/models/spree/theme.rb+++ b/core/app/models/spree/theme.rb@@ -56,7 +56,7 @@ module Spree## @return [Array<Spree::Theme>]def self.available_themes- @available_themes ||= Rails.application.config.spree.themes.sort_by(&:display_name)+ @available_themes ||= Spree.page_builder.themes.sort_by(&:display_name)enddef self.metadata@@ -98,7 +98,7 @@ module Spreeenddef create_default_pages- Rails.application.config.spree.pages.map(&:to_s).map(&:constantize).each do |page_class|+ Spree.page_builder.pages.map(&:to_s).map(&:constantize).each do |page_class|next if page_class == Spree::Pages::Custompage_class.where(pageable: self).first_or_create!@@ -160,7 +160,7 @@ module Spree# @return [Array<Class>]def available_layout_sections[- *Rails.application.config.spree.theme_layout_sections,+ *Spree.page_builder.theme_layout_sections,*custom_layout_sections]end@@ -181,7 +181,7 @@ module Spreereturn @available_page_sections if @available_page_sections@available_page_sections ||= [- *Rails.application.config.spree.page_sections.find_all do |section_class|+ *Spree.page_builder.page_sections.find_all do |section_class|section_class.role == 'content'end,*custom_page_sectionsdiff --git a/core/app/services/spree/compare_line_items.rb b/core/app/services/spree/compare_line_items.rbindex 6bba33df56..32ed83e33b 100644--- a/core/app/services/spree/compare_line_items.rb+++ b/core/app/services/spree/compare_line_items.rb@@ -4,7 +4,7 @@ module Spreeprepend Spree::ServiceModule::Basedef call(order:, line_item:, options: {}, comparison_hooks: nil)- comparison_hooks ||= Rails.application.config.spree.line_item_comparison_hooks+ comparison_hooks ||= Spree.line_item_comparison_hookslegacy_part = comparison_hooks.all? do |hook|order.send(hook, line_item, options)diff --git a/core/lib/generators/spree/cursor_rules/templates/spree_rules.mdc b/core/lib/generators/spree/cursor_rules/templates/spree_rules.mdcindex bfae180a10..af64872809 100644--- a/core/lib/generators/spree/cursor_rules/templates/spree_rules.mdc+++ b/core/lib/generators/spree/cursor_rules/templates/spree_rules.mdc@@ -255,7 +255,7 @@ bin/rails g spree:storefront:theme MyTheme```ruby# Register theme in config/initializers/spree.rb-Rails.application.config.spree.themes << Spree::Themes::MyTheme+Spree.page_builder.themes << Spree::Themes::MyTheme```#### View Overridesdiff --git a/core/lib/generators/spree/install/templates/config/initializers/spree.rb b/core/lib/generators/spree/install/templates/config/initializers/spree.rbindex ecac69781a..1888cdae3b 100644--- a/core/lib/generators/spree/install/templates/config/initializers/spree.rb+++ b/core/lib/generators/spree/install/templates/config/initializers/spree.rb@@ -61,33 +61,40 @@ end# uncomment lines below to add your own custom business logic# such as promotions, shipping methods, etcRails.application.config.after_initialize do- # Rails.application.config.spree.shipping_methods << Spree::ShippingMethods::SuperExpensiveNotVeryFastShipping- # Rails.application.config.spree.payment_methods << Spree::PaymentMethods::VerySafeAndReliablePaymentMethod+ # Payment methods and shipping calculators+ # Spree.payment_methods << Spree::PaymentMethods::VerySafeAndReliablePaymentMethod+ # Spree.calculators.shipping_methods << Spree::ShippingMethods::SuperExpensiveNotVeryFastShipping+ # Spree.calculators.tax_rates << Spree::TaxRates::FinanceTeamForcedMeToCodeThis- # Rails.application.config.spree.calculators.tax_rates << Spree::TaxRates::FinanceTeamForcedMeToCodeThis-- # Rails.application.config.spree.stock_splitters << Spree::Stock::Splitters::SecretLogicSplitter-- # Rails.application.config.spree.adjusters << Spree::Adjustable::Adjuster::TaxTheRich+ # Stock splitters and adjusters+ # Spree.stock_splitters << Spree::Stock::Splitters::SecretLogicSplitter+ # Spree.adjusters << Spree::Adjustable::Adjuster::TaxTheRich# Custom promotions- # Rails.application.config.spree.calculators.promotion_actions_create_adjustments << Spree::Calculators::PromotionActions::CreateAdjustments::AddDiscountForFriends- # Rails.application.config.spree.calculators.promotion_actions_create_item_adjustments << Spree::Calculators::PromotionActions::CreateItemAdjustments::FinanceTeamForcedMeToCodeThis- # Rails.application.config.spree.promotions.rules << Spree::Promotions::Rules::OnlyForVIPCustomers- # Rails.application.config.spree.promotions.actions << Spree::Promotions::Actions::GiftWithPurchase-- # Rails.application.config.spree.taxon_rules << Spree::TaxonRules::ProductsWithColor-- # Rails.application.config.spree.exports << Spree::Exports::Payments- # Rails.application.config.spree.reports << Spree::Reports::MassivelyOvercomplexReportForCfo-- # Themes and page builder- # Rails.application.config.spree.themes << Spree::Themes::NewShinyTheme- # Rails.application.config.spree.theme_layout_sections << Spree::PageSections::SuperImportantCeoBio- # Rails.application.config.spree.page_sections << Spree::PageSections::ContactFormToGetInTouch- # Rails.application.config.spree.page_blocks << Spree::PageBlocks::BigRedButtonToCallSales-- # Rails.application.config.spree_storefront.head_partials << 'spree/shared/that_js_snippet_that_marketing_forced_me_to_include'+ # Spree.calculators.promotion_actions_create_adjustments << Spree::Calculators::PromotionActions::CreateAdjustments::AddDiscountForFriends+ # Spree.calculators.promotion_actions_create_item_adjustments << Spree::Calculators::PromotionActions::CreateItemAdjustments::FinanceTeamForcedMeToCodeThis+ # Spree.promotions.rules << Spree::Promotions::Rules::OnlyForVIPCustomers+ # Spree.promotions.actions << Spree::Promotions::Actions::GiftWithPurchase++ # Taxon rules+ # Spree.taxon_rules << Spree::TaxonRules::ProductsWithColor++ # Exports and reports+ # Spree.export_types << Spree::Exports::Payments+ # Spree.reports << Spree::Reports::MassivelyOvercomplexReportForCfo++ # Page builder (themes, pages, sections, blocks)+ # Spree.page_builder.themes << Spree::Themes::NewShinyTheme+ # Spree.page_builder.theme_layout_sections << Spree::PageSections::SuperImportantCeoBio+ # Spree.page_builder.pages << Spree::Pages::CustomLandingPage+ # Spree.page_builder.page_sections << Spree::PageSections::ContactFormToGetInTouch+ # Spree.page_builder.page_blocks << Spree::PageBlocks::BigRedButtonToCallSales++ # Storefront partials+ # Spree.storefront.partials.head << 'spree/shared/that_js_snippet_that_marketing_forced_me_to_include'++ # Admin partials+ # Spree.admin.partials.product_form << 'spree/admin/products/custom_section'endSpree.user_class = <%= (options[:user_class].blank? ? 'Spree::LegacyUser' : options[:user_class]).inspect %>diff --git a/core/lib/spree/analytics.rb b/core/lib/spree/analytics.rbindex a5072187ef..6a1d3d554d 100644--- a/core/lib/spree/analytics.rb+++ b/core/lib/spree/analytics.rb@@ -1,11 +1,11 @@module Spreemodule Analyticsdef self.events- @@supported_events ||= Rails.application.config.spree.analytics_events+ @@supported_events ||= Spree.analytics_eventsenddef self.event_handlers- @@event_handlers ||= Rails.application.config.spree.analytics_event_handlers+ @@event_handlers ||= Spree.analytics_event_handlersendendenddiff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rbindex 417ecb7568..47d7092a5e 100644--- a/core/lib/spree/core.rb+++ b/core/lib/spree/core.rb@@ -168,6 +168,201 @@ module Spreeyield(Spree::Dependencies)end+ # Environment accessors for easier configuration access+ # Instead of Rails.application.config.spree.payment_methods+ # you can use Spree.payment_methods++ def self.calculators+ Rails.application.config.spree.calculators+ end++ def self.calculators=(value)+ Rails.application.config.spree.calculators = value+ end++ def self.validators+ Rails.application.config.spree.validators+ end++ def self.validators=(value)+ Rails.application.config.spree.validators = value+ end++ def self.payment_methods+ Rails.application.config.spree.payment_methods+ end++ def self.payment_methods=(value)+ Rails.application.config.spree.payment_methods = value+ end++ def self.adjusters+ Rails.application.config.spree.adjusters+ end++ def self.adjusters=(value)+ Rails.application.config.spree.adjusters = value+ end++ def self.stock_splitters+ Rails.application.config.spree.stock_splitters+ end++ def self.stock_splitters=(value)+ Rails.application.config.spree.stock_splitters = value+ end++ def self.promotions+ Rails.application.config.spree.promotions+ end++ def self.promotions=(value)+ Rails.application.config.spree.promotions = value+ end++ def self.line_item_comparison_hooks+ Rails.application.config.spree.line_item_comparison_hooks+ end++ def self.line_item_comparison_hooks=(value)+ Rails.application.config.spree.line_item_comparison_hooks = value+ end++ def self.data_feed_types+ Rails.application.config.spree.data_feed_types+ end++ def self.data_feed_types=(value)+ Rails.application.config.spree.data_feed_types = value+ end++ def self.export_types+ Rails.application.config.spree.export_types+ end++ def self.export_types=(value)+ Rails.application.config.spree.export_types = value+ end++ def self.import_types+ Rails.application.config.spree.import_types+ end++ def self.import_types=(value)+ Rails.application.config.spree.import_types = value+ end++ def self.taxon_rules+ Rails.application.config.spree.taxon_rules+ end++ def self.taxon_rules=(value)+ Rails.application.config.spree.taxon_rules = value+ end++ def self.reports+ Rails.application.config.spree.reports+ end++ def self.reports=(value)+ Rails.application.config.spree.reports = value+ end++ def self.translatable_resources+ Rails.application.config.spree.translatable_resources+ end++ def self.translatable_resources=(value)+ Rails.application.config.spree.translatable_resources = value+ end++ def self.metafield_types+ Rails.application.config.spree.metafield_types+ end++ def self.metafield_types=(value)+ Rails.application.config.spree.metafield_types = value+ end++ def self.metafield_enabled_resources+ Rails.application.config.spree.metafield_enabled_resources+ end++ def self.metafield_enabled_resources=(value)+ Rails.application.config.spree.metafield_enabled_resources = value+ end++ def self.analytics_events+ Rails.application.config.spree.analytics_events+ end++ def self.analytics_events=(value)+ Rails.application.config.spree.analytics_events = value+ end++ def self.analytics_event_handlers+ Rails.application.config.spree.analytics_event_handlers+ end++ def self.analytics_event_handlers=(value)+ Rails.application.config.spree.analytics_event_handlers = value+ end++ def self.integrations+ Rails.application.config.spree.integrations+ end++ def self.integrations=(value)+ Rails.application.config.spree.integrations = value+ end++ # Page Builder configuration accessor+ def self.page_builder+ @page_builder ||= PageBuilderConfig.new+ end++ class PageBuilderConfig+ def themes+ Rails.application.config.spree.themes+ end++ def themes=(value)+ Rails.application.config.spree.themes = value+ end++ def theme_layout_sections+ Rails.application.config.spree.theme_layout_sections+ end++ def theme_layout_sections=(value)+ Rails.application.config.spree.theme_layout_sections = value+ end++ def pages+ Rails.application.config.spree.pages+ end++ def pages=(value)+ Rails.application.config.spree.pages = value+ end++ def page_sections+ Rails.application.config.spree.page_sections+ end++ def page_sections=(value)+ Rails.application.config.spree.page_sections = value+ end++ def page_blocks+ Rails.application.config.spree.page_blocks+ end++ def page_blocks=(value)+ Rails.application.config.spree.page_blocks = value+ end+ end+module Coreautoload :ProductFilters, 'spree/core/product_filters'autoload :TokenGenerator, 'spree/core/token_generator'diff --git a/core/spec/lib/spree/core_environment_spec.rb b/core/spec/lib/spree/core_environment_spec.rbnew file mode 100644index 0000000000..7beb1dd28b--- /dev/null+++ b/core/spec/lib/spree/core_environment_spec.rb@@ -0,0 +1,250 @@+require 'spec_helper'++RSpec.describe 'Spree environment accessors' do+ describe 'getter methods' do+ it 'provides access to calculators' do+ expect(Spree.calculators).to eq(Rails.application.config.spree.calculators)+ expect(Spree.calculators).to respond_to(:shipping_methods)+ expect(Spree.calculators).to respond_to(:tax_rates)+ end++ it 'provides access to validators' do+ expect(Spree.validators).to eq(Rails.application.config.spree.validators)+ expect(Spree.validators).to respond_to(:addresses)+ end++ it 'provides access to payment_methods' do+ expect(Spree.payment_methods).to eq(Rails.application.config.spree.payment_methods)+ expect(Spree.payment_methods).to be_an(Array)+ end++ it 'provides access to adjusters' do+ expect(Spree.adjusters).to eq(Rails.application.config.spree.adjusters)+ expect(Spree.adjusters).to be_an(Array)+ end++ it 'provides access to stock_splitters' do+ expect(Spree.stock_splitters).to eq(Rails.application.config.spree.stock_splitters)+ expect(Spree.stock_splitters).to be_an(Array)+ end++ it 'provides access to promotions' do+ expect(Spree.promotions).to eq(Rails.application.config.spree.promotions)+ expect(Spree.promotions).to respond_to(:rules)+ expect(Spree.promotions).to respond_to(:actions)+ end++ it 'provides access to line_item_comparison_hooks' do+ expect(Spree.line_item_comparison_hooks).to eq(Rails.application.config.spree.line_item_comparison_hooks)+ end++ it 'provides access to data_feed_types' do+ expect(Spree.data_feed_types).to eq(Rails.application.config.spree.data_feed_types)+ expect(Spree.data_feed_types).to be_an(Array)+ end++ it 'provides access to export_types' do+ expect(Spree.export_types).to eq(Rails.application.config.spree.export_types)+ expect(Spree.export_types).to be_an(Array)+ end++ it 'provides access to import_types' do+ expect(Spree.import_types).to eq(Rails.application.config.spree.import_types)+ expect(Spree.import_types).to be_an(Array)+ end++ it 'provides access to taxon_rules' do+ expect(Spree.taxon_rules).to eq(Rails.application.config.spree.taxon_rules)+ expect(Spree.taxon_rules).to be_an(Array)+ end++ it 'provides access to reports' do+ expect(Spree.reports).to eq(Rails.application.config.spree.reports)+ expect(Spree.reports).to be_an(Array)+ end++ it 'provides access to translatable_resources' do+ expect(Spree.translatable_resources).to eq(Rails.application.config.spree.translatable_resources)+ expect(Spree.translatable_resources).to be_an(Array)+ end++ it 'provides access to metafield_types' do+ expect(Spree.metafield_types).to eq(Rails.application.config.spree.metafield_types)+ expect(Spree.metafield_types).to be_an(Array)+ end++ it 'provides access to metafield_enabled_resources' do+ expect(Spree.metafield_enabled_resources).to eq(Rails.application.config.spree.metafield_enabled_resources)+ expect(Spree.metafield_enabled_resources).to be_an(Array)+ end++ it 'provides access to analytics_events' do+ expect(Spree.analytics_events).to eq(Rails.application.config.spree.analytics_events)+ expect(Spree.analytics_events).to be_a(Hash)+ end++ it 'provides access to analytics_event_handlers' do+ expect(Spree.analytics_event_handlers).to eq(Rails.application.config.spree.analytics_event_handlers)+ expect(Spree.analytics_event_handlers).to be_an(Array)+ end++ it 'provides access to integrations' do+ expect(Spree.integrations).to eq(Rails.application.config.spree.integrations)+ expect(Spree.integrations).to be_an(Array)+ end+ end++ describe 'setter methods' do+ it 'allows setting payment_methods' do+ original = Spree.payment_methods.dup+ Spree.payment_methods = ['Custom::PaymentMethod']+ expect(Spree.payment_methods).to eq(['Custom::PaymentMethod'])+ expect(Rails.application.config.spree.payment_methods).to eq(['Custom::PaymentMethod'])+ # Restore original+ Spree.payment_methods = original+ end++ it 'allows setting stock_splitters' do+ original = Spree.stock_splitters.dup+ Spree.stock_splitters = ['Custom::Splitter']+ expect(Spree.stock_splitters).to eq(['Custom::Splitter'])+ expect(Rails.application.config.spree.stock_splitters).to eq(['Custom::Splitter'])+ # Restore original+ Spree.stock_splitters = original+ end++ it 'allows setting reports' do+ original = Spree.reports.dup+ Spree.reports = ['Custom::Report']+ expect(Spree.reports).to eq(['Custom::Report'])+ expect(Rails.application.config.spree.reports).to eq(['Custom::Report'])+ # Restore original+ Spree.reports = original+ end+ end++ describe 'nested accessors' do+ it 'allows access to calculators.shipping_methods' do+ expect(Spree.calculators.shipping_methods).to eq(Rails.application.config.spree.calculators.shipping_methods)+ expect(Spree.calculators.shipping_methods).to be_an(Array)+ expect(Spree.calculators.shipping_methods).to include(Spree::Calculator::Shipping::FlatRate)+ end++ it 'allows access to calculators.tax_rates' do+ expect(Spree.calculators.tax_rates).to eq(Rails.application.config.spree.calculators.tax_rates)+ expect(Spree.calculators.tax_rates).to be_an(Array)+ end++ it 'allows access to promotions.rules' do+ expect(Spree.promotions.rules).to eq(Rails.application.config.spree.promotions.rules)+ expect(Spree.promotions.rules).to be_an(Array)+ end++ it 'allows access to promotions.actions' do+ expect(Spree.promotions.actions).to eq(Rails.application.config.spree.promotions.actions)+ expect(Spree.promotions.actions).to be_an(Array)+ end++ it 'allows access to validators.addresses' do+ expect(Spree.validators.addresses).to eq(Rails.application.config.spree.validators.addresses)+ expect(Spree.validators.addresses).to be_an(Array)+ end+ end++ describe 'modifying nested values' do+ it 'allows modifying calculators.shipping_methods' do+ original = Spree.calculators.shipping_methods.dup+ Spree.calculators.shipping_methods << 'Custom::ShippingCalculator'+ expect(Spree.calculators.shipping_methods).to include('Custom::ShippingCalculator')+ # Restore original+ Spree.calculators.shipping_methods.clear+ Spree.calculators.shipping_methods.concat(original)+ end++ it 'allows modifying promotions.rules' do+ original = Spree.promotions.rules.dup+ Spree.promotions.rules << 'Custom::PromotionRule'+ expect(Spree.promotions.rules).to include('Custom::PromotionRule')+ # Restore original+ Spree.promotions.rules.clear+ Spree.promotions.rules.concat(original)+ end+ end++ describe 'Spree.page_builder' do+ it 'provides access to page builder configuration' do+ expect(Spree.page_builder).to be_a(Spree::PageBuilderConfig)+ end++ it 'memoizes the page_builder instance' do+ expect(Spree.page_builder).to be(Spree.page_builder)+ end++ describe 'getter methods' do+ it 'provides access to themes' do+ expect(Spree.page_builder.themes).to eq(Rails.application.config.spree.themes)+ expect(Spree.page_builder.themes).to be_an(Array)+ end++ it 'provides access to theme_layout_sections' do+ expect(Spree.page_builder.theme_layout_sections).to eq(Rails.application.config.spree.theme_layout_sections)+ expect(Spree.page_builder.theme_layout_sections).to be_an(Array)+ end++ it 'provides access to pages' do+ expect(Spree.page_builder.pages).to eq(Rails.application.config.spree.pages)+ expect(Spree.page_builder.pages).to be_an(Array)+ end++ it 'provides access to page_sections' do+ expect(Spree.page_builder.page_sections).to eq(Rails.application.config.spree.page_sections)+ expect(Spree.page_builder.page_sections).to be_an(Array)+ end++ it 'provides access to page_blocks' do+ expect(Spree.page_builder.page_blocks).to eq(Rails.application.config.spree.page_blocks)+ expect(Spree.page_builder.page_blocks).to be_an(Array)+ end+ end++ describe 'setter methods' do+ it 'allows setting themes' do+ original = Spree.page_builder.themes.dup+ Spree.page_builder.themes = ['Custom::Theme']+ expect(Spree.page_builder.themes).to eq(['Custom::Theme'])+ expect(Rails.application.config.spree.themes).to eq(['Custom::Theme'])+ # Restore original+ Spree.page_builder.themes = original+ end++ it 'allows setting pages' do+ original = Spree.page_builder.pages.dup+ Spree.page_builder.pages = ['Custom::Page']+ expect(Spree.page_builder.pages).to eq(['Custom::Page'])+ expect(Rails.application.config.spree.pages).to eq(['Custom::Page'])+ # Restore original+ Spree.page_builder.pages = original+ end++ it 'allows setting page_sections' do+ original = Spree.page_builder.page_sections.dup+ Spree.page_builder.page_sections = ['Custom::Section']+ expect(Spree.page_builder.page_sections).to eq(['Custom::Section'])+ expect(Rails.application.config.spree.page_sections).to eq(['Custom::Section'])+ # Restore original+ Spree.page_builder.page_sections = original+ end+ end++ describe 'modifying values' do+ it 'allows appending to themes' do+ original = Spree.page_builder.themes.dup+ Spree.page_builder.themes << 'Custom::NewTheme'+ expect(Spree.page_builder.themes).to include('Custom::NewTheme')+ # Restore original+ Spree.page_builder.themes.clear+ Spree.page_builder.themes.concat(original)+ end+ end+ end+enddiff --git a/core/spec/models/spree/import_spec.rb b/core/spec/models/spree/import_spec.rbindex 39b38835f9..1f5da527cf 100644--- a/core/spec/models/spree/import_spec.rb+++ b/core/spec/models/spree/import_spec.rb@@ -360,7 +360,7 @@ RSpec.describe Spree::Import, :job, type: :model dodescribe '.available_types' doit 'returns configured import types' do- expect(described_class.available_types).to eq(Rails.application.config.spree.import_types)+ expect(described_class.available_types).to eq(Spree.import_types)endenddiff --git a/core/spec/models/spree/order_merger_spec.rb b/core/spec/models/spree/order_merger_spec.rbindex 562f4afbcc..f3c9209ed5 100644--- a/core/spec/models/spree/order_merger_spec.rb+++ b/core/spec/models/spree/order_merger_spec.rb@@ -57,13 +57,13 @@ module Spreecontext 'merging using extension-specific line_item_comparison_hooks' dobefore do- Rails.application.config.spree.line_item_comparison_hooks << :foos_match+ Spree.line_item_comparison_hooks << :foos_matchallow(Spree::Variant).to receive(:price_modifier_amount).and_return(0.00)endafter do# reset to avoid test pollution- Rails.application.config.spree.line_item_comparison_hooks = Set.new+ Spree.line_item_comparison_hooks = Set.newendcontext '2 equal line items' dodiff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rbindex 8438aae4be..1f75685b0f 100644--- a/core/spec/models/spree/order_spec.rb+++ b/core/spec/models/spree/order_spec.rb@@ -741,12 +741,12 @@ describe Spree::Order, type: :model docontext 'match line item with options' dobefore do- Rails.application.config.spree.line_item_comparison_hooks << :foos_match+ Spree.line_item_comparison_hooks << :foos_matchendafter do# reset to avoid test pollution- Rails.application.config.spree.line_item_comparison_hooks = Set.new+ Spree.line_item_comparison_hooks = Set.newendit 'matches line item when options match' dodiff --git a/core/spec/models/spree/payment_method_spec.rb b/core/spec/models/spree/payment_method_spec.rbindex be28fb9b13..10bd15e130 100644--- a/core/spec/models/spree/payment_method_spec.rb+++ b/core/spec/models/spree/payment_method_spec.rb@@ -7,8 +7,8 @@ describe Spree::PaymentMethod, type: :model do# register test gatewaysbefore do- Rails.application.config.spree.payment_methods << TestGateway- Rails.application.config.spree.payment_methods << Spree::Gateway::Test+ Spree.payment_methods << TestGateway+ Spree.payment_methods << Spree::Gateway::Testendcontext 'visibility scopes' dodiff --git a/storefront/app/helpers/spree/storefront_helper.rb b/storefront/app/helpers/spree/storefront_helper.rbindex b4fba01acd..112459db99 100644--- a/storefront/app/helpers/spree/storefront_helper.rb+++ b/storefront/app/helpers/spree/storefront_helper.rb@@ -29,7 +29,7 @@ module Spree# @param options [Hash] The options/variables to pass to the partials# @return [String] The rendered partialsdef render_storefront_partials(section, options = {})- Spree::Storefront.partials.send(section.to_s.gsub('_partials', '').to_sym).map do |partial|+ Spree.storefront.partials.send(section.to_s.gsub('_partials', '').to_sym).map do |partial|render partial, optionsend.join.html_safeenddiff --git a/storefront/lib/generators/spree/storefront/theme/theme_generator.rb b/storefront/lib/generators/spree/storefront/theme/theme_generator.rbindex 30c36f6a37..9ea9924ea8 100644--- a/storefront/lib/generators/spree/storefront/theme/theme_generator.rb+++ b/storefront/lib/generators/spree/storefront/theme/theme_generator.rb@@ -22,7 +22,7 @@ module Spreedirectory "themes/default", "app/views/themes/#{file_name}"append_to_file "config/initializers/spree.rb", after: "Rails.application.config.after_initialize do\n" do- " Rails.application.config.spree.themes << Spree::Themes::#{class_name}\n"+ " Spree.page_builder.themes << Spree::Themes::#{class_name}\n"endenddiff --git a/storefront/lib/spree/storefront.rb b/storefront/lib/spree/storefront.rbindex c5d56100d3..a9d6ffb224 100644--- a/storefront/lib/spree/storefront.rb+++ b/storefront/lib/spree/storefront.rb@@ -15,12 +15,19 @@ require 'spree/storefront/engine'require 'spree/core/partials'module Spree- module Storefront- def self.partials+ def self.storefront+ @storefront ||= StorefrontConfig.new+ end++ class StorefrontConfig+ def partials@partials ||= Spree::Core::Partials.new(Rails.application.config.spree_storefront,Spree::Storefront::Engine::Environment)endend++ module Storefront+ endend