spree_core 6.0.0.beta4 → 6.0.0.rc2

data/app/models/spree/collection_rule.rb

@@ -2,6 +2,10 @@
 
 module Spree
   class CollectionRule < Spree.base_class
+    include Spree::TypeLabels
+
+    self.type_labels_scope = 'spree.collection_rule_types'
+
     has_prefix_id :crule
 
     MATCH_POLICIES = %w[is_equal_to is_not_equal_to contains does_not_contain].freeze
@@ -18,25 +22,6 @@ module Spree
 
     validate :type_must_be_registered
 
-    # @return [String] localized display name for the rule kind, used by admin pickers
-    def self.human_name
-      Spree.t("collection_rule_types.#{api_type}.name", default: api_type.titleize)
-    end
-
-    # @return [String] localized description for the rule kind
-    def self.human_description
-      Spree.t("collection_rule_types.#{api_type}.description", default: '')
-    end
-
-    # Feeds the `description` field of `subclasses_with_preference_schema`
-    # (the `/types` discovery payload), which only reads `.description`.
-    def self.description
-      human_description
-    end
-
-    def human_name = self.class.human_name
-    def human_description = self.class.human_description
-
     registers_subclasses_via { Rails.application.config.spree.collection_rules }
 
     private
@@ -47,8 +32,7 @@ module Spree
       return if type.blank?
       return if Rails.application.config.spree.collection_rules.any? { |rule| rule.to_s == type }
 
-      errors.add(:type, :invalid_collection_rule, message: Spree.t(:invalid_collection_rule, scope: [:errors, :messages],
-                                                          default: 'is not a registered collection rule'))
+      errors.add(:type, :invalid_collection_rule, message: I18n.t('spree.errors.messages.invalid_collection_rule'))
     end
 
     def regenerate_collection_products

data/app/models/spree/commission_line.rb

@@ -81,7 +81,7 @@ module Spree
     def exactly_one_subject
       return if [line_item_id, fulfillment_id].compact.one?
 
-      errors.add(:base, :exactly_one_of_line_item_or_fulfillment, message: Spree.t('errors.messages.exactly_one_of_line_item_or_fulfillment'))
+      errors.add(:base, :exactly_one_of_line_item_or_fulfillment, message: I18n.t('spree.errors.messages.exactly_one_of_line_item_or_fulfillment'))
     end
   end
 end

data/app/models/spree/commission_rate.rb

@@ -36,6 +36,9 @@ module Spree
     include Spree::SingleStoreResource
     include Spree::HasListPosition
     include Spree::Metadata
+    include Spree::CanonicalDecimals
+
+    canonical_decimals :value, places: 5
     include Spree::TypedAssociations
 
     KINDS = %w[percentage fixed].freeze
@@ -43,7 +46,6 @@ module Spree
     #
     # Associations
     #
-    belongs_to :store, class_name: 'Spree::Store'
     # Every amount this rate states, one row per currency: what a flat fee
     # charges, and the floor and cap a percentage charges within. A flat rate
     # with no amount for the sale's currency does not apply to it (see
@@ -104,6 +106,7 @@ module Spree
 
     self.whitelisted_ransackable_attributes = %w[name code kind enabled position value
                                                  tax_inclusive include_shipping]
+    search_by :name
     self.whitelisted_ransackable_associations = %w[commission_rules]
 
     # @return [Boolean]
@@ -245,7 +248,7 @@ module Spree
     # shape a price list's rules use.
     #
     # Ids inside a rule's preferences are scope-checked against this rate's own
-    # store as they are written (see normalize_id_preference), so a rule can
+    # store as they are written (see `of: :id, scope:`), so a rule can
     # never be pointed at another marketplace's records.
     #
     # @param rows [Array<Hash>, nil]
@@ -357,14 +360,14 @@ module Spree
     def flat_fee_does_not_charge_delivery
       return unless fixed? && include_shipping?
 
-      errors.add(:include_shipping, :flat_fee_cannot_charge_delivery, message: Spree.t('errors.messages.flat_fee_cannot_charge_delivery'))
+      errors.add(:include_shipping, :flat_fee_cannot_charge_delivery, message: I18n.t('spree.errors.messages.flat_fee_cannot_charge_delivery'))
     end
 
     def fixed_rate_states_an_amount
       return unless fixed?
       return if @pending_amounts.present? || commission_rate_values.any?
 
-      errors.add(:base, :commission_rate_needs_an_amount, message: Spree.t('errors.messages.commission_rate_needs_an_amount'))
+      errors.add(:base, :commission_rate_needs_an_amount, message: I18n.t('spree.errors.messages.commission_rate_needs_an_amount'))
     end
   end
 end

data/app/models/spree/commission_rate_value.rb

@@ -41,7 +41,7 @@ module Spree
       return if max_amount.nil? || min_amount.nil?
       return if max_amount >= min_amount
 
-      errors.add(:max_amount, :must_be_greater_than_min_amount, message: Spree.t('errors.messages.must_be_greater_than_min_amount'))
+      errors.add(:max_amount, :must_be_greater_than_min_amount, message: I18n.t('spree.errors.messages.must_be_greater_than_min_amount'))
     end
   end
 end

data/app/models/spree/commission_rule.rb

@@ -15,6 +15,9 @@ module Spree
   # setting. A rate with no rules charges every sale.
   class CommissionRule < Spree.base_class
     include Spree::PreferenceSchema
+    include Spree::TypeLabels
+
+    self.type_labels_scope = 'spree.commission_rule_types'
 
     has_prefix_id :comrule
 
@@ -47,16 +50,6 @@ module Spree
 
     registers_subclasses_via { Spree.commission_rules }
 
-    # @return [String] the name an operator picks this rule kind by
-    def self.human_name
-      Spree.t("commission_rule_types.#{api_type}.name", default: name.demodulize.titleize)
-    end
-
-    # @return [String] what the rule does, shown beside the name in the picker
-    def self.description
-      Spree.t("commission_rule_types.#{api_type}.description", default: '')
-    end
-
     # Whether this rule admits the sale.
     #
     # @param context [Spree::Commissions::Context]
@@ -71,7 +64,7 @@ module Spree
       return if type.blank?
       return if Spree.commission_rules.any? { |rule| rule.to_s == type }
 
-      errors.add(:type, :invalid_commission_rule, message: Spree.t('errors.messages.invalid_commission_rule'))
+      errors.add(:type, :invalid_commission_rule, message: I18n.t('spree.errors.messages.invalid_commission_rule'))
     end
   end
 end

data/app/models/spree/commission_rules/category_rule.rb

@@ -9,11 +9,8 @@ module Spree
     # restate the rule on every new leaf. The walk is done once per order by
     # Spree::Commissions::Context, not per rule.
     class CategoryRule < Spree::CommissionRule
-      preference :category_ids, :array, default: [],
-                 parse_on_set: normalize_id_preference(
-                   klass: Spree::Category,
-                   scope: ->(rule) { rule.store.categories }
-                 )
+      preference :category_ids, :array, of: :id, model: 'Spree::Category', default: [],
+                 scope: ->(rule) { rule.store.categories }
 
       # @return [Array<Spree::Category>]
       def categories

data/app/models/spree/commission_rules/item_total_rule.rb

@@ -14,8 +14,8 @@ module Spree
     # This rule is the reason commission rules became classes. It could not
     # exist while a rule was only able to name a record.
     class ItemTotalRule < Spree::CommissionRule
-      preference :min_amount, :decimal, nullable: true
-      preference :max_amount, :decimal, nullable: true
+      preference :min_amount, :money, nullable: true
+      preference :max_amount, :money, nullable: true
 
       def applicable?(context)
         # Weighed exactly as the fee will weigh it, per this rate's own base.

data/app/models/spree/commission_rules/product_rule.rb

@@ -48,7 +48,7 @@ module Spree
 
         return if store.products.where(id: chosen_ids).count == chosen_ids.uniq.size
 
-        errors.add(:products, :product_not_in_store, message: Spree.t('errors.messages.product_not_in_store'))
+        errors.add(:products, :product_not_in_store, message: I18n.t('spree.errors.messages.product_not_in_store'))
       end
     end
   end

data/app/models/spree/commission_rules/seller_rule.rb

@@ -7,11 +7,8 @@ module Spree
       # Ids are checked against the rate's own store on write, so a rule can
       # never be pointed at another marketplace's seller — and the client is
       # told, rather than having the id quietly dropped.
-      preference :seller_ids, :array, default: [],
-                 parse_on_set: normalize_id_preference(
-                   klass: Spree::Seller,
-                   scope: ->(rule) { rule.store.sellers }
-                 )
+      preference :seller_ids, :array, of: :id, model: 'Spree::Seller', default: [],
+                 scope: ->(rule) { rule.store.sellers }
 
       # @return [Array<Spree::Seller>]
       def sellers

data/app/models/spree/company.rb

@@ -101,6 +101,7 @@ module Spree
     }
 
     self.whitelisted_ransackable_attributes = %w[name kind parent_id po_number_required]
+    search_by :name
     self.whitelisted_ransackable_associations = %w[parent children memberships external_references]
 
     # The node a buyer browses and buys as when they name none: the single

data/app/models/spree/company_invitation.rb

@@ -15,6 +15,7 @@ module Spree
     include Spree::Metadata
 
     publishes_lifecycle_events
+    publishes_events :accepted, :revoked
 
     EXPIRY = 30.days
 

data/app/models/spree/consent_record.rb

@@ -42,7 +42,6 @@ module Spree
     SOURCES = [CHECKOUT, REGISTRATION, ACCOUNT, ADMIN, NEWSLETTER, ANONYMIZATION,
                UNKNOWN, 'import', 'storefront'].freeze
 
-    belongs_to :store, class_name: 'Spree::Store'
     belongs_to :owner, polymorphic: true
 
     validates :purpose, presence: true

data/app/models/spree/credit_card.rb

@@ -158,7 +158,7 @@ module Spree
     # Show the card brand, eg. "VISA", "MASTERCARD", etc.
     # @return [String]
     def display_brand
-      brand.present? ? brand.upcase : Spree.t(:no_cc_type)
+      brand.present? ? brand.upcase : I18n.t('spree.no_cc_type')
     end
 
     # Returns the first name of the cardholder.

data/app/models/spree/current.rb

@@ -38,6 +38,29 @@ module Spree
       super || Spree::Store.default
     end
 
+    # Runs the block in +store+ from a clean context: nothing a previous store
+    # resolved (channel, market, currency, integrations, pricing) carries in,
+    # and nothing resolved inside leaks out. For work that walks several
+    # stores in one unit of work, such as an installation-wide sweep job; a
+    # request or a single-store job assigns #store once instead.
+    #
+    # The store scope guard stays armed afterwards, like any other store
+    # declaration in this unit of work.
+    #
+    # @param store [Spree::Store]
+    # @return [Object] the block's result
+    def with_store(store)
+      previous = attributes
+
+      begin
+        self.attributes = {}
+        self.store = store
+        yield
+      ensure
+        self.attributes = previous.merge(store_scope_guard_armed: store_scope_guard_armed)
+      end
+    end
+
     def channel
       super || (self.channel = store&.default_channel)
     end

data/app/models/spree/custom_field.rb

@@ -128,7 +128,7 @@ module Spree
 
       unless type == custom_field_definition.field_type_class_name
         errors.add(:type, :custom_field_definition_mismatch,
-                   message: Spree.t('errors.messages.custom_field_definition_mismatch'))
+                   message: I18n.t('spree.errors.messages.custom_field_definition_mismatch'))
       end
     end
 
@@ -144,7 +144,7 @@ module Spree
       return if definition_type.safe_constantize&.base_class&.name == resource_type
 
       errors.add(:resource_type, :custom_field_definition_mismatch,
-                 message: Spree.t('errors.messages.custom_field_definition_mismatch'))
+                 message: I18n.t('spree.errors.messages.custom_field_definition_mismatch'))
     end
 
     # Definitions are store-owned, so a record may only carry its own store's.

data/app/models/spree/custom_field_definition.rb

@@ -25,20 +25,14 @@ module Spree
     scope :for_resource_type, ->(resource_type) { where(resource_type: resource_type) }
     scope :storefront_visible, -> { where(storefront_visible: true) }
     scope :admin_only, -> { where(storefront_visible: false) }
-    scope :search, ->(query) do
-      return all if query.blank?
-
-      search_term = "%#{query.downcase}%"
-      namespace_condition = arel_table[:namespace].lower.matches(search_term)
-      key_condition = arel_table[:key].lower.matches(search_term)
-      label_condition = arel_table[:label].lower.matches(search_term)
-
-      where(namespace_condition.or(key_condition).or(label_condition))
-    end
 
     #
     # Callbacks
     #
+    # The API names resources by shorthand (`product`); the column keeps the
+    # class name the custom fields themselves are stored under. Also applies to
+    # `where(resource_type:)`, so finders accept either.
+    normalizes :resource_type, with: ->(value) { Spree::Base.polymorphic_type_for(value, available_resources) || value }
     normalizes :key, with: ->(value) { value.to_s.parameterize.underscore.strip }
     normalizes :namespace, with: ->(value) { value.to_s.parameterize.underscore.strip }
     before_validation :set_default_type, if: -> { self[:field_type].blank? }, on: :create
@@ -48,8 +42,17 @@ module Spree
     #
     # Ransack
     #
-    self.whitelisted_ransackable_attributes = %w[key namespace label resource_type storefront_visible searchable sortable]
-    self.whitelisted_ransackable_scopes = %w[search]
+    self.whitelisted_ransackable_attributes = %w[key namespace label resource_type field_type storefront_visible searchable sortable]
+
+    # Both columns store class names; filters take the short names clients see.
+    def self.api_type_resolver(attribute)
+      case attribute
+      when 'resource_type' then ->(api_type) { normalize_value_for(:resource_type, api_type) }
+      when 'field_type' then ->(api_type) { Spree::CustomField::TYPE_TOKENS[api_type] }
+      else super
+      end
+    end
+    search_by :namespace, :key, :label
 
     # API-facing token for the STI subclass name stored in the `field_type`
     # column. Reader returns the registered token (`short_text`); writer
@@ -117,25 +120,13 @@ module Spree
     # as the API names it, so a client renders a picker rather than carrying
     # its own list that drifts from the registry.
     #
-    # `Spree::Category` reports itself as `Spree::Taxon`: existing category
-    # definitions are stored under the old class name, and offering the new
-    # one would file a merchant's next definition somewhere the category card
-    # does not read. Drops with the alias in 6.1.
-    #
-    # @return [Array<Hash{Symbol => String}>] `resource_type` + `name`
+    # @return [Array<Hash{Symbol => String}>] `resource_type` shorthand + `name`
     def self.enabled_resource_types
       # Through `available_resources`, not the registry directly: that is the
       # accessor the rest of the class reads, so discovery and validation
       # cannot disagree about what a host app has made available.
-      Array(available_resources).filter_map do |resource|
-        next if resource.nil?
-
-        # The label follows the class a merchant knows; the wire value follows
-        # where the rows are actually stored.
-        name = resource.to_s.demodulize.titleize.pluralize
-        resource_type = resource.to_s == 'Spree::Category' ? 'Spree::Taxon' : resource.to_s
-
-        { resource_type: resource_type, name: name }
+      Array(available_resources).compact.map do |resource|
+        { resource_type: Spree::Base.polymorphic_api_type(resource), name: resource.to_s.demodulize.titleize.pluralize }
       end.uniq { |entry| entry[:resource_type] }.sort_by { |entry| entry[:name] }
     end
 
@@ -174,7 +165,7 @@ module Spree
 
       tokens = Spree::CustomField::TYPE_TOKENS.keys.join(', ')
       errors.add(:field_type, :unknown_custom_field_type, types: tokens,
-                 message: Spree.t('errors.messages.unknown_custom_field_type', types: tokens))
+                 message: I18n.t('spree.errors.messages.unknown_custom_field_type', types: tokens))
     end
 
     # Validates the stored class name, not the token the reader returns.
@@ -186,14 +177,8 @@ module Spree
       errors.add(:field_type, :inclusion)
     end
 
-    # Both the registry's own names and the ones discovery offers: a value a
-    # client was offered has to be accepted, and the two differ where a class
-    # has been renamed (categories are stored under Spree::Taxon while the
-    # registry holds Spree::Category). Existing callers name either, so
-    # narrowing to one would reject definitions that already work.
     def valid_available_resources
-      self.class.available_resources.map(&:to_s) |
-        self.class.enabled_resource_types.map { |resource| resource[:resource_type] }
+      self.class.available_resources.map(&:to_s)
     end
 
     def set_default_type

data/app/models/spree/custom_fields/boolean.rb

@@ -4,7 +4,7 @@ module Spree
       normalizes :value, with: ->(value) { value.to_b.to_s }
 
       def csv_value
-        value.to_b ? Spree.t(:say_yes) : Spree.t(:say_no)
+        value.to_b ? I18n.t('spree.say_yes') : I18n.t('spree.say_no')
       end
 
       def serialize_value

data/app/models/spree/custom_fields/json.rb

@@ -31,7 +31,7 @@ module Spree
         JSON.parse(value)
       rescue JSON::ParserError => e
         errors.add(:value, :invalid_json, detail: e.message,
-                   message: Spree.t('errors.messages.invalid_json', detail: e.message))
+                   message: I18n.t('spree.errors.messages.invalid_json', detail: e.message))
       end
     end
   end

data/app/models/spree/customer_group.rb

@@ -5,6 +5,7 @@ module Spree
     acts_as_paranoid
 
     include Spree::SingleStoreResource
+    search_by :name
 
     #
     # Associations

data/app/models/spree/data_feed/google.rb

@@ -1,5 +1,3 @@
-require_dependency 'spree/data_feed'
-
 module Spree
   class DataFeed::Google < DataFeed
     class << self

data/app/models/spree/data_request.rb

@@ -19,6 +19,7 @@ module Spree
     has_spree_number prefix: 'DSR'
 
     publishes_lifecycle_events
+    publishes_event :completed
 
     include Spree::HasStatus
     has_status :pending, :processing, :completed, :failed, default: :pending
@@ -37,7 +38,6 @@ module Spree
     # asked, and it stops working when the request expires.
     has_secure_token :download_token
 
-    belongs_to :store, class_name: 'Spree::Store'
     belongs_to :customer, class_name: Spree.customer_class.to_s
     # Null when the subject asked for it themselves; set when staff acted on a
     # request that arrived by email.
@@ -56,6 +56,7 @@ module Spree
 
     self.whitelisted_ransackable_attributes = %w[number kind status email requested_at completed_at]
     self.whitelisted_ransackable_scopes = %w[access erasure in_progress]
+    self.ransackable_scope_types = %w[access erasure in_progress].index_with('boolean')
 
     before_validation :set_defaults, on: :create
 

data/app/models/spree/delivery_method.rb

@@ -80,6 +80,12 @@ module Spree
     after_save :apply_pending_services, if: :pending_services?
     attribute :fulfillment_provider, :string, default: 'Spree::FulfillmentProvider::Manual'
 
+    # The API names providers by their shorthand (`manual`, `easy_post`); the
+    # columns keep the class name.
+    normalizes :fulfillment_provider, with: ->(value) { Spree::ApiTyped.class_name_for(Spree.fulfillment_providers, value) }
+    normalizes :rate_provider, with: ->(value) { Spree::ApiTyped.class_name_for(Spree.delivery_rate_providers, value) }
+    normalizes :pickup_point_provider, with: ->(value) { Spree::ApiTyped.class_name_for(Spree.pickup_point_providers, value) }
+
     # Methods whose fulfillment provider satisfies the predicate — behavior
     # queries route through provider classes, never string vocabularies.
     scope :with_provider, ->(predicate) {
@@ -116,6 +122,7 @@ module Spree
     # needed. `seller_id` is what the operator's list filters by to see one
     # seller's methods, or (blank) the marketplace's own.
     self.whitelisted_ransackable_attributes = %w[storefront_visible available_to_sellers seller_id]
+    search_by :name
     self.whitelisted_ransackable_associations = %w[seller]
 
     validates :name, presence: true
@@ -138,6 +145,16 @@ module Spree
     # not save a provider whose integration isn't connected — that breaks
     # quoting at checkout, not at save time where the admin can see it.
     validate :rate_provider_must_be_available, if: :rate_provider_changed?
+    # Every provider column is constantized and instantiated at checkout or
+    # ship time, so only a registered class may be stored.
+    validates :fulfillment_provider,
+              inclusion: { in: -> (_record) { Spree.fulfillment_providers.map(&:to_s) } },
+              allow_blank: true,
+              if: :fulfillment_provider_changed?
+    validates :pickup_point_provider,
+              inclusion: { in: -> (_record) { Spree.pickup_point_providers.map(&:to_s) } },
+              allow_blank: true,
+              if: :pickup_point_provider_changed?
     # Providers declare the fulfillment types they handle; a mismatch would
     # only surface at checkout (no rates) or at ship time (no dispatch),
     # so reject it where the admin can still see why.
@@ -211,7 +228,11 @@ module Spree
     end
 
     def ensure_calculator
-      self.calculator ||= Spree::Calculator::Shipping::FlatRate.new(preferred_amount: 0)
+      self.calculator ||= default_calculator
+    end
+
+    def default_calculator
+      Spree::Calculator::Shipping::FlatRate.new(preferred_amount: 0)
     end
 
     def assign_default_delivery_profile
@@ -234,7 +255,7 @@ module Spree
       return if delivery_zone.delivery_origin_group_id == delivery_origin_group_id
 
       errors.add(:delivery_zone, :does_not_belong_to_origin_group,
-                 message: Spree.t('errors.messages.delivery_zone_not_in_origin_group'))
+                 message: I18n.t('spree.errors.messages.delivery_zone_not_in_origin_group'))
     end
 
     def pickup_point?
@@ -263,7 +284,7 @@ module Spree
     #
     # @return [Class]
     def provider_class
-      (fulfillment_provider.presence || DEFAULT_FULFILLMENT_PROVIDER).safe_constantize ||
+      Spree::ApiTyped.registered_class(Spree.fulfillment_providers, fulfillment_provider.presence || DEFAULT_FULFILLMENT_PROVIDER) ||
         DEFAULT_FULFILLMENT_PROVIDER.constantize
     end
 
@@ -286,7 +307,8 @@ module Spree
     #
     # @return [Class]
     def rate_provider_class
-      (rate_provider.presence || DEFAULT_RATE_PROVIDER).safe_constantize || DEFAULT_RATE_PROVIDER.constantize
+      Spree::ApiTyped.registered_class(Spree.delivery_rate_providers, rate_provider.presence || DEFAULT_RATE_PROVIDER) ||
+        DEFAULT_RATE_PROVIDER.constantize
     end
 
 
@@ -363,7 +385,7 @@ module Spree
     #
     # @return [Spree::PickupPointProvider::Base, nil]
     def pickup_point_provider_instance
-      @pickup_point_provider_instance ||= pickup_point_provider.presence&.constantize&.new
+      @pickup_point_provider_instance ||= Spree::ApiTyped.registered_class(Spree.pickup_point_providers, pickup_point_provider)&.new
     end
 
     def self.calculators
@@ -430,14 +452,14 @@ module Spree
 
         if calculator.is_a?(Spree::Calculator::Shipping::FlatRate)
           if calculator.preferred_amount == 0
-            Spree.t(:free)
+            I18n.t('spree.free')
           else
             Spree::Money.new(calculator.preferred_amount, { currency: calculator.preferred_currency }).to_s
           end
         elsif calculator.is_a?(Spree::Calculator::Shipping::FlexiRate)
           Spree::Money.new(calculator.preferred_first_item, { currency: calculator.preferred_currency }).to_s
         elsif calculator.is_a?(Spree::Calculator::Shipping::FlatPercentItemTotal)
-          ActionController::Base.helpers.number_to_percentage(calculator.preferred_flat_percent, precision: 2)
+          ActiveSupport::NumberHelper.number_to_percentage(calculator.preferred_flat_percent, precision: 2)
         else
           ''
         end
@@ -500,7 +522,7 @@ module Spree
       return if delivery_zone.delivery_profile_id == delivery_profile_id
 
       errors.add(:delivery_zone, :does_not_belong_to_profile,
-                 message: Spree.t('errors.messages.delivery_zone_not_in_profile'))
+                 message: I18n.t('spree.errors.messages.delivery_zone_not_in_profile'))
     end
 
     def profile_must_accept_provider
@@ -513,7 +535,7 @@ module Spree
       errors.add(
         :fulfillment_provider, :profile_does_not_accept_provider,
         provider: provider_class.provider_name, profile: delivery_profile.name,
-        message: Spree.t('errors.messages.profile_does_not_accept_provider',
+        message: I18n.t('spree.errors.messages.profile_does_not_accept_provider',
                          provider: provider_class.provider_name, profile: delivery_profile.name)
       )
     end
@@ -527,7 +549,7 @@ module Spree
       errors.add(
         :rate_provider, :rate_provider_requires_shipping,
         provider: rate_provider_class.provider_name,
-        message: Spree.t('errors.messages.rate_provider_requires_shipping',
+        message: I18n.t('spree.errors.messages.rate_provider_requires_shipping',
                          provider: rate_provider_class.provider_name)
       )
     end
@@ -537,7 +559,7 @@ module Spree
       return unless Spree.delivery_rate_providers.map(&:to_s).include?(rate_provider)
       return if rate_provider_class.available_for_store?(store)
 
-      errors.add(:rate_provider, :rate_provider_unavailable, message: Spree.t('errors.messages.rate_provider_unavailable'))
+      errors.add(:rate_provider, :rate_provider_unavailable, message: I18n.t('spree.errors.messages.rate_provider_unavailable'))
     end
 
     def seller_must_belong_to_store
@@ -549,18 +571,18 @@ module Spree
 
     def seller_methods_use_own_providers
       unless rate_provider.blank? || rate_provider == DEFAULT_RATE_PROVIDER
-        errors.add(:rate_provider, :seller_delivery_method_provider, message: Spree.t('errors.messages.seller_delivery_method_provider'))
+        errors.add(:rate_provider, :seller_delivery_method_provider, message: I18n.t('spree.errors.messages.seller_delivery_method_provider'))
       end
 
       return if fulfillment_provider.blank? || fulfillment_provider == DEFAULT_FULFILLMENT_PROVIDER
 
-      errors.add(:fulfillment_provider, :seller_delivery_method_provider, message: Spree.t('errors.messages.seller_delivery_method_provider'))
+      errors.add(:fulfillment_provider, :seller_delivery_method_provider, message: I18n.t('spree.errors.messages.seller_delivery_method_provider'))
     end
 
     def only_marketplace_methods_are_shared
       return unless available_to_sellers? && seller_owned?
 
-      errors.add(:available_to_sellers, :seller_delivery_method_not_shareable, message: Spree.t('errors.messages.seller_delivery_method_not_shareable'))
+      errors.add(:available_to_sellers, :seller_delivery_method_not_shareable, message: I18n.t('spree.errors.messages.seller_delivery_method_not_shareable'))
     end
   end
 end

data/app/models/spree/delivery_method_rule.rb

@@ -7,6 +7,9 @@ module Spree
   # See docs/plans/6.0-delivery-method-rules.md.
   class DeliveryMethodRule < Spree.base_class
     include Spree::PreferenceSchema
+    include Spree::TypeLabels
+
+    self.type_labels_scope = 'spree.delivery_method_rule_types'
 
     has_prefix_id :dmrule
 
@@ -27,16 +30,6 @@ module Spree
 
     registers_subclasses_via { Spree.delivery_method_rules }
 
-    # @return [String] localized display name for the rule kind, used by admin pickers
-    def self.human_name
-      Spree.t("delivery_method_rule_types.#{api_type}.name", default: api_type.titleize)
-    end
-
-    # @return [String] localized description for the rule kind
-    def self.human_description
-      Spree.t("delivery_method_rule_types.#{api_type}.description", default: '')
-    end
-
     # @param package [Spree::Stock::Package]
     # @return [Boolean]
     def eligible?(_package)
@@ -49,7 +42,7 @@ module Spree
       return if type.blank?
       return if Spree.delivery_method_rules.any? { |rule| rule.to_s == type }
 
-      errors.add(:type, :invalid_delivery_method_rule, message: Spree.t(:invalid_delivery_method_rule, scope: [:errors, :messages], default: 'is not a registered delivery method rule'))
+      errors.add(:type, :invalid_delivery_method_rule, message: I18n.t('spree.errors.messages.invalid_delivery_method_rule'))
     end
   end
 end