spree_core 6.0.0.beta3 → 6.0.0.rc1

data/lib/spree/core.rb

@@ -1,4 +1,3 @@
-require 'ostruct'
 require 'action_controller/railtie'
 require 'action_view/railtie'
 require 'active_job/railtie'
@@ -12,17 +11,23 @@ require 'action_mailer/railtie'
 
 
 require 'acts_as_list'
+require 'alba'
 require 'acts-as-taggable-on'
 require 'awesome_nested_set'
 require 'cancan'
 require 'countries/global'
 require 'friendly_id'
 require 'jwt'
+require 'liquid'
+require 'spree/core/emails/escaped_output'
 require 'monetize'
 require 'mobility'
+require 'mrml'
 require 'name_of_person'
 require 'nokogiri'
+require 'oj'
 require 'rails-html-sanitizer'
+require 'rails-i18n'
 require 'paranoia'
 require 'request_store'
 require 'ransack'
@@ -53,21 +58,29 @@ module Spree
     ActiveRecord::Base.connection.adapter_name.match?(/mysql|trilogy/i)
   end
 
+  # Class settings hold a name rather than the class itself, so a reloaded
+  # class is never served stale.
+  def self.resolve_class_setting(name, value, constantize)
+    raise "Spree.#{name} MUST be a String or Symbol object, not a Class object." if value.is_a?(Class)
+    return unless value.is_a?(String) || value.is_a?(Symbol)
+
+    constantize ? value.to_s.constantize : value.to_s
+  end
+  private_class_method :resolve_class_setting
+
+  def self.storage_service_name(value)
+    return Rails.application.config.active_storage.service unless value
+
+    value.to_sym if value.is_a?(String) || value.is_a?(Symbol)
+  end
+  private_class_method :storage_service_name
+
   def self.base_class(constantize: true)
-    @@base_class ||= 'Spree::Base'
-    if @@base_class.is_a?(Class)
-      raise 'Spree.base_class MUST be a String or Symbol object, not a Class object.'
-    elsif @@base_class.is_a?(String) || @@base_class.is_a?(Symbol)
-      constantize ? @@base_class.to_s.constantize : @@base_class.to_s
-    end
+    resolve_class_setting(:base_class, @@base_class ||= 'Spree::Base', constantize)
   end
 
   def self.customer_class(constantize: true)
-    if @@customer_class.is_a?(Class)
-      raise 'Spree.customer_class MUST be a String or Symbol object, not a Class object.'
-    elsif @@customer_class.is_a?(String) || @@customer_class.is_a?(Symbol)
-      constantize ? @@customer_class.to_s.constantize : @@customer_class.to_s
-    end
+    resolve_class_setting(:customer_class, @@customer_class, constantize)
   end
 
   # @deprecated Spree.user_class was renamed to Spree.customer_class in 6.0; removed in 6.1.
@@ -83,39 +96,19 @@ module Spree
   end
 
   def self.admin_user_class(constantize: true)
-    if @@admin_user_class.is_a?(Class)
-      raise 'Spree.admin_user_class MUST be a String or Symbol object, not a Class object.'
-    elsif @@admin_user_class.is_a?(String) || @@admin_user_class.is_a?(Symbol)
-      constantize ? @@admin_user_class.to_s.constantize : @@admin_user_class.to_s
-    end
+    resolve_class_setting(:admin_user_class, @@admin_user_class, constantize)
   end
 
   def self.private_storage_service_name
-    if @@private_storage_service_name
-      if @@private_storage_service_name.is_a?(String) || @@private_storage_service_name.is_a?(Symbol)
-        @@private_storage_service_name.to_sym
-      end
-    else
-      Rails.application.config.active_storage.service
-    end
+    storage_service_name(@@private_storage_service_name)
   end
 
   def self.public_storage_service_name
-    if @@public_storage_service_name
-      if @@public_storage_service_name.is_a?(String) || @@public_storage_service_name.is_a?(Symbol)
-        @@public_storage_service_name.to_sym
-      end
-    else
-      Rails.application.config.active_storage.service
-    end
-  end
-
-  def self.root_domain
-    @@root_domain
+    storage_service_name(@@public_storage_service_name)
   end
 
   def self.queues
-    @@queues ||= OpenStruct.new(
+    @@queues ||= ActiveSupport::OrderedOptions.new.update(
       default: :default,
       events: :default,
       exports: :default,
@@ -147,7 +140,7 @@ module Spree
 
       # @deprecated Renamed with the stock level rename in 6.0; removed in 6.1.
       #
-      # The writer matters as much as the reader here: this is an OpenStruct, so
+      # The writer matters as much as the reader here: these are ordered options, so
       # an existing initializer assigning the old name would quietly define a
       # field nobody reads and its jobs would fall back to the default queue.
       queues.define_singleton_method(:stock_location_stock_items) do
@@ -206,17 +199,7 @@ module Spree
   # @param constantize [Boolean] whether to return the class or the string
   # @return [Class, String] the adapter class or its name
   def self.events_adapter_class(constantize: true)
-    @@events_adapter_class ||= 'Spree::Events::Adapters::ActiveSupportNotifications'
-
-    if @@events_adapter_class.is_a?(Class)
-      raise 'Spree.events_adapter_class MUST be a String or Symbol object, not a Class object.'
-    elsif @@events_adapter_class.is_a?(String) || @@events_adapter_class.is_a?(Symbol)
-      constantize ? @@events_adapter_class.to_s.constantize : @@events_adapter_class.to_s
-    end
-  end
-
-  def self.google_places_api_key
-    @@google_places_api_key
+    resolve_class_setting(:events_adapter_class, @@events_adapter_class ||= 'Spree::Events::Adapters::ActiveSupportNotifications', constantize)
   end
 
   def self.always_use_translations?
@@ -239,20 +222,12 @@ module Spree
     ->(locale) { locale.name == Spree::Current.content_locale }
   end
 
-  # Stable anonymous identifier for this Spree installation. Generated once,
-  # persisted in the preferences store and reused afterwards. It identifies the
-  # installation only
+  # Stable anonymous identifier for this Spree installation, kept on the
+  # default store, which generates it when it is first saved.
   #
-  # Deliberately not memoized: the persisted preference is the single source
-  # of truth, so processes that race to generate the first value converge on
-  # the winning row at the next read instead of each holding a different id
-  # for their lifetime.
-  #
-  # @return [String] UUID
+  # @return [String, nil] UUID, or nil before the default store exists
   def self.install_id
-    store = Spree::Preferences::Store.instance
-    store.get('spree/install_id') { nil }.presence ||
-      SecureRandom.uuid.tap { |id| store.set('spree/install_id', id) }
+    Spree::Store.default&.preferred_install_id
   end
 
   # Used to configure Spree.
@@ -285,41 +260,24 @@ module Spree
     yield(Spree::Dependencies)
   end
 
+  def self.spree_config
+    Rails.application.config.spree
+  end
+  private_class_method :spree_config
+
   # 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
+  singleton_class.delegate :calculators, :calculators=, :validators, :validators=, :payment_methods, :payment_methods=,
+                           :adjusters, :adjusters=, :fulfillment_providers, :fulfillment_providers=, :tracking_carriers,
+                           :tracking_carriers=, :stock_splitters, :stock_splitters=, :delivery_method_rules,
+                           :delivery_method_rules=, :order_routing, :order_routing=, :promotions, :promotions=,
+                           :line_item_comparison_hooks, :line_item_comparison_hooks=, :data_feed_types, :data_feed_types=,
+                           :export_types, :export_types=, :import_types, :import_types=, :taxon_rules, :taxon_rules=,
+                           :translatable_resources, :translatable_resources=, :custom_fields, :integrations, :integrations=,
+                           :pricing, :pricing=,
+                           to: :spree_config
 
   # Model names a {Spree::Media} row may be placed on — where a file *lives*.
   # The viewable column is polymorphic, so this is what keeps it from accepting
@@ -331,13 +289,7 @@ module Spree
   #   Spree.media_viewable_types += ['MyApp::Lookbook']
   #
   # @return [Array<String>]
-  def self.media_viewable_types
-    Rails.application.config.spree.media_viewable_types
-  end
-
-  def self.media_viewable_types=(value)
-    Rails.application.config.spree.media_viewable_types = value
-  end
+  singleton_class.delegate :media_viewable_types, :media_viewable_types=, to: :spree_config
 
   # The tax engine used when a market names none — the fallback behind
   # {Spree::Purchase::Taxation#tax_provider}, which is what call sites actually
@@ -366,60 +318,30 @@ module Spree
   # name and finding out at checkout.
   #
   # @return [Array<Class>]
-  def self.tax_providers
-    Rails.application.config.spree.tax_providers
-  end
-
-  def self.tax_providers=(value)
-    Rails.application.config.spree.tax_providers = value
-  end
+  singleton_class.delegate :tax_providers, :tax_providers=, to: :spree_config
 
   # Pricing engines a store can be pointed at. Connector gems append their own,
   # so a merchant picks from what is actually installed.
   #
   # @return [Array<Class>]
-  def self.pricing_providers
-    Rails.application.config.spree.pricing_providers
-  end
-
-  def self.pricing_providers=(value)
-    Rails.application.config.spree.pricing_providers = value
-  end
+  singleton_class.delegate :pricing_providers, :pricing_providers=, to: :spree_config
 
   # Inventory sources a store can be pointed at.
   #
   # @return [Array<Class>]
-  def self.inventory_providers
-    Rails.application.config.spree.inventory_providers
-  end
-
-  def self.inventory_providers=(value)
-    Rails.application.config.spree.inventory_providers = value
-  end
+  singleton_class.delegate :inventory_providers, :inventory_providers=, to: :spree_config
 
   # How sellers get paid. Core ships {Spree::PayoutProvider::System}, which
   # keeps the books and leaves the operator to settle; a provider gem appends
   # one that moves the money itself.
   #
   # @return [Array<Class>]
-  def self.payout_providers
-    Rails.application.config.spree.payout_providers
-  end
-
-  def self.payout_providers=(value)
-    Rails.application.config.spree.payout_providers = value
-  end
+  singleton_class.delegate :payout_providers, :payout_providers=, to: :spree_config
 
   # The provider a store pays through when it has named none.
   #
   # @return [Class]
-  def self.default_payout_provider
-    Rails.application.config.spree.default_payout_provider
-  end
-
-  def self.default_payout_provider=(value)
-    Rails.application.config.spree.default_payout_provider = value
-  end
+  singleton_class.delegate :default_payout_provider, :default_payout_provider=, to: :spree_config
 
   # Validator enforcing the password policy on the default auth models
   # ({Spree::Customer}, {Spree::AdminUser}). Defaults to
@@ -433,80 +355,30 @@ module Spree
   #   Spree.password_validator = MyApp::PasswordValidator
   #
   # @return [Class]
-  def self.password_validator
-    Rails.application.config.spree.password_validator
-  end
-
-  def self.password_validator=(value)
-    Rails.application.config.spree.password_validator = value
-  end
+  singleton_class.delegate :password_validator, :password_validator=, to: :spree_config
 
-  def self.fulfillment_providers
-    Rails.application.config.spree.fulfillment_providers
-  end
-
-  def self.fulfillment_providers=(value)
-    Rails.application.config.spree.fulfillment_providers = value
-  end
-
-  def self.tracking_carriers
-    Rails.application.config.spree.tracking_carriers
-  end
-
-  def self.tracking_carriers=(value)
-    Rails.application.config.spree.tracking_carriers = 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
 
   # Commission rule kinds selectable on a commission rate.
   #
   # @return [Array<Class>]
-  def self.commission_rules
-    Rails.application.config.spree.commission_rules
-  end
-
-  def self.commission_rules=(value)
-    Rails.application.config.spree.commission_rules = value
-  end
+  singleton_class.delegate :commission_rules, :commission_rules=, to: :spree_config
 
   # Seller onboarding requirement kinds an operator can configure
   # (docs/plans/6.0-seller-onboarding-requirements.md).
   #
   # @return [Array<Class>]
-  def self.seller_requirements
-    Rails.application.config.spree.seller_requirements
-  end
-
-  def self.seller_requirements=(value)
-    Rails.application.config.spree.seller_requirements = value
-  end
-
-  def self.delivery_method_rules
-    Rails.application.config.spree.delivery_method_rules
-  end
-
-  def self.delivery_method_rules=(value)
-    Rails.application.config.spree.delivery_method_rules = value
-  end
+  singleton_class.delegate :seller_requirements, :seller_requirements=, to: :spree_config
 
   # Quoting strategies selectable on a delivery method.
   #
   # @return [Array<Class>]
-  def self.delivery_rate_providers
-    Rails.application.config.spree.delivery_rate_providers
-  end
+  singleton_class.delegate :delivery_rate_providers, :delivery_rate_providers=, to: :spree_config
 
-  def self.delivery_rate_providers=(value)
-    Rails.application.config.spree.delivery_rate_providers = value
-  end
+  # Third-party pickup point networks selectable on a pickup-point delivery
+  # method. Empty in core; carrier gems append theirs.
+  #
+  # @return [Array<Class>]
+  singleton_class.delegate :pickup_point_providers, :pickup_point_providers=, to: :spree_config
 
   # Re-resolves every provider registry entry by name, in place.
   #
@@ -525,7 +397,8 @@ module Spree
   # @return [void]
   def self.refresh_provider_registries!
     [Rails.application.config.spree.delivery_rate_providers,
-     Rails.application.config.spree.fulfillment_providers].compact.each do |registry|
+     Rails.application.config.spree.fulfillment_providers,
+     Rails.application.config.spree.pickup_point_providers].compact.each do |registry|
       registry.map! { |entry| entry.is_a?(Module) && entry.name ? entry.name.constantize : entry }
     end
   end
@@ -535,80 +408,12 @@ module Spree
   # deliverable elsewhere (a licensing system, a code pool).
   #
   # @return [Array<Class>]
-  def self.digital_asset_providers
-    Rails.application.config.spree.digital_asset_providers
-  end
-
-  def self.digital_asset_providers=(value)
-    Rails.application.config.spree.digital_asset_providers = value
-  end
+  singleton_class.delegate :digital_asset_providers, :digital_asset_providers=, to: :spree_config
 
   # Fulfillment profile kinds selectable when creating a profile.
   #
   # @return [Array<Class>]
-  def self.delivery_profile_types
-    Rails.application.config.spree.delivery_profile_types
-  end
-
-  def self.delivery_profile_types=(value)
-    Rails.application.config.spree.delivery_profile_types = value
-  end
-
-  def self.order_routing
-    Rails.application.config.spree.order_routing
-  end
-
-  def self.order_routing=(value)
-    Rails.application.config.spree.order_routing = 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
+  singleton_class.delegate :delivery_profile_types, :delivery_profile_types=, to: :spree_config
 
   # Class-name strings (`'Spree::Product'`, `'Spree::Order'`,
   # `Spree.customer_class.to_s`, plus any registered by apps) for resources that
@@ -617,13 +422,7 @@ module Spree
   # the list in an initializer:
   #
   #   Spree.taggable_types << 'MyApp::Seller'
-  def self.taggable_types
-    Rails.application.config.spree.taggable_types
-  end
-
-  def self.taggable_types=(value)
-    Rails.application.config.spree.taggable_types = value
-  end
+  singleton_class.delegate :taggable_types, :taggable_types=, to: :spree_config
 
   # Class-name strings for the models that may be recorded as having performed
   # an action — what an `acted_by` association's `*_type` column is allowed to
@@ -636,13 +435,7 @@ module Spree
   # See docs/plans/6.0-action-actors.md.
   #
   # @return [Array<String>]
-  def self.actor_classes
-    Rails.application.config.spree.actor_classes
-  end
-
-  def self.actor_classes=(value)
-    Rails.application.config.spree.actor_classes = value
-  end
+  singleton_class.delegate :actor_classes, :actor_classes=, to: :spree_config
 
 
   # Registry of the Getting Started onboarding tasks shown on the admin
@@ -653,31 +446,11 @@ module Spree
     @store_setup_tasks ||= Spree::SetupTasks.new
   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.custom_fields
-    Rails.application.config.spree.custom_fields
-  end
-
   def self.metafields
     Spree::Deprecation.warn('Spree.metafields is deprecated and will be removed in Spree 6.1. Use Spree.custom_fields instead.') if defined?(Spree::Deprecation)
     custom_fields
   end
 
-  def self.integrations
-    Rails.application.config.spree.integrations
-  end
-
-  def self.integrations=(value)
-    Rails.application.config.spree.integrations = value
-  end
-
   # Registry mapping a numbered resource to the generator that produces its
   # document numbers. With no entry, the store's `document_number_format`
   # preference picks between the sequential and random strategies.
@@ -685,8 +458,13 @@ module Spree
   # @return [Spree::NumberGenerators::Registry]
   # @example Custom order numbers
   #   Spree.number_generators[:order] = 'MyApp::BranchOrderNumbers'
-  def self.number_generators
-    Rails.application.config.spree.number_generators
+  singleton_class.delegate :number_generators, to: :spree_config
+
+  # The email templates merchants may edit in the dashboard.
+  #
+  # @return [Spree::Emails::EditableTemplates]
+  def self.editable_email_templates
+    @editable_email_templates ||= Spree::Emails::EditableTemplates.new
   end
 
   # Event subscribers that handle lifecycle and custom events
@@ -694,21 +472,7 @@ module Spree
   #   Spree.subscribers << MyApp::OrderNotificationSubscriber
   # @example Removing a built-in subscriber
   #   Spree.subscribers.delete(Spree::ExportSubscriber)
-  def self.subscribers
-    Rails.application.config.spree.subscribers
-  end
-
-  def self.subscribers=(value)
-    Rails.application.config.spree.subscribers = value
-  end
-
-  def self.pricing
-    Rails.application.config.spree.pricing
-  end
-
-  def self.pricing=(value)
-    Rails.application.config.spree.pricing = value
-  end
+  singleton_class.delegate :subscribers, :subscribers=, to: :spree_config
 
   # Registry of authentication strategy classes for the Store API.
   # @return [Spree::Authentication::StrategyRegistry]
@@ -716,29 +480,17 @@ module Spree
   #   Spree.store_authentication_strategies.add(:auth0, MyApp::Auth::Auth0Strategy)
   # @example Removing a strategy
   #   Spree.store_authentication_strategies.remove(:email)
-  def self.store_authentication_strategies
-    Rails.application.config.spree.store_authentication_strategies
-  end
-
   # @param value [Spree::Authentication::StrategyRegistry] the registry to use for Store API authentication dispatch
   # @return [Spree::Authentication::StrategyRegistry] the assigned registry
-  def self.store_authentication_strategies=(value)
-    Rails.application.config.spree.store_authentication_strategies = value
-  end
+  singleton_class.delegate :store_authentication_strategies, :store_authentication_strategies=, to: :spree_config
 
   # Registry of authentication strategy classes for the Admin API.
   # @return [Spree::Authentication::StrategyRegistry]
   # @example Registering an SSO strategy for admin users
   #   Spree.admin_authentication_strategies.add(:okta, MyApp::Auth::OktaStrategy)
-  def self.admin_authentication_strategies
-    Rails.application.config.spree.admin_authentication_strategies
-  end
-
   # @param value [Spree::Authentication::StrategyRegistry] the registry to use for Admin API authentication dispatch
   # @return [Spree::Authentication::StrategyRegistry] the assigned registry
-  def self.admin_authentication_strategies=(value)
-    Rails.application.config.spree.admin_authentication_strategies = value
-  end
+  singleton_class.delegate :admin_authentication_strategies, :admin_authentication_strategies=, to: :spree_config
 
   # Registry of authentication strategy classes for the Seller API.
   #
@@ -750,50 +502,14 @@ module Spree
   # @return [Spree::Authentication::StrategyRegistry]
   # @example Registering an SSO strategy for seller users
   #   Spree.seller_authentication_strategies.add(:okta, MyApp::Auth::OktaStrategy)
-  def self.seller_authentication_strategies
-    Rails.application.config.spree.seller_authentication_strategies
-  end
-
   # @param value [Spree::Authentication::StrategyRegistry] the registry to use for Seller API authentication dispatch
   # @return [Spree::Authentication::StrategyRegistry] the assigned registry
-  def self.seller_authentication_strategies=(value)
-    Rails.application.config.spree.seller_authentication_strategies = value
-  end
+  singleton_class.delegate :seller_authentication_strategies, :seller_authentication_strategies=, to: :spree_config
 
   # Semantic reporting registry — the queryable metric/dimension vocabulary.
-  # Not to be confused with +Spree.analytics+ (storefront event tracking).
   #
   # @return [Spree::Reporting::Registry]
-  def self.reporting
-    Rails.application.config.spree.reporting
-  end
-
-  def self.reporting=(value)
-    Rails.application.config.spree.reporting = value
-  end
-
-  def self.analytics
-    @analytics ||= AnalyticsConfig.new
-  end
-
-  # Group analytics configuration options together, but still make it backwards compatible.
-  class AnalyticsConfig
-    def events
-      Rails.application.config.spree.analytics_events
-    end
-
-    def events=(value)
-      Rails.application.config.spree.analytics_events = value
-    end
-
-    def handlers
-      Rails.application.config.spree.analytics_event_handlers
-    end
-
-    def handlers=(value)
-      Rails.application.config.spree.analytics_event_handlers = value
-    end
-  end
+  singleton_class.delegate :reporting, :reporting=, to: :spree_config
 
   # The permission catalog — the grant vocabulary shared by staff roles and
   # secret API key scopes. Roles themselves are data (Spree::Role#permissions);
@@ -905,7 +621,6 @@ require 'spree/core/version'
 require 'spree/core/number_generator'
 require 'spree/number_generators/registry'
 require 'spree/migrations'
-require 'spree/translation_migrations'
 require 'spree/validators'
 require 'spree/core/engine'
 
@@ -917,7 +632,6 @@ require 'spree/translations'
 require 'spree/money'
 require 'spree/service_module'
 require 'spree/workflow'
-require 'spree/analytics'
 require 'spree/reporting'
 require 'spree/events'
 require 'spree/store_scope_guard'
@@ -927,18 +641,19 @@ require 'spree/store_scope_guard'
 require 'spree/checkout/step'
 require 'spree/checkout/requirement'
 require 'spree/checkout/registry'
+require 'spree/emails/editable_templates'
 require 'spree/checkout/default_requirements'
 require 'spree/checkout/requirements'
 
 require 'spree/core/controller_helpers/store'
 
-require 'spree/core/preferences/store'
-require 'spree/core/preferences/scoped_store'
 require 'spree/core/preferences/runtime_configuration'
 require 'spree/core/preferences/masking'
+require 'spree/core/preferences/json_conversion'
 
 require 'spree/core/permission_configuration'
 require 'spree/core/ransack_configuration'
 require 'spree/core/pricing/context'
 require 'spree/core/pricing/price_resolution'
 require 'spree/core/pricing/resolver'
+require 'spree/core/tax/provider_error'