Admin, create new order: distributor and order cycle are now mandatory on step 1 (aka the set_distribution step)

app/controllers/spree/admin/orders_controller.rb

@@ -9,8 +9,8 @@ class OrdersController < Spree::Admin::BaseController
       helper CheckoutHelper
 
       before_action :load_order, only: [:edit, :update, :fire, :resend,
-                                        :invoice, :print]
-      before_action :load_distribution_choices, only: [:new, :edit, :update]
+                                        :invoice, :print, :set_distribution]
+      before_action :load_distribution_choices, only: [:new, :edit, :update, :set_distribution]
 
       # Ensure that the distributor is set for an order when
       before_action :ensure_distribution, only: :new
@@ -21,10 +21,13 @@ class OrdersController < Spree::Admin::BaseController
       def new
         @order = Order.create
         @order.created_by = spree_current_user
+        @order.generate_order_number
         @order.save
-        redirect_to spree.edit_admin_order_url(@order)
+        redirect_to spree.distribution_admin_order_path(@order)
       end
 
+      def set_distribution; end
+
       def edit
         @order.shipments.map(&:refresh_rates)
 

app/models/spree/ability.rb

@@ -274,7 +274,7 @@ def add_order_management_abilities(user)
           # Enterprise User can access orders that are placed inside a OC they coordinate
           order.order_cycle&.coordinated_by?(user)
       end
-      can [:admin, :bulk_management, :managed], Spree::Order do
+      can [:admin, :bulk_management, :managed, :set_distribution], Spree::Order do
         user.admin? || user.enterprises.any?(&:is_distributor)
       end
       can [:admin, :create, :show, :poll], :invoice

config/routes/spree.rb

@@ -89,6 +89,7 @@
         post :resend
         get :invoice
         get :print
+        get :distribution, to: 'orders#set_distribution'
       end
 
       collection do