Merge pull request #355 from foodcoop1040/expeted_delivery_date

Add expected delivery date

app/views/shared/_open_orders.html.haml

@@ -8,6 +8,7 @@
       %thead
         %tr
           %th= heading_helper Order, :name
+          %th= heading_helper Order, :pickup
           %th= heading_helper Order, :ends
           %th= t '.who_ordered'
           %th.numeric= heading_helper GroupOrder, :price
@@ -16,6 +17,7 @@
         - Order.open.each do |order|
           %tr
             %td= link_to_ordering(order)
+            %td= format_date(order.pickup) unless order.pickup.nil?
             %td= format_time(order.ends) unless order.ends.nil?
             - if group_order = order.group_order(ordergroup)
               - total += group_order.price
@@ -28,7 +30,7 @@
       - if total > 0
         %tfooter
           %tr
-            %th(colspan="2")
+            %th(colspan="3")
             %th= t('.total_sum') + ':'
             %th.numeric= number_to_currency(total)
   - else