spree_core 5.6.0 → 6.0.0.beta1

data/lib/spree/core/engine.rb

@@ -10,7 +10,23 @@ module Spree
                                :dependencies,
                                :payment_methods,
                                :adjusters,
+                               :media_viewable_types,
+                               :default_tax_provider,
+                               :tax_providers,
+                               :pricing_providers,
+                               :inventory_providers,
+                               :default_payout_provider,
+                               :payout_providers,
+                               :password_validator,
+                               :fulfillment_providers,
+                               :tracking_carriers,
                                :stock_splitters,
+                               :commission_rules,
+                               :delivery_method_rules,
+                               :seller_requirements,
+                               :delivery_rate_providers,
+                               :digital_asset_providers,
+                               :delivery_profile_types,
                                :order_routing,
                                :promotions,
                                :pricing,
@@ -19,6 +35,8 @@ module Spree
                                :export_types,
                                :import_types,
                                :taxon_rules,
+                               :collection_rules,
+                               :time_based_collection_rules,
                                :themes,
                                :theme_layout_sections,
                                :pages,
@@ -27,19 +45,24 @@ module Spree
                                :reports,
                                :translatable_resources,
                                :taggable_types,
-                               :metafields,
+                               :custom_fields,
+                               :reporting,
                                :analytics_events,
                                :analytics_event_handlers,
                                :integrations,
+                               :number_generators,
                                :subscribers,
                                :store_authentication_strategies,
-                               :admin_authentication_strategies)
+                               :admin_authentication_strategies,
+                               :seller_authentication_strategies)
       SpreeCalculators = Struct.new(:shipping_methods, :tax_rates, :promotion_actions_create_adjustments, :promotion_actions_create_item_adjustments)
       PromoEnvironment = Struct.new(:rules, :actions)
       PricingEnvironment = Struct.new(:rules)
       OrderRoutingEnvironment = Struct.new(:strategies, :rules)
-      SpreeValidators = Struct.new(:addresses)
-      MetafieldsEnvironment = Struct.new(:types, :enabled_resources)
+      # Spree::Validators, not a Struct: the sets carry register/unregister so
+      # a host can drop a core rule (see Spree.validators.addresses).
+      SpreeValidators = Spree::Validators
+      CustomFieldsEnvironment = Struct.new(:types, :enabled_resources)
       isolate_namespace Spree
       engine_name 'spree'
 
@@ -85,6 +108,12 @@ module Spree
       initializer 'spree.register.calculators', before: :after_initialize do |app|
       end
 
+      # Seeded before application initializers so a host's
+      # `config/initializers/spree.rb` can register custom generators.
+      initializer 'spree.register.number_generators', before: :load_config_initializers do |app|
+        app.config.spree.number_generators = Spree::NumberGenerators::Registry.new
+      end
+
       initializer 'spree.register.stock_splitters', before: :load_config_initializers do |app|
       end
 
@@ -107,10 +136,69 @@ module Spree
         app.config.spree.order_routing.rules = []
       end
 
-      initializer 'spree.register.metafields' do |app|
-        app.config.spree.metafields = MetafieldsEnvironment.new
-        app.config.spree.metafields.types = []
-        app.config.spree.metafields.enabled_resources = []
+      # Seeded early for the same reason as order routing: initializer files
+      # append custom rule kinds. Core defaults concatenate in after_initialize.
+      initializer 'spree.register.commission_rules', before: :load_config_initializers do |app|
+        app.config.spree.commission_rules = []
+      end
+
+      initializer 'spree.register.delivery_method_rules', before: :load_config_initializers do |app|
+        app.config.spree.delivery_method_rules = []
+      end
+
+      # Seeded early like the other kind registries: an initializer file adds
+      # a marketplace's own requirement kinds, core's concatenate after.
+      initializer 'spree.register.seller_requirements', before: :load_config_initializers do |app|
+        app.config.spree.seller_requirements = []
+      end
+
+      initializer 'spree.register.delivery_rate_providers', before: :load_config_initializers do |app|
+        app.config.spree.delivery_rate_providers = []
+      end
+
+      # Same reason again: a tax provider gem, or a host app, registers its
+      # engine from an initializer file. Core's Internal concatenates below.
+      initializer 'spree.register.tax_providers', before: :load_config_initializers do |app|
+        app.config.spree.tax_providers = []
+      end
+
+      # Same reason as the tax providers above: a connector gem registers its
+      # engine from an initializer file, and core's Internal concatenates below.
+      initializer 'spree.register.pricing_providers', before: :load_config_initializers do |app|
+        app.config.spree.pricing_providers = []
+      end
+
+      initializer 'spree.register.inventory_providers', before: :load_config_initializers do |app|
+        app.config.spree.inventory_providers = []
+      end
+
+      # How sellers get paid. A provider gem — the Stripe Connect one, or a
+      # marketplace's own — registers from an initializer file; core's
+      # record-only System concatenates below.
+      initializer 'spree.register.payout_providers', before: :load_config_initializers do |app|
+        app.config.spree.payout_providers = []
+      end
+
+      initializer 'spree.register.digital_asset_providers', before: :load_config_initializers do |app|
+        app.config.spree.digital_asset_providers = []
+      end
+
+      initializer 'spree.register.delivery_profile_types', before: :load_config_initializers do |app|
+        app.config.spree.delivery_profile_types = []
+      end
+
+      initializer 'spree.register.custom_fields' do |app|
+        app.config.spree.custom_fields = CustomFieldsEnvironment.new
+        app.config.spree.custom_fields.types = []
+        app.config.spree.custom_fields.enabled_resources = []
+      end
+
+      # Seed the reporting vocabulary before app initializers so applications
+      # and extensions can register their own metrics/dimensions in
+      # config/initializers (see docs/plans/6.0-analytics-semantic-layer.md).
+      initializer 'spree.register.reporting', before: :load_config_initializers do |app|
+        app.config.spree.reporting = Spree::Reporting::Registry.new
+        Spree::Reporting::DefaultVocabulary.install(app.config.spree.reporting)
       end
 
       # We need to define promotions rules here so extensions and existing apps
@@ -129,9 +217,21 @@ module Spree
         app.config.spree.pricing.rules = []
       end
 
+      # Country and subdivision names are translated by the countries gem, which
+      # only loads the locales it is told about. This runs after initialization
+      # because Spree.available_locales reads i18n configuration that is not
+      # populated while initializers are still running.
+      config.after_initialize do
+        ISO3166.configure do |iso_config|
+          iso_config.locales = (Spree.available_locales.map { |locale| locale.to_s.downcase } << 'en').uniq
+        end
+
+        Spree::IsoData.reset!
+      end
+
       # Promotion rules need to be evaluated on after initialize otherwise
-      # Spree.user_class would be nil and users might experience errors related
-      # to malformed model associations (Spree.user_class is only defined on
+      # Spree.customer_class would be nil and users might experience errors related
+      # to malformed model associations (Spree.customer_class is only defined on
       # the app initializer)
       config.after_initialize do
         Rails.application.config.spree.calculators.shipping_methods = [
@@ -143,14 +243,9 @@ module Spree
           Spree::Calculator::Shipping::DigitalDelivery,
         ]
 
-        Rails.application.config.spree.calculators.tax_rates = [
-          Spree::Calculator::DefaultTax
-        ]
-
         Rails.application.config.spree.stock_splitters = [
-          Spree::Stock::Splitter::ShippingCategory,
-          Spree::Stock::Splitter::Backordered,
-          Spree::Stock::Splitter::Digital
+          Spree::Stock::Splitter::DeliveryProfile,
+          Spree::Stock::Splitter::Backordered
         ]
 
         Rails.application.config.spree.payment_methods = [
@@ -161,16 +256,109 @@ module Spree
         ]
 
         Rails.application.config.spree.adjusters = [
-          Spree::Adjustable::Adjuster::Promotion,
-          Spree::Adjustable::Adjuster::Tax
+          Spree::Adjusters::Promotion
+        ]
+
+        # What a media file can be placed on. The polymorphic viewable column
+        # would otherwise accept any constant name, and everything downstream —
+        # store resolution, counter caches, the usage panel — reasons about the
+        # registered set. An extension placing media on its own model appends
+        # to this from an initializer.
+        Rails.application.config.spree.media_viewable_types = %w[
+          Spree::Product
+          Spree::Variant
+          Spree::Category
+          Spree::Collection
+        ]
+
+
+        # The fallback engine when a market names none (see docs/plans/6.0-tax-provider.md).
+        # Assigned only if an initializer file has not already named one — an app
+        # that picks its own default must keep it.
+        Rails.application.config.spree.default_tax_provider ||= Spree::TaxProvider::Internal
+
+        # Engines a market can select. Concatenated, not assigned: provider gems
+        # and host apps append theirs from initializer files, which run first.
+        Rails.application.config.spree.tax_providers.concat [Spree::TaxProvider::Internal]
+
+        # Pricing and inventory sources. Internal is Spree's own catalog and
+        # stock records; connector gems append theirs so a merchant picks from
+        # what is installed (see docs/plans/6.0-third-party-pricing-inventory.md).
+        Rails.application.config.spree.pricing_providers.concat [Spree::PricingProvider::Internal]
+        Rails.application.config.spree.inventory_providers.concat [Spree::InventoryProvider::Internal]
+        # 'manual' is the negotiated-price marker on line items, so no pricing
+        # engine may answer under it — fail the boot rather than the checkout.
+        Spree::PricingProvider.verify_registry!
+
+        # How sellers are paid when a store names nothing: the books are kept
+        # and the operator settles offline. Assigned only if an initializer has
+        # not already chosen one.
+        Rails.application.config.spree.default_payout_provider ||= Spree::PayoutProvider::System
+        Rails.application.config.spree.payout_providers.concat [Spree::PayoutProvider::System]
+
+        # Password policy for the default auth models. Swap for corporate rules,
+        # breach-list lookups or entropy scoring.
+        Rails.application.config.spree.password_validator = Spree::PasswordLengthValidator
+
+        Rails.application.config.spree.fulfillment_providers = [
+          Spree::FulfillmentProvider::Manual,
+          Spree::FulfillmentProvider::Digital,
+          Spree::FulfillmentProvider::Pickup,
+          Spree::FulfillmentProvider::PickupPoint
+        ]
+
+        # Carriers a merchant can pin a tracking number to, with the public
+        # tracking page each one offers (`:tracking` is the placeholder).
+        # Hosts and extensions add their own:
+        #   Spree.tracking_carriers['my_courier'] = { name: '...', url: '...' }
+        # Slugs match the tracking_number gem's courier codes where both know
+        # the carrier, so a number auto-detected from its format lands on the
+        # same entry a merchant would have picked by hand.
+        Rails.application.config.spree.tracking_carriers = {
+          'ups' => { name: 'UPS', url: 'https://www.ups.com/track?tracknum=:tracking' },
+          'usps' => { name: 'USPS', url: 'https://tools.usps.com/go/TrackConfirmAction?tLabels=:tracking' },
+          'fedex' => { name: 'FedEx', url: 'https://www.fedex.com/fedextrack/?trknbr=:tracking' },
+          'dhl' => { name: 'DHL Express', url: 'https://www.dhl.com/global-en/home/tracking.html?tracking-id=:tracking' },
+          'dpd' => { name: 'DPD', url: 'https://tracking.dpd.de/status/en_US/parcel/:tracking' },
+          'gls' => { name: 'GLS', url: 'https://gls-group.eu/EU/en/parcel-tracking?match=:tracking' },
+          'inpost' => { name: 'InPost', url: 'https://inpost.pl/sledzenie-przesylek?number=:tracking' },
+          'royal_mail' => { name: 'Royal Mail', url: 'https://www.royalmail.com/track-your-item#/tracking-results/:tracking' },
+          'evri' => { name: 'Evri', url: 'https://www.evri.com/track/parcel/:tracking' },
+          'canada_post' => { name: 'Canada Post', url: 'https://www.canadapost-postescanada.ca/track-reperage/en#/search?searchFor=:tracking' },
+          'australia_post' => { name: 'Australia Post', url: 'https://auspost.com.au/mypost/track/#/details/:tracking' },
+          'postnl' => { name: 'PostNL', url: 'https://jouw.postnl.nl/track-and-trace/:tracking' },
+          'colissimo' => { name: 'Colissimo', url: 'https://www.laposte.fr/outils/suivre-vos-envois?code=:tracking' },
+          'chronopost' => { name: 'Chronopost', url: 'https://www.chronopost.fr/tracking-no-cms/suivi-page?listeNumerosLT=:tracking' },
+          'poczta_polska' => { name: 'Poczta Polska', url: 'https://emonitoring.poczta-polska.pl/?numer=:tracking' },
+          'deutsche_post' => { name: 'Deutsche Post DHL', url: 'https://www.dhl.de/de/privatkunden/pakete-empfangen/verfolgen.html?piececode=:tracking' }
+        }
+
+
+        # Quoting strategies selectable on a delivery method. Internal prices
+        # through the method's calculator; carrier gems append theirs.
+        Rails.application.config.spree.delivery_rate_providers.concat [
+          Spree::DeliveryRateProvider::Internal,
+          Spree::DeliveryRateProvider::Freight
+        ]
+
+        # Digital asset sources. Core ships the uploaded-file default; host
+        # apps append providers that resolve a deliverable elsewhere.
+        Rails.application.config.spree.digital_asset_providers.concat [
+          Spree::DigitalAssetProvider::File
+        ]
+
+        # Profile kinds selectable when creating a delivery profile;
+        # extension kinds append theirs.
+        Rails.application.config.spree.delivery_profile_types.concat [
+          Spree::DeliveryProfiles::Shipping,
+          Spree::DeliveryProfiles::Digital
         ]
 
         # Selectable order routing strategies. The internal Reducer collaborator
         # is intentionally NOT listed — it is not a Strategy::Base. Plugins add
-        # their own (or remove Legacy) via this array.
+        # their own via this array.
         Rails.application.config.spree.order_routing.strategies.concat [
-          Spree::OrderRouting::Strategy::Rules,
-          Spree::OrderRouting::Strategy::Legacy
+          Spree::OrderRouting::Strategy::Rules
         ]
 
         # Available order routing rule kinds. STI dispatches at runtime via the
@@ -182,6 +370,42 @@ module Spree
           Spree::OrderRouting::Rules::DefaultLocation
         ]
 
+        # Commission targeting rule kinds (docs/plans/6.0-multi-vendor-marketplace.md).
+        Rails.application.config.spree.commission_rules.concat [
+          Spree::CommissionRules::SellerRule,
+          Spree::CommissionRules::CategoryRule,
+          Spree::CommissionRules::ProductRule,
+          Spree::CommissionRules::ItemTotalRule
+        ]
+
+        # Seller onboarding requirement kinds
+        # (docs/plans/6.0-seller-onboarding-requirements.md).
+        Rails.application.config.spree.seller_requirements.concat [
+          Spree::SellerRequirements::AcceptTerms,
+          Spree::SellerRequirements::CompleteProfile,
+          Spree::SellerRequirements::BillingAddress,
+          Spree::SellerRequirements::ReturnsAddress,
+          Spree::SellerRequirements::DeliveryMethod,
+          Spree::SellerRequirements::PackageType,
+          Spree::SellerRequirements::MinimumProducts,
+          Spree::SellerRequirements::PayoutAccount,
+          Spree::SellerRequirements::RequiredCustomFields,
+          Spree::SellerRequirements::Policy,
+          Spree::SellerRequirements::Attestation,
+          Spree::SellerRequirements::OperatorReview,
+          Spree::SellerRequirements::Document
+        ]
+
+        # Delivery-method eligibility rule kinds (docs/plans/6.0-delivery-method-rules.md).
+        Rails.application.config.spree.delivery_method_rules.concat [
+          Spree::DeliveryMethodRules::ItemTotalRule,
+          Spree::DeliveryMethodRules::WeightRule,
+          Spree::DeliveryMethodRules::ExcludedProductsRule,
+          Spree::DeliveryMethodRules::ChannelRule,
+          Spree::DeliveryMethodRules::VolumeRule,
+          Spree::DeliveryMethodRules::CompanyRule
+        ]
+
         Rails.application.config.spree.calculators.promotion_actions_create_adjustments = [
           Spree::Calculator::FlatPercentItemTotal,
           Spree::Calculator::FlatRate,
@@ -208,17 +432,14 @@ module Spree
           Spree::Promotion::Rules::FirstOrder,
           Spree::Promotion::Rules::UserLoggedIn,
           Spree::Promotion::Rules::OneUsePerUser,
-          Spree::Promotion::Rules::Taxon,
+          Spree::Promotion::Rules::Category,
           Spree::Promotion::Rules::OptionValue,
         ]
 
-        # Default registry. MarketRule is included so existing installs
-        # don't lose access to saved rule rows in the admin. ZoneRule is
-        # intentionally excluded — Zones are being removed in 6.0 (see
-        # docs/plans/6.0-tax-provider.md) and we don't want to invest
-        # in admin UI for a model on its way out. The class itself
-        # stays so legacy data continues to load; it just doesn't show
-        # up in the "Add rule" picker.
+        # Default registry. MarketRule is the only geography rule: price
+        # lists that were zone-scoped before 6.0 are converted onto it by
+        # `spree:migrate_tax_zones` where the countries match a market, and
+        # deactivated with a report where they don't.
         Rails.application.config.spree.pricing.rules.concat [
           Spree::PriceRules::UserRule,
           Spree::PriceRules::CustomerGroupRule,
@@ -245,13 +466,18 @@ module Spree
           Spree::Exports::Customers,
           Spree::Exports::GiftCards,
           Spree::Exports::NewsletterSubscribers,
-          Spree::Exports::CouponCodes
+          Spree::Exports::CouponCodes,
+          Spree::Exports::PriceListPrices,
+          Spree::Exports::PurchaseOrders,
+          Spree::Exports::Report
         ]
 
         Rails.application.config.spree.import_types = [
           Spree::Imports::Products,
           Spree::Imports::ProductTranslations,
           Spree::Imports::Customers,
+          Spree::Imports::PriceListPrices,
+          Spree::Imports::PurchaseOrders
         ]
 
         Rails.application.config.spree.taxon_rules = [
@@ -260,19 +486,31 @@ module Spree
           Spree::TaxonRules::Sale,
         ]
 
-        Rails.application.config.spree.reports = [
-          Spree::Reports::ProductsPerformance,
-          Spree::Reports::SalesTotal
+        # Mirrors config.spree.taxon_rules above. AvailableOn ships with an interim
+        # legacy-column implementation; its channel-aware rewrite is a later phase
+        # (see docs/plans/6.0-replace-taxons-with-categories.md → Migration Phase 5).
+        Rails.application.config.spree.collection_rules = [
+          Spree::CollectionRules::Tag,
+          Spree::CollectionRules::AvailableOn,
+          Spree::CollectionRules::Sale,
+        ]
+
+        # Net-new (no taxon_rules equivalent — taxons ship no scheduled refresh).
+        # Drives Spree::Collections::RegenerateTimeBasedJob.
+        Rails.application.config.spree.time_based_collection_rules = [
+          Spree::CollectionRules::AvailableOn,
         ]
 
         Rails.application.config.spree.translatable_resources = [
           Spree::OptionType,
           Spree::OptionValue,
           Spree::Product,
-          Spree::Taxon,
-          Spree::Taxonomy,
+          Spree::ProductType,
+          Spree::Collection,
+          Spree::Category,
           Spree::Store,
-          Spree::Policy
+          Spree::Policy,
+          Spree::Seller
         ]
 
         # Resources that expose tags via `acts_as_taggable_on :tags`. The
@@ -280,30 +518,31 @@ module Spree
         # `taggable_type`, and the SPA `<TagCombobox>` targets them by name.
         # Extend in an app initializer (after :load_config_initializers) to
         # surface custom taggables — e.g.
-        #   Rails.application.config.spree.taggable_types << 'MyApp::Vendor'.
+        #   Rails.application.config.spree.taggable_types << 'MyApp::Seller'.
         Rails.application.config.spree.taggable_types = [
           'Spree::Product',
           'Spree::Order',
-          Spree.user_class.to_s
+          Spree.customer_class.to_s
         ]
 
-        Rails.application.config.spree.metafields.types = [
-          Spree::Metafields::ShortText,
-          Spree::Metafields::LongText,
-          Spree::Metafields::RichText,
-          Spree::Metafields::Number,
-          Spree::Metafields::Boolean,
-          Spree::Metafields::Json
+        Rails.application.config.spree.custom_fields.types = [
+          Spree::CustomFields::ShortText,
+          Spree::CustomFields::LongText,
+          Spree::CustomFields::RichText,
+          Spree::CustomFields::Number,
+          Spree::CustomFields::Boolean,
+          Spree::CustomFields::Json
         ]
 
-        Rails.application.config.spree.metafields.enabled_resources = [
+        Rails.application.config.spree.custom_fields.enabled_resources = [
           Spree::Address,
-          Spree::Asset,
+          Spree::Claim,
+          Spree::Collection,
           Spree::CreditCard,
-          Spree::CustomerReturn,
+          Spree::Exchange,
           Spree::GiftCard,
-          Spree::Image,
           Spree::LineItem,
+          Spree::Media,
           Spree::NewsletterSubscriber,
           Spree::OptionType,
           Spree::OptionValue,
@@ -312,19 +551,21 @@ module Spree
           Spree::PaymentMethod,
           Spree::PaymentSource,
           Spree::Product,
+          Spree::ProductType,
           Spree::Promotion,
           Spree::Refund,
-          Spree::Shipment,
-          Spree::ShippingMethod,
-          Spree::StockItem,
+          Spree::Return,
+          Spree::Fulfillment,
+          Spree::DeliveryMethod,
+          Spree::StockLevel,
           Spree::StockTransfer,
           Spree::Store,
           Spree::StoreCredit,
           Spree::TaxRate,
-          Spree::Taxon,
-          Spree::Taxonomy,
+          Spree::Category,
           Spree::Variant,
-          Spree.user_class
+          Spree::Seller,
+          Spree.customer_class
         ]
 
         Rails.application.config.spree.analytics_events = {
@@ -365,11 +606,19 @@ module Spree
         # Note: Spree::EventLogSubscriber is attached in to_prepare (below) so it
         # survives Zeitwerk code reloads in development.
         Spree.subscribers.concat [
+          Spree::OrderPlacedSubscriber,
+          Spree::OrderCommissionSubscriber,
+          Spree::OrderStatusSubscriber,
+          Spree::PaymentSplitSubscriber,
+          Spree::SellerTransferSubscriber,
+          Spree::SellerTransferReversalSubscriber,
           Spree::ExportSubscriber,
-          Spree::ReportSubscriber,
           Spree::InvitationEmailSubscriber,
+          Spree::SellerOnboardingSubscriber,
           Spree::AdminUserEmailSubscriber,
-          Spree::ProductMetricsSubscriber
+          Spree::SellerUserEmailSubscriber,
+          Spree::ProductMetricsSubscriber,
+          Spree::TaxIdentifierValidationSubscriber
         ]
 
         # Pre-load authentication strategy classes to avoid reflection at request time
@@ -379,6 +628,9 @@ module Spree
         Rails.application.config.spree.admin_authentication_strategies = Spree::Authentication::StrategyRegistry.new(
           email: Spree::Authentication::Strategies::EmailPasswordStrategy
         )
+        Rails.application.config.spree.seller_authentication_strategies = Spree::Authentication::StrategyRegistry.new(
+          email: Spree::Authentication::Strategies::EmailPasswordStrategy
+        )
       end
 
       initializer 'spree.promo.register.promotions.actions' do |app|
@@ -403,22 +655,6 @@ module Spree
         end
       end
 
-      initializer 'spree.core.assets' do |app|
-        if app.config.respond_to?(:assets)
-          app.config.assets.paths << root.join('app/javascript')
-          app.config.assets.paths << root.join('vendor/javascript')
-          app.config.assets.precompile += %w[spree_core_manifest]
-        end
-      end
-
-      initializer 'spree.core.importmap', before: 'importmap' do |app|
-        if app.config.respond_to?(:importmap)
-          app.config.importmap.paths << root.join('config/importmap.rb')
-          # https://github.com/rails/importmap-rails?tab=readme-ov-file#sweeping-the-cache-in-development-and-test
-          app.config.importmap.cache_sweepers << root.join('app/javascript')
-        end
-      end
-
       # Activate event subscribers after all engines have registered their subscribers
       # This registers an after_initialize callback late, ensuring it runs after all engine callbacks
       # Needed for console, jobs, and other contexts where to_prepare doesn't run
@@ -428,6 +664,25 @@ module Spree
         end
       end
 
+      # The one eligibility rule core ships: a per-market return window,
+      # bypassed by staff. Registered after application initializers so a
+      # store can unregister it in its own initializer.
+      initializer 'spree.returns.register_eligibility_validator', after: :load_config_initializers do
+        Spree.hooks.register('returns.create.validate', 'Spree::Returns::EligibilityValidator')
+        Spree.hooks.register('exchanges.create.validate', 'Spree::Returns::EligibilityValidator')
+      end
+
+      # A hook registered against a key no workflow declares would never fire
+      # and never say so. Checking after eager load turns that typo into a
+      # boot failure. Skipped when eager loading is off (development,
+      # console): workflow classes load lazily there, so a declared hook may
+      # simply not be defined yet.
+      initializer 'spree.hooks.validate', after: :load_config_initializers do |app|
+        app.config.after_initialize do
+          Spree.hooks.validate! if app.config.eager_load
+        end
+      end
+
       config.to_prepare do
         # Ensure spree locale paths are present before decorators
         I18n.load_path.unshift(*(Dir.glob(
@@ -447,6 +702,10 @@ module Spree
         Spree::Events.reset!
         Spree::Events.activate!
 
+        # Same stale-class problem as the subscribers above, for the provider
+        # registries the admin catalogs iterate.
+        Spree.refresh_provider_registries!
+
         # Re-attach event log subscriber if enabled
         if Spree::Config.events_log_enabled
           Spree::EventLogSubscriber.attach_to_notifications
@@ -457,4 +716,3 @@ module Spree
 end
 
 require 'spree/core/routes'
-require 'spree/core/components'

data/lib/spree/core/number_generator.rb

@@ -1,49 +1,53 @@
 module Spree
   module Core
+    # @deprecated Use {Spree::HasNumber} instead. Removed in Spree 6.1.
+    #
+    #   # before
+    #   include Spree::Core::NumberGenerator.new(prefix: 'R')
+    #
+    #   # after
+    #   has_spree_number prefix: 'R'
+    #
+    # Kept as a shell so existing models and extension decorators keep
+    # working for one release. Including it wires up {Spree::HasNumber} with
+    # the given prefix, which means numbers now follow the store's format
+    # preference (sequential by default) rather than always being random.
+    # Hosts that need the old random numbers should switch the store's
+    # `document_number_format` preference to `random`, or register their own
+    # generator — see docs/plans/6.0-document-numbers.md.
+    #
+    # `length:` and `letters:` are accepted and ignored: they described the
+    # random format, which is now the strategy's business rather than the
+    # model's.
     class NumberGenerator < Module
-      BASE           = 10
       DEFAULT_LENGTH = 9
 
       attr_accessor :prefix, :length
 
       def initialize(options)
-        @prefix     = options.fetch(:prefix)
-        @length     = options.fetch(:length, DEFAULT_LENGTH)
-        @letters    = options[:letters]
+        @prefix  = options.fetch(:prefix)
+        @length  = options.fetch(:length, DEFAULT_LENGTH)
+        @letters = options[:letters]
+
+        Spree::Deprecation.warn(
+          'Spree::Core::NumberGenerator is deprecated and will be removed in ' \
+          "Spree 6.1. Replace `include Spree::Core::NumberGenerator.new(prefix: '#{@prefix}')` " \
+          "with `has_spree_number prefix: '#{@prefix}'`. " \
+          'See docs/plans/6.0-document-numbers.md.'
+        )
       end
 
       def included(host)
-        generator_instance = self
+        prefix = @prefix
 
         host.class_eval do
-          before_validation do |instance|
-            instance.number ||= generate_permalink(host)
-          end
+          # Hosts inheriting from Spree::Base already have the concern; a bare
+          # ActiveRecord model (some extensions) needs it included here.
+          include Spree::HasNumber unless respond_to?(:has_spree_number)
 
-          define_singleton_method(:number_generator) { generator_instance }
-
-          def generate_permalink(host)
-            host.number_generator.generate_permalink(host)
-          end
-        end
-      end
-
-      def generate_permalink(host)
-        length = @length
-
-        loop do
-          candidate = new_candidate(length)
-          return candidate unless host.exists?(number: candidate)
-
-          # If over half of all possible options are taken add another digit.
-          length += 1 if host.count > Rational(BASE**length, 2)
+          has_spree_number prefix: prefix
         end
       end
-
-      def new_candidate(length)
-        characters = @letters ? 36 : 10
-        @prefix + SecureRandom.random_number(characters**length).to_s(characters).rjust(length, '0').upcase
-      end
-    end # Permalink
-  end # Core
-end # Spree
+    end
+  end
+end