cleanup orders and add search

Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
	app/views/orders/_articles.html.haml
	app/views/orders/show.html.haml
This commit is contained in:
wvengen 2014-01-17 13:14:49 +01:00
parent bab28d2770
commit 42d622d1b2
11 changed files with 130 additions and 70 deletions

View file

@ -10,9 +10,9 @@
%th= 'Members'
%th= t '.units_full'
- total_net, total_gross, counter = 0, 0, 0
%tbody
%tbody.list
- order.articles_grouped_by_category.each do |category_name, order_articles|
%tr.article-category
%tr.list-heading.article-category
%td
= category_name
%i.icon-tag
@ -26,7 +26,7 @@
- total_gross += units * unit_quantity * gross_price
- cssclass = (units > 0 ? 'used' : (order_article.quantity > 0 ? 'unused' : 'unavailable'))
%tr{:class => cycle('even', 'odd', :name => 'articles') + ' ' + cssclass}
%td=h order_article.article.name
%td.name=h order_article.article.name
%td= order_article.article.unit
%td= "#{number_to_currency(net_price)} / #{number_to_currency(gross_price)}"
- if order.stockit?