Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'foodcoops/master' into feature-link_to_group_order

Browse source 
Conflicts:
	app/views/shared/_open_orders.html.haml
This commit is contained in:
wvengen 2013-11-25 10:11:56 +01:00
commit 1f08ee4759
58 changed files with 462 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/shared/_open_orders.html.haml
View file

@ -19,7 +19,7 @@
%td= format_time(order.ends) unless order.ends.nil?
- if group_order = order.group_order(ordergroup)
- total += group_order.price
%td= "#{group_order.updated_by.nick} (#{format_time(group_order.updated_on)})"
%td= "#{show_user group_order.updated_by} (#{format_time(group_order.updated_on)})"
%td.numeric
= link_to_ordering(order, show: true) do
- number_to_currency(group_order.price)