Fixed bug in orders index if order.ends.nil?

app/models/order.rb

@@ -94,6 +94,10 @@ class Order < ActiveRecord::Base
     state == "closed"
   end
 
+  def expired?
+    !ends.nil? && ends < Time.now
+  end
+
   # search GroupOrder of given Ordergroup
   def group_order(ordergroup)
     group_orders.first :conditions => { :ordergroup_id => ordergroup.id }

app/models/ordergroup.rb

@@ -81,7 +81,7 @@ class Ordergroup < Group
   def update_stats!
     time = 6.month.ago
     jobs = users.collect { |u| u.tasks.done.all(:conditions => ["updated_on > ?", time]).size }.sum
-    orders_sum = group_orders.select { |go| go.order.ends > time }.collect(&:price).sum
+    orders_sum = group_orders.select { |go| !go.order.ends.nil? && go.order.ends > time }.collect(&:price).sum
     update_attribute(:stats, {:jobs_size => jobs, :orders_sum => orders_sum})
   end
 

app/views/orders/index.haml

@@ -22,8 +22,9 @@
             %th{:colspan => "2"}
         %tbody
           - for order in @open_orders
-            - active = (order.open? and order.ends < Time.now) ? " active" : ""
-            %tr{:class => cycle('even', 'odd', :name => 'open_orders') + active}
+          - tr_class = cycle('even', 'odd', :name => 'open_orders')
+          - tr_class += " active" if order.expired?
+            %tr{:class => tr_class}
               %td=h order.name
               %td=h format_time(order.ends) unless order.ends.nil?
               %td=h truncate(order.note)