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

Fixed wrong articles total in group_order#show.

Browse source 
Conflicts:

	app/views/group_orders/show.html.haml
This commit is contained in:
Benjamin Meichsner 2013-04-08 13:39:02 +02:00 committed by wvengen
parent d4b9370541
commit 93f4239db6
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/views/group_orders/show.html.haml
View file

@ -48,7 +48,6 @@
= t '.articles.order_not_open' = t '.articles.order_not_open'
%th= t '.articles.total_price' %th= t '.articles.total_price'
%tbody %tbody
- total = 0 #set counter for order-sum
- for category_name, order_articles in @order.articles_grouped_by_category - for category_name, order_articles in @order.articles_grouped_by_category
%tr.article-category %tr.article-category
%td %td
@ -75,7 +74,7 @@
%td{colspan: "6"}=h oa.article.note %td{colspan: "6"}=h oa.article.note
%tr{class: cycle('even', 'odd', name: 'articles')} %tr{class: cycle('even', 'odd', name: 'articles')}
%th{colspan: "5"}= t '.articles.sum' %th{colspan: "5"}= t '.articles.sum'
%th= number_to_currency(total) %th= number_to_currency(@group_order.price)
%br/ %br/
= link_to_top = link_to_top
- else - else