spree_core 5.6.0.rc4 → 5.6.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81bf3080a8d43c9bc6a6d76561c9fae751c9282a1e8b30dfb388ca6abe2511d7
-  data.tar.gz: 423cf415d52c180297db3e26b581ea4078cfcf0e7816fc3084d12034b3d74a87
+  metadata.gz: 1b3d64f54fca96fb946e3ee9b49d80648677ce7f5c36d0d6bb10769bf8c98df9
+  data.tar.gz: 82a353e9cad247a2be8f909d569ab286f323a63fe04b1ef5676d66c72001fdf7
 SHA512:
-  metadata.gz: 351598372ce3b7d938815929ac76d050a45679aad1a4734c07a5642f932b81e0e688e0903538e2446c30516545083d2c6d52963b82598650d6e998606aeb8341
-  data.tar.gz: 258324d4c6e23afbe5702782daf6e19811af60136b4f93bbd99d27824830ee7211426fde12f1330175132b4c82c281cfc6295ca0d7cd6f2cc400cce5e3f7e729
+  metadata.gz: ee39b451ea0e40f7ea1b0811ae858b7a58580952c943b3356a642acf3b04dc5a461c2ae8864db916a14f1dcbe4b46428b924e852fdb21e271d071e3917388561
+  data.tar.gz: a90ca190815ef4e7ba9fec0cfe9bce1902b4c00eb35c1cd27c64e2edbe20980d69353826c612b4534cea402723a0cb5db8e9f2da4aea5023d5e51e05764c2175

data/app/models/spree/order_routing_rule.rb

@@ -29,7 +29,15 @@ module Spree
 
     attribute :active, :boolean, default: true
 
+    # acts_as_list only assigns bottom positions in before_create — too late
+    # for the presence validation below, so API creates without an explicit
+    # position would 422. Default to the end of the channel's list instead.
+    before_validation :set_position_to_end, on: :create, if: -> { position.blank? && channel.present? }
+
     validates :type, :channel, presence: true
+    # One instance of each rule kind per channel — a duplicate signal would
+    # either be a no-op or fight itself in the reducer walk.
+    validates :type, uniqueness: { scope: [:channel_id, *spree_base_uniqueness_scope] }
     validates :position, presence: true, numericality: { only_integer: true }
     validate :channel_belongs_to_store
 
@@ -43,6 +51,25 @@ 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.
     #
@@ -53,8 +80,24 @@ module Spree
       raise NotImplementedError, "#{self.class} must implement #rank(order, locations)"
     end
 
+    # Routes Spree::PreferenceSchema's subclass discovery
+    # (`subclasses_with_preference_schema`, `find_by_api_type`) to the
+    # order-routing rule registry.
+    module ClassMethods
+      private
+
+      def registered_subclasses
+        Spree.order_routing.rules
+      end
+    end
+    extend ClassMethods
+
     private
 
+    def set_position_to_end
+      self.position = bottom_position_in_list + 1
+    end
+
     # The +type+ presence validation already covers blank; here we only reject
     # a present-but-unregistered STI type so arbitrary class names can't be
     # persisted via the +type+ column.

data/app/models/spree/permission_sets/configuration_management.rb

@@ -45,8 +45,9 @@ module Spree
         can :manage, Spree::ReimbursementType
         can :manage, Spree::ReturnReason
 
-        # Channels
+        # Channels + per-channel order routing rules
         can :manage, Spree::Channel
+        can :manage, Spree::OrderRoutingRule
 
         # Restrictions on immutable types
         cannot [:edit, :update], Spree::RefundReason, mutable: false

data/config/locales/en.yml

@@ -1190,6 +1190,16 @@ en:
       strategies:
         legacy: Legacy
         rules: Rules (ordered)
+    order_routing_rule_types:
+      default_location:
+        description: Prefer the stock location marked as default
+        name: Default location
+      minimize_splits:
+        description: Prefer the location that can fulfill the most items on its own, avoiding split shipments
+        name: Minimize splits
+      preferred_location:
+        description: Fulfill from the location pinned on the order, when one is set
+        name: Preferred location
     order_summary: Order Summary
     order_total: Order Total
     orders: Orders

data/db/migrate/20260721000001_add_unique_type_index_to_spree_order_routing_rules.rb

@@ -0,0 +1,7 @@
+class AddUniqueTypeIndexToSpreeOrderRoutingRules < ActiveRecord::Migration[7.2]
+  def change
+    add_index :spree_order_routing_rules, [:channel_id, :type],
+              unique: true,
+              name: 'idx_order_routing_rules_channel_type'
+  end
+end

data/db/sample_data/wholesale.rb

@@ -20,7 +20,19 @@ end
 wholesale_group.add_customers([buyer.id])
 
 price_list = store.price_lists.find_or_create_by!(name: 'Wholesale') do |list|
-  list.description = 'Wholesale pricing for approved B2B buyers (40% off retail)'
+  list.description = 'Wholesale pricing for approved B2B buyers (40% off retail) on orders of 10+ per item'
+end
+
+# Case-pack minimum: the trade price applies only when a buyer orders at least
+# WHOLESALE_MIN_QUANTITY of a single item (VolumeRule matches per line item, not
+# per order). Below the threshold the buyer falls back to the retail price — no
+# hard checkout block. This is what makes the demo feel like real wholesale.
+wholesale_min_quantity = 10
+
+unless price_list.price_rules.any? { |rule| rule.is_a?(Spree::PriceRules::VolumeRule) }
+  volume_rule = Spree::PriceRules::VolumeRule.new(price_list: price_list)
+  volume_rule.preferred_min_quantity = wholesale_min_quantity
+  volume_rule.save!
 end
 
 unless price_list.price_rules.any? { |rule| rule.is_a?(Spree::PriceRules::CustomerGroupRule) }

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.6.0.rc4'.freeze
+  VERSION = '5.6.0.rc5'.freeze
 
   def self.version
     VERSION

data/lib/spree/testing_support/factories/order_routing_rule_factory.rb

@@ -0,0 +1,14 @@
+FactoryBot.define do
+  # STI base can't be persisted (type must be a registered subclass), so the
+  # factory defaults to DefaultLocation. Channels seed all built-in kinds on
+  # create and `type` is unique per channel, so the factory clears the seeded
+  # list — specs get a pristine channel whose only rule is the one built here.
+  # Position defaults to the end of the channel's list via the model callback.
+  factory :order_routing_rule, class: Spree::OrderRouting::Rules::DefaultLocation do
+    channel { association(:channel).tap { |c| c.order_routing_rules.delete_all } }
+    store { channel.store }
+
+    factory :preferred_location_routing_rule, class: Spree::OrderRouting::Rules::PreferredLocation
+    factory :minimize_splits_routing_rule, class: Spree::OrderRouting::Rules::MinimizeSplits
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.6.0.rc4
+  version: 5.6.0.rc5
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-20 00:00:00.000000000 Z
+date: 2026-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -1604,6 +1604,7 @@ files:
 - db/migrate/20260710000001_add_import_id_status_index_to_spree_import_rows.rb
 - db/migrate/20260711000001_add_preferences_to_spree_exports.rb
 - db/migrate/20260719000001_add_channel_id_to_spree_api_keys.rb
+- db/migrate/20260721000001_add_unique_type_index_to_spree_order_routing_rules.rb
 - db/sample_data/channels.rb
 - db/sample_data/customers.csv
 - db/sample_data/markets.rb
@@ -1748,6 +1749,7 @@ files:
 - lib/spree/testing_support/factories/options_factory.rb
 - lib/spree/testing_support/factories/order_factory.rb
 - lib/spree/testing_support/factories/order_promotion_factory.rb
+- lib/spree/testing_support/factories/order_routing_rule_factory.rb
 - lib/spree/testing_support/factories/payment_capture_event_factory.rb
 - lib/spree/testing_support/factories/payment_factory.rb
 - lib/spree/testing_support/factories/payment_method_factory.rb
@@ -1865,9 +1867,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.6.0.rc4
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.6.0.rc5
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.6.0.rc4
+  source_code_uri: https://github.com/spree/spree/tree/v5.6.0.rc5
 post_install_message:
 rdoc_options: []
 require_paths: