From 80ebaece2dddd7ad04dfe27bccf30dbf952b4de9 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Fri, 4 Dec 2015 12:54:00 +1100 Subject: [PATCH] Sort distribution choices by name --- app/controllers/spree/admin/orders_controller_decorator.rb | 4 ++-- app/models/order_cycle.rb | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/spree/admin/orders_controller_decorator.rb b/app/controllers/spree/admin/orders_controller_decorator.rb index e6a48770b2..082d6319b0 100644 --- a/app/controllers/spree/admin/orders_controller_decorator.rb +++ b/app/controllers/spree/admin/orders_controller_decorator.rb @@ -117,7 +117,7 @@ Spree::Admin::OrdersController.class_eval do end def load_distribution_choices - @shops = Enterprise.is_distributor.managed_by(spree_current_user) - @order_cycles = OrderCycle.managed_by(spree_current_user) + @shops = Enterprise.is_distributor.managed_by(spree_current_user).by_name + @order_cycles = OrderCycle.managed_by(spree_current_user).by_name end end diff --git a/app/models/order_cycle.rb b/app/models/order_cycle.rb index 302cf42a06..2488e3ac5b 100644 --- a/app/models/order_cycle.rb +++ b/app/models/order_cycle.rb @@ -24,6 +24,8 @@ class OrderCycle < ActiveRecord::Base scope :soonest_opening, lambda { upcoming.order('order_cycles.orders_open_at ASC') } + scope :by_name, order('name') + scope :distributing_product, lambda { |product| joins(:exchanges). merge(Exchange.outgoing).