proper i18n of last ordergroup order (thanks @JuliusR)

This commit is contained in:
wvengen 2013-12-14 13:15:47 +01:00
parent d67a0083f1
commit 46ab4dcc01
3 changed files with 8 additions and 2 deletions

View file

@ -26,6 +26,11 @@ class Ordergroup < Group
User.natural_order.all.reject { |u| (users.include?(u) || u.ordergroup) } User.natural_order.all.reject { |u| (users.include?(u) || u.ordergroup) }
end end
# the most recent order this ordergroup was participating in
def last_order
orders.order('orders.starts DESC').first
end
def value_of_open_orders(exclude = nil) def value_of_open_orders(exclude = nil)
group_orders.in_open_orders.reject{|go| go == exclude}.collect(&:price).sum group_orders.in_open_orders.reject{|go| go == exclude}.collect(&:price).sum
end end

View file

@ -7,13 +7,13 @@
%tr %tr
%th= heading_helper Ordergroup, :name %th= heading_helper Ordergroup, :name
%th= heading_helper Ordergroup, :user_tokens %th= heading_helper Ordergroup, :user_tokens
%th= heading_helper Ordergroup, :last_ordered %th= heading_helper Ordergroup, :last_order
%tbody %tbody
- for ordergroup in @ordergroups - for ordergroup in @ordergroups
%tr %tr
%td= ordergroup.name %td= ordergroup.name
%td=h ordergroup.users.collect { |u| show_user(u) }.join(", ") %td=h ordergroup.users.collect { |u| show_user(u) }.join(", ")
%td= format_date ordergroup.orders.order('orders.starts DESC').first.try(:starts) %td= format_date ordergroup.last_order.try(:starts)
%td= link_to_new_message(message_params: {group_id: ordergroup.id}) %td= link_to_new_message(message_params: {group_id: ordergroup.id})

View file

@ -88,6 +88,7 @@ en:
contact_phone: Phone contact_phone: Phone
description: Description description: Description
ignore_apple_restriction: Ignore order stop by apple points restriction ignore_apple_restriction: Ignore order stop by apple points restriction
last_order: Last order
name: Name name: Name
user_tokens: Members user_tokens: Members
page: page: