sort ordergroups in order screen and pdfs

app/documents/order_by_articles.rb

@@ -14,7 +14,7 @@ class OrderByArticles < OrderPdf
     @order.order_articles.ordered.each do |order_article|
       rows = []
       dimrows = []
-      for goa in order_article.group_order_articles
+      for goa in order_article.group_order_articles.ordered
         rows << [goa.group_order.ordergroup.name,
                   "#{goa.quantity} + #{goa.tolerance}",
                  goa.result,

app/documents/order_by_groups.rb

@@ -12,7 +12,7 @@ class OrderByGroups < OrderPdf
 
   def body
     # Start rendering
-    @order.group_orders.each do |group_order|
+    @order.group_orders.ordered.each do |group_order|
       total = 0
       rows = []
       dimrows = []

app/models/group_order.rb

@@ -17,6 +17,8 @@ class GroupOrder < ActiveRecord::Base
   scope :in_open_orders, joins(:order).merge(Order.open)
   scope :in_finished_orders, joins(:order).merge(Order.finished_not_closed)
 
+  scope :ordered, :include => :ordergroup, :order => 'groups.name'
+
   # Generate some data for the javascript methods in ordering view
   def load_data
     data = {}

app/models/group_order_article.rb

@@ -14,7 +14,7 @@ class GroupOrderArticle < ActiveRecord::Base
   validates_inclusion_of :tolerance, :in => 0..99
   validates_uniqueness_of :order_article_id, :scope => :group_order_id    # just once an article per group order
 
-  scope :ordered, :conditions => 'result > 0 OR quantity > 0 OR tolerance > 0'
+  scope :ordered, :conditions => 'group_order_articles.result > 0 OR group_order_articles.quantity > 0 OR group_order_articles.tolerance > 0', :include => {:group_order => :ordergroup}, :order => 'groups.name'
 
   localize_input_of :result
 

app/views/shared/_articles_by_articles.html.haml

@@ -15,7 +15,7 @@
           = order_article.article.name
           = "(#{order_article.article.unit} | #{order_article.price.unit_quantity} | #{number_to_currency(order_article.price.gross_price)})"
     %tbody
-      - for goa in order_article.group_order_articles
+      - for goa in order_article.group_order_articles.ordered
         %tr{:class => [cycle('even', 'odd', :name => 'groups'), if goa.result == 0 then 'unavailable' end]}
           %td{:style => "width:70%"}=h goa.group_order.ordergroup.name
           %td= "#{goa.quantity} + #{goa.tolerance}"

app/views/shared/_articles_by_groups.html.haml

@@ -13,7 +13,7 @@
       %th= t '.unit'
       %th= t '.price'
 
-  - for group_order in order.group_orders.all
+  - for group_order in order.group_orders.ordered
     %thead
       %tr
         %th{:colspan => "7"}