spree_core 6.0.0.beta4 → 6.0.0.rc2

data/app/models/spree/order.rb

@@ -45,11 +45,15 @@ module Spree
     include Spree::Purchase::Validations
     include Spree::Purchase::Totals
     include Spree::Purchase::Lifecycle
+    include Spree::Purchase::DeprecatedAliases
     has_spree_number prefix: 'R'
 
     include Spree::NumberIdentifier
 
     publishes_lifecycle_events
+    publishes_events :approved, :canceled, :delivered, :fulfilled, :paid, :placed, :shipped,
+                     :resend_confirmation_email, :resend_digital_links_email
+    publishes_event :completed, deprecated_alias_of: 'order.placed'
     include Spree::HasCustomFields
     include Spree::Metadata
     include Spree::HasExternalReferences
@@ -69,8 +73,6 @@ module Spree
                   :payment_total,       :amount_due,           :fee_total,
                   :commission_amount_total, :commission_tax_total, :commission_total
 
-    alias display_ship_total display_delivery_total
-    alias_attribute :ship_total, :delivery_total
 
     # Transient warnings populated by remove_out_of_stock_items! and ensure_available_delivery_rates
     attribute :warnings, default: -> { [] }
@@ -84,7 +86,7 @@ module Spree
       Spree::Deprecation.warn('Spree::Order#remove_out_of_stock_items! is deprecated and will be removed in Spree 6.1. This method now works only on Spree::Cart objects')
 
       existing_warnings = warnings
-      result = Spree::Carts::RemoveOutOfStockItems.call(cart: self)
+      result = Spree.cart_remove_out_of_stock_items_service.call(cart: self)
       return self unless result.success?
 
       order, _messages, new_warnings = result.value
@@ -140,24 +142,6 @@ module Spree
       Spree::Checkout::Registry.step_names_for(self).reject { |step| step == 'complete' }
     end
 
-    # Standardized column names (renamed in 6.0); legacy readers stay as
-    # aliases one release.
-    alias_attribute :promo_total, :discount_total
-    alias display_promo_total display_discount_total
-    alias_attribute :item_count, :total_quantity
-
-    # @deprecated The column is +customer_note+ since 6.0; removed in 6.1.
-    def special_instructions
-      Spree::Deprecation.warn('Spree::Order#special_instructions is deprecated and will be removed in Spree 6.1. Use #customer_note instead.')
-      customer_note
-    end
-
-    # @deprecated See {#special_instructions}; removed in 6.1.
-    def special_instructions=(value)
-      Spree::Deprecation.warn('Spree::Order#special_instructions= is deprecated and will be removed in Spree 6.1. Use #customer_note= instead.')
-      self.customer_note = value
-    end
-
     # lock_version (renamed from state_lock_version) drives the API's manual
     # optimistic concurrency (compare client-sent version, 409 on mismatch) —
     # Rails auto-locking must not raise on internal saves.
@@ -169,7 +153,8 @@ module Spree
       total item_total total_quantity considered_risky channel_id currency coupon_code customer_id seller_id
       order_group_id po_number
     ]
-    self.whitelisted_ransackable_scopes = %w[complete incomplete refunded partially_refunded search multi_search]
+    self.whitelisted_ransackable_scopes = %w[complete incomplete refunded partially_refunded search]
+    self.ransackable_scope_types = %w[complete incomplete refunded partially_refunded].index_with('boolean')
     # A seller never sees the buyer's email, and a company member filtering the
     # company's orders must not learn a colleague's; the risk flag and coupon
     # are back-office data. `search` matches on the email too.
@@ -178,8 +163,8 @@ module Spree
       seller: %w[email considered_risky coupon_code]
     }
     self.private_ransackable_scopes = {
-      store: %w[search multi_search],
-      seller: %w[search multi_search]
+      store: %w[search],
+      seller: %w[search]
     }
 
     # Set to false on admin-initiated flows to suppress customer-facing emails.
@@ -209,14 +194,6 @@ module Spree
 
     ASSOCIATED_CUSTOMER_ATTRIBUTES = [:customer_id, :email, :bill_address_id, :ship_address_id]
 
-    # @deprecated Use {Spree::Purchase::PaymentProcessing#payment_methods};
-    #   removed in 6.1.
-    def collect_frontend_payment_methods
-      Spree::Deprecation.warn('Spree::Order#collect_frontend_payment_methods is deprecated and will be removed in Spree 6.1. Use #payment_methods instead.')
-      payment_methods
-    end
-
-    include Spree::DeprecatedCustomerAlias
 
     belongs_to :customer, class_name: "::#{Spree.customer_class}", optional: true, autosave: true
     # The cart this order was completed from (unique — the completion
@@ -261,7 +238,10 @@ module Spree
 
     # Typed adjustment rows owned by this order (line-, fulfillment- and
     # order-level). See docs/plans/6.0-6.1-split-adjustments.md.
-    has_many :tax_lines, class_name: 'Spree::TaxLine', dependent: :destroy, inverse_of: :order
+    # Sale rows only: the order's totals are re-summed from this association,
+    # and tax given back on a return, claim or exchange is not tax charged.
+    has_many :tax_lines, -> { sale }, class_name: 'Spree::TaxLine', dependent: :destroy, inverse_of: :order
+    has_many :post_sale_tax_lines, -> { post_sale }, class_name: 'Spree::TaxLine', dependent: :destroy
     # delete, not destroy: the snapshot is readonly once written, and destroy
     # refuses readonly records. It has no dependents of its own.
     has_one :tax_identifier, class_name: 'Spree::TaxIdentifier', as: :owner,
@@ -296,8 +276,6 @@ module Spree
     # Legacy names — removed in 6.1 (real names: fulfillments, delivery_total,
     # fulfillment_status since 6.0)
     has_many :shipments, class_name: 'Spree::Fulfillment', inverse_of: :order, deprecated: true
-    alias_attribute :shipment_total, :delivery_total
-    alias display_shipment_total display_delivery_total
     alias_attribute :shipment_state, :fulfillment_status
     # Deprecated alias — the column is payment_status since 6.0; remove in 6.1.
     alias_attribute :payment_state, :payment_status
@@ -382,9 +360,6 @@ module Spree
       left_joins(:bill_address).where(arel_table[:email].lower.eq(query.downcase)).or(where(conditions.reduce(:or)))
     end
 
-    # Backward compatibility alias — remove in Spree 6.0
-    def self.multi_search(query) = search(query)
-
     # Find an order by prefixed ID first, falling back to number, then integer id for backwards compatibility
     # @param param [String] the prefixed ID, number, or integer id to search for
     # @return [Spree::Order, nil] the found order or nil
@@ -441,17 +416,12 @@ module Spree
 
     # Returns the subtotal used for analytics integrations
     # It's a sum of the item total and the promo total
-    # @return [Float]
+    # @return [Float] a JSON number, as analytics providers expect
     def analytics_subtotal
       (item_total + line_items.sum(:discount_total)).to_f
     end
 
 
-    # @deprecated Use {#fulfillment_discount}; removed in 6.1.
-    def shipping_discount
-      Spree::Deprecation.warn('Spree::Order#shipping_discount is deprecated and will be removed in Spree 6.1. Use #fulfillment_discount instead.')
-      fulfillment_discount
-    end
 
 
 
@@ -489,7 +459,7 @@ module Spree
     end
 
     def refunds_total
-      refunds.loaded? ? refunds.sum(&:amount) : refunds.sum(:amount)
+      read_association_in_memory?(:refunds) ? refunds.sum(0.to_d, &:amount) : refunds.sum(:amount)
     end
 
     # Checks if the order is partially refunded
@@ -651,12 +621,6 @@ module Spree
       Spree.order_update_statuses_service.call(order: self)
     end
 
-    # @deprecated Use {#recalculate_totals!}; removed in 6.1.
-    def update_with_updater!
-      Spree::Deprecation.warn('Spree::Order#update_with_updater! is deprecated and will be removed in Spree 6.1. Use #recalculate_totals! instead.')
-      recalculate_totals!
-    end
-
     # @deprecated Use {Spree::Carts::Merge}; removed in 6.1.
     def merger
       @merger ||= Spree::OrderMerger.new(self)
@@ -684,12 +648,6 @@ module Spree
       Spree.cart_associate_service.call(guest_cart: self, customer: customer, override_email: override_email)
     end
 
-    # @deprecated Use {#associate_customer!}; removed in 6.1.
-    def associate_user!(user, override_email = true)
-      Spree::Deprecation.warn('Spree::Order#associate_user! is deprecated and will be removed in Spree 6.1. Use #associate_customer! instead.')
-      associate_customer!(user, override_email)
-    end
-
     def disassociate_customer!
       nullified_attributes = ASSOCIATED_CUSTOMER_ATTRIBUTES.index_with(nil)
 
@@ -730,18 +688,31 @@ module Spree
       end
     end
 
-    # Refunds are already netted out of payment_total by
-    # Spree::Carts::RecalculateTotals, so returns and claims need no separate
-    # term here — the legacy reimbursement payout was the only one that sat
-    # outside that sum.
+    # Refunds are netted out of payment_total by Spree::Carts::RecalculateTotals,
+    # which is right for money handed back for nothing. A refund for goods that
+    # came back on a return, claim or exchange also settles what the customer
+    # owed for them, so it is added back here — the job the legacy
+    # reimbursement total did. Without it every refunded return read as a
+    # balance due, and the payment dialog offered to charge it again.
     def outstanding_balance
       if canceled?
         -1 * payment_total
       else
-        total - payment_total
+        total - payment_total - returned_items_refund_total
       end
     end
 
+    # What refunds for returns, claims and exchanges have given back. Read off
+    # loaded refunds when a list preloaded them, as {#refunds_total} is, since
+    # every order serializer asks for it.
+    #
+    # @return [BigDecimal]
+    def returned_items_refund_total
+      return refunds.select(&:for_returned_items?).sum(0.to_d, &:amount) if read_association_in_memory?(:refunds)
+
+      refunds.for_returned_items.sum(:amount)
+    end
+
 
     # The payments that settle this order.
     #
@@ -859,19 +830,12 @@ module Spree
     end
 
     def fulfill!
-      fulfillments.each { |shipment| shipment.update!(self) if shipment.persisted? }
       save!
       update_statuses!
     end
 
 
 
-    def available_payment_methods(store = nil)
-      Spree::Deprecation.warn('`Order#available_payment_methods` is deprecated and will be removed in Spree 6.1. Use `payment_methods` instead.')
-
-      @available_payment_methods ||= collect_payment_methods(store)
-    end
-
     def insufficient_stock_lines
       line_items.select(&:insufficient_stock?)
     end
@@ -885,7 +849,7 @@ module Spree
     def ensure_line_item_variants_are_not_discontinued
       Spree::Deprecation.warn('Spree::Order#ensure_line_item_variants_are_not_discontinued is deprecated and will be removed in Spree 6.1. Completion validation lives in Spree::Checkout::Requirements.')
       if line_items.any? { |li| !li.variant || li.variant.discontinued? }
-        errors.add(:base, :discontinued_variants_present, message: Spree.t(:discontinued_variants_present))
+        errors.add(:base, :discontinued_variants_present, message: I18n.t('spree.discontinued_variants_present'))
         false
       else
         true
@@ -898,7 +862,7 @@ module Spree
     def ensure_line_items_are_in_stock
       Spree::Deprecation.warn('Spree::Order#ensure_line_items_are_in_stock is deprecated and will be removed in Spree 6.1. Completion validation lives in Spree::Checkout::Requirements.')
       if insufficient_stock_lines.present?
-        errors.add(:base, :insufficient_stock_lines_present, message: Spree.t(:insufficient_stock_lines_present))
+        errors.add(:base, :insufficient_stock_lines_present, message: I18n.t('spree.insufficient_stock_lines_present'))
         false
       else
         true
@@ -941,7 +905,15 @@ module Spree
       fully_fulfilled?
     end
 
-    def rebuild_fulfillments!
+    # @param keep_selection [Boolean] false when the destination changed, so
+    #   the new proposals start from the default rate
+    def rebuild_fulfillments!(keep_selection: true)
+      # A placed order's delivery was charged at placement; re-pricing it
+      # belongs to the post-placement edit path, not to a rebuild.
+      unless completed?
+        previous_selections = keep_selection ? fulfillments.selected_rates_by_stock_location : {}
+      end
+
       discounts.for_fulfillments.delete_all
       tax_lines.for_fulfillments.delete_all
       fees.for_fulfillments.delete_all
@@ -956,34 +928,13 @@ module Spree
       fulfillment_items.on_hand_or_backordered.delete_all
 
       self.fulfillments = order_routing_strategy.for_allocation.map do |package|
-        package.to_fulfillment.tap { |fulfillment| fulfillment.address_id = ship_address_id }
+        package.to_fulfillment.tap do |fulfillment|
+          fulfillment.address_id = ship_address_id
+          fulfillment.carry_over_selection(previous_selections.fetch(fulfillment.stock_location_id, [])) if previous_selections
+        end
       end
     end
 
-    # @deprecated Use {#rebuild_fulfillments!}; removed in 6.1.
-    def create_proposed_fulfillments
-      Spree::Deprecation.warn('Spree::Order#create_proposed_fulfillments is deprecated and will be removed in Spree 6.1. Use #rebuild_fulfillments! instead.')
-      rebuild_fulfillments!
-    end
-
-    # @deprecated Use {#rebuild_fulfillments!}; removed in 6.1.
-    def create_proposed_shipments
-      Spree::Deprecation.warn('Spree::Order#create_proposed_shipments is deprecated and will be removed in Spree 6.1. Use #rebuild_fulfillments! instead.')
-      rebuild_fulfillments!
-    end
-
-    # @deprecated Use {#delivery_step_required?}; removed in 6.1.
-    def delivery_required?
-      Spree::Deprecation.warn('Spree::Order#delivery_required? is deprecated and will be removed in Spree 6.1. Use #delivery_step_required? (delivery-step applicability) or #shipping_address_required? (address collection) instead.')
-      delivery_step_required?
-    end
-
-    # @deprecated Use {#shipping_address_required?}; removed in 6.1.
-    def requires_ship_address?
-      Spree::Deprecation.warn('Spree::Order#requires_ship_address? is deprecated and will be removed in Spree 6.1. Use #shipping_address_required? instead.')
-      shipping_address_required?
-    end
-
     # Resolves the routing strategy from the channel override first, then the
     # store default. Only a registered Spree::OrderRouting::Strategy::Base
     # subclass is used; any other value (an unregistered/typo'd class, or a
@@ -1053,23 +1004,17 @@ module Spree
       ::Spree::PromotionHandler::Cart.new(self).activate
     end
 
-    # Drops stale fulfillments so they are rebuilt from current items.
+    # Rebuilds stale fulfillments from the current items, keeping the chosen
+    # rates. The first ones are Spree::Orders::BuildFulfillments' to build.
     def ensure_updated_fulfillments
       if fulfillments.any? && !completed?
-        fulfillments.destroy_all
-        update_column(:delivery_total, 0)
+        rebuild_fulfillments!
 
-        # Manually publish update event since update_column bypasses callbacks
+        # Nothing here saves the order, so its update event is published by hand.
         publish_event('order.updated')
       end
     end
 
-    # @deprecated Use {#ensure_updated_fulfillments}; removed in 6.1.
-    def ensure_updated_shipments
-      Spree::Deprecation.warn('Spree::Order#ensure_updated_fulfillments is deprecated and will be removed in Spree 6.1. Use #ensure_updated_fulfillments instead.')
-      ensure_updated_fulfillments
-    end
-
     # Re-quotes every fulfillment for the given audience.
     #
     # @param audience [Symbol] {Spree::DeliveryMethod::STOREFRONT} (default)
@@ -1085,11 +1030,6 @@ module Spree
       refresh_delivery_rates(audience)
     end
 
-    def set_shipments_cost
-      Spree::Deprecation.warn('Spree::Order#set_shipments_cost is deprecated and will be removed in Spree 6.1l. Please use set_fulfillments_cost instead')
-      set_fulfillments_cost
-    end
-
     def set_fulfillments_cost
       fulfillments.each(&:update_amounts)
       recalculate_totals!
@@ -1249,11 +1189,6 @@ module Spree
       csv_lines
     end
 
-    def all_line_items
-      Spree::Deprecation.warn('Spree::Order#all_line_items is deprecated and will be removed in Spree 6.1. Please use Spree::Order#line_items instead')
-      line_items
-    end
-
     private
 
     # An order placed in a split checkout owns no payments, so its money is
@@ -1274,14 +1209,14 @@ module Spree
     def ensure_can_be_deleted
       return true if can_be_deleted?
 
-      errors.add(:base, :order_cannot_be_deleted, message: Spree.t(:order_cannot_be_deleted))
+      errors.add(:base, :order_cannot_be_deleted, message: I18n.t('spree.order_cannot_be_deleted'))
       throw :abort
     end
 
     def valid_order_routing_strategy_class(klass_name)
       return if klass_name.blank?
 
-      klass = Spree.order_routing.strategies.find { |strategy| strategy.to_s == klass_name.to_s }
+      klass = Spree::ApiTyped.registered_class(Spree.order_routing.strategies, klass_name)
       return klass if klass
 
       Rails.logger.warn(
@@ -1303,7 +1238,7 @@ module Spree
 
     def ensure_line_items_present
       unless line_items.present?
-        errors.add(:base, :there_are_no_items_for_this_order, message: Spree.t(:there_are_no_items_for_this_order)) && (return false)
+        errors.add(:base, :there_are_no_items_for_this_order, message: I18n.t('spree.there_are_no_items_for_this_order')) && (return false)
       end
     end
 
@@ -1320,43 +1255,26 @@ module Spree
         if undeliverable_line_items.present?
           product_names = undeliverable_line_items.map(&:name).to_sentence
           errors.add(:base, :products_cannot_be_shipped, product_names: product_names,
-                     message: Spree.t(:products_cannot_be_shipped, product_names: product_names))
+                     message: I18n.t('spree.products_cannot_be_shipped', product_names: product_names))
           self.warnings |= undeliverable_line_items.map do |line_item|
             {
               code: 'delivery_unavailable',
-              message: Spree.t('cart_line_item.delivery_unavailable', li_name: line_item.name),
+              message: I18n.t('spree.cart_line_item.delivery_unavailable', li_name: line_item.name),
               line_item_id: line_item.prefixed_id,
               variant_id: line_item.variant&.prefixed_id
             }
           end
         else
-          errors.add(:base, :items_cannot_be_shipped, message: Spree.t(:items_cannot_be_shipped))
-          self.warnings |= [{ code: 'delivery_unavailable', message: Spree.t(:items_cannot_be_shipped) }]
+          errors.add(:base, :items_cannot_be_shipped, message: I18n.t('spree.items_cannot_be_shipped'))
+          self.warnings |= [{ code: 'delivery_unavailable', message: I18n.t('spree.items_cannot_be_shipped') }]
         end
 
         false
       end
     end
 
-    def collect_payment_methods
-      Spree::Deprecation.warn('`Order#collect_payment_methods` is deprecated and will be removed in Spree 6.1. Use `payment_methods` instead.')
-
-      store.payment_methods.active.storefront_visible.select { |pm| pm.available_for_order?(self) }
-    end
-
     def credit_card_nil_payment?(attributes)
-      payments.store_credits.present? && attributes[:amount].to_f.zero?
-    end
-
-    def recalculate_store_credit_payment
-      recalculate_totals! if using_store_credit?
-
-      if gift_card.present?
-        recalculate_gift_card
-      elsif using_store_credit?
-        Spree.store_credit_apply_service.call(order: self)
-      end
+      payments.store_credits.present? && Spree::Money::Rounding.blank_or_zero?(attributes[:amount])
     end
-
   end
 end

data/app/models/spree/order_group.rb

@@ -39,11 +39,11 @@ module Spree
     has_spree_number prefix: 'R', key: :order
 
     publishes_lifecycle_events
+    publishes_events :completed, :resend_confirmation_email
 
     #
     # Associations
     #
-    belongs_to :store, class_name: 'Spree::Store'
     belongs_to :customer, class_name: "::#{Spree.customer_class}", optional: true
     # The cart this group was completed from — unique, and the replay key that
     # makes a retried completion return this group instead of building another.
@@ -100,9 +100,14 @@ module Spree
     # the children loaded already (a serializer renders them, a gateway call
     # reads four of these in a row), and an aggregate per figure would issue a
     # query each time even against rows sitting in memory.
+    #
+    # +tax_total+ is each child's own derivation rather than a column, summed
+    # like the rest: asking the children keeps the group's answer the one they
+    # gave, where re-deriving it here from the two halves above would be a
+    # second way to reach the same figure.
     ROLLED_UP_TOTALS = %i[
       total item_total delivery_total additional_tax_total included_tax_total
-      discount_total fee_total
+      tax_total discount_total fee_total
     ].freeze
 
     ROLLED_UP_TOTALS.each do |figure|
@@ -112,7 +117,7 @@ module Spree
     end
 
     money_methods(*ROLLED_UP_TOTALS)
-    money_methods :gift_card_total
+    money_methods :gift_card_total, :amount_due
 
     alias ship_total delivery_total
 
@@ -255,9 +260,18 @@ module Spree
       association(:orders).reset
     end
 
+    # Refunds for goods that came back settle what was owed for them, as on
+    # {Spree::Order#outstanding_balance}, so they do not count as uncollected.
+    #
     # @return [BigDecimal] still to collect across the whole checkout
     def outstanding_balance
-      total - payment_total
+      total - payment_total - returned_items_refund_total
+    end
+
+    # @return [BigDecimal] what refunds for returns, claims and exchanges on
+    #   this checkout's payments have given back
+    def returned_items_refund_total
+      Spree::Refund.for_returned_items.where(payment_id: payments.completed.select(:id)).sum(:amount)
     end
 
     # @return [Boolean]

data/app/models/spree/order_inventory.rb

@@ -26,7 +26,10 @@ module Spree
     def verify(shipment = nil, is_updated: false, removing: false)
       return unless order.completed? || shipment.present?
 
-      units_count = fulfillment_items.reload.sum(&:quantity)
+      # A replacement sent by an exchange or claim stands in for a unit the
+      # quantity already paid for, so only a line being destroyed counts it.
+      units = fulfillment_items.reload
+      units_count = (removing ? units : units.reject(&:replacement?)).sum(&:quantity)
       line_item_changed = is_updated ? !line_item.saved_changes? : !line_item.changed?
 
       if removing
@@ -67,12 +70,12 @@ module Spree
 
     def remove_all_units(quantity, target_fulfillment = nil)
       if target_fulfillment.present?
-        remove_from_shipment(target_fulfillment, quantity)
+        remove_from_shipment(target_fulfillment, quantity, include_replacements: true)
       else
         order.fulfillments.each do |shipment|
           break if quantity.zero?
 
-          quantity -= remove_from_shipment(shipment, quantity)
+          quantity -= remove_from_shipment(shipment, quantity, include_replacements: true)
         end
       end
     end
@@ -120,10 +123,12 @@ module Spree
       quantity
     end
 
-    def remove_from_shipment(shipment, quantity)
+    def remove_from_shipment(shipment, quantity, include_replacements: false)
       return 0 if quantity.zero? || shipment.fulfilled?
 
-      shipment_units = shipment.inventory_units_for_item(line_item, variant).reject(&:shipped?).sort_by(&:status)
+      shipment_units = shipment.inventory_units_for_item(line_item, variant).reject do |unit|
+        unit.shipped? || (unit.replacement? && !include_replacements)
+      end.sort_by(&:status)
 
       removed_quantity = 0
       removed_backordered = 0

data/app/models/spree/order_promotion.rb

@@ -41,7 +41,7 @@ module Spree
     private
 
     def exactly_one_owner
-      errors.add(:base, :exactly_one_of_cart_or_order, message: Spree.t('errors.messages.exactly_one_of_cart_or_order')) unless [order, cart].compact.one?
+      errors.add(:base, :exactly_one_of_cart_or_order, message: I18n.t('spree.errors.messages.exactly_one_of_cart_or_order')) unless [order, cart].compact.one?
     end
   end
 end

data/app/models/spree/order_routing/has_strategy_preference.rb

@@ -19,7 +19,7 @@ module Spree
         return if Spree.order_routing.strategies.any? { |strategy| strategy.to_s == value.to_s }
 
         errors.add(
-          :preferred_order_routing_strategy, :invalid_order_routing_strategy, message: Spree.t(:invalid_order_routing_strategy, scope: [:errors, :messages], default: 'is not a registered order routing strategy')
+          :preferred_order_routing_strategy, :invalid_order_routing_strategy, message: I18n.t('spree.errors.messages.invalid_order_routing_strategy')
         )
       end
     end

data/app/models/spree/order_routing/strategy/base.rb

@@ -10,6 +10,8 @@ module Spree
       # Selected per Order via Spree::Order#order_routing_strategy.
       # See docs/plans/6.0-order-routing.md.
       class Base
+        extend Spree::ApiTyped
+
         attr_reader :order
 
         # Human label for admin strategy pickers. Override in a subclass or add
@@ -17,7 +19,7 @@ module Spree
         #
         # @return [String]
         def self.display_name
-          Spree.t(name.demodulize.underscore, scope: 'order_routing.strategies', default: name.demodulize.titleize)
+          I18n.t("spree.order_routing.strategies.#{name.demodulize.underscore}", default: name.demodulize.titleize)
         end
 
         def initialize(order:)
@@ -29,7 +31,7 @@ module Spree
           raise NotImplementedError, "#{self.class} must implement #for_allocation"
         end
 
-        # @param fulfillment [Spree::Shipment]
+        # @param fulfillment [Spree::Fulfillment]
         def for_sale(fulfillment:)
           raise NotImplementedError, "#{self.class} must implement #for_sale"
         end

data/app/models/spree/order_routing/strategy/rules.rb

@@ -23,7 +23,7 @@ module Spree
           estimate_rates(packages)
         end
 
-        # Stock decrement / restock today happens via Spree::Shipment's state
+        # Stock decrement / restock today happens via Spree::Fulfillment's state
         # machine (after_ship / after_cancel). The strategy methods below are
         # part of the contract for the future reservation + typed-movement
         # phase — see 6.0-stock-reservations.md and 6.0-typed-stock-movements.md.

data/app/models/spree/order_routing_rule.rb

@@ -14,6 +14,10 @@ module Spree
   #
   # See docs/plans/6.0-order-routing.md.
   class OrderRoutingRule < Spree.base_class
+    include Spree::TypeLabels
+
+    self.type_labels_scope = 'spree.order_routing_rule_types'
+
     self.table_name = 'spree_order_routing_rules'
 
     # `rank` is integer (lower = better) when the rule has an opinion,
@@ -25,7 +29,6 @@ module Spree
     include Spree::SingleStoreResource
     include Spree::HasListPosition
 
-    belongs_to :store, class_name: 'Spree::Store'
     belongs_to :channel, class_name: 'Spree::Channel'
 
     attribute :active, :boolean, default: true
@@ -51,25 +54,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("order_routing_rule_types.#{api_type}.name", default: api_type.titleize)
-    end
-
-    # @return [String] localized description for the rule kind
-    def self.human_description
-      Spree.t("order_routing_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
-
     # Subclasses override. Returns an Array<LocationRanking> — one per location,
     # with rank=nil to abstain.
     #
@@ -95,14 +79,14 @@ module Spree
       return if type.blank?
       return if Spree.order_routing.rules.any? { |rule| rule.to_s == type }
 
-      errors.add(:type, :invalid_order_routing_rule, message: Spree.t(:invalid_order_routing_rule, scope: [:errors, :messages], default: 'is not a registered order routing rule'))
+      errors.add(:type, :invalid_order_routing_rule, message: I18n.t('spree.errors.messages.invalid_order_routing_rule'))
     end
 
     def channel_belongs_to_store
       return if channel.nil? || store_id.nil?
       return if channel.store_id == store_id
 
-      errors.add(:channel, :channel_store_mismatch, message: Spree.t('errors.messages.channel_store_mismatch'))
+      errors.add(:channel, :channel_store_mismatch, message: I18n.t('spree.errors.messages.channel_store_mismatch'))
     end
   end
 end

data/app/models/spree/package_type.rb

@@ -18,7 +18,6 @@ module Spree
     include Spree::SingleStoreResource
     include Spree::Metadata
 
-    belongs_to :store, class_name: 'Spree::Store'
 
     # Whose packaging this is. Nil is the marketplace's own row — the shared
     # vocabulary every seller may pack into — and a seller's rows are theirs
@@ -95,6 +94,7 @@ module Spree
     # `seller_id` is what the operator's list filters by to see one seller's
     # packaging, or (blank) the marketplace's own.
     self.whitelisted_ransackable_attributes = %w[name kind default seller_id]
+    search_by :name
     self.whitelisted_ransackable_associations = %w[seller]
 
     # The unit the geometry is expressed in, falling back to what the store's
@@ -150,7 +150,7 @@ module Spree
       return unless default?
       return if destroyed_by_association.present?
 
-      errors.add(:base, Spree.t('errors.messages.cannot_delete_default_package_type'))
+      errors.add(:base, I18n.t('spree.errors.messages.cannot_delete_default_package_type'))
       throw(:abort)
     end