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

Merge remote-tracking branch 'tg-x/master'

Browse source 
Conflicts:
	app/views/shared/_open_orders.html.haml
This commit is contained in:
wvengen 2013-12-11 22:39:37 +01:00
commit e25570d870
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,7 @@
%th= heading_helper Order, :name
%th= heading_helper Order, :ends
%th= t '.who_ordered'
%th= heading_helper GroupOrder, :price
%th.numeric= heading_helper GroupOrder, :price
%tbody
- total = 0
- Order.open.each do |order|
@ -20,7 +20,9 @@
- if group_order = order.group_order(ordergroup)
- total += group_order.price
%td= "#{show_user group_order.updated_by} (#{format_time(group_order.updated_on)})"
%td.numeric= number_to_currency(group_order.price)
%td.numeric
= link_to_ordering(order, show: true) do
- number_to_currency(group_order.price)
- else
%td{:colspan => 2}
- if total > 0