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

Introduced group_order_article.result to save the result for each group/article.

Browse source
This commit is contained in:
Benjamin Meichsner 2009-02-04 16:41:01 +01:00
parent 6fd5d825f9
commit 251ced4fa1
27 changed files with 106 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/views/ordering/my_order_result.haml
View file

@ -62,11 +62,11 @@
%th
%abbr{:title => "Menge + Toleranz"} Bestellt
%th
%abbr{:title => "Unter Berücksichtigung der anderen Gruppen"} Zugeteilt
%abbr{:title => "Unter Berücksichtigung der anderen Gruppen"} Bekommen
%th Gesamtpreis
%tbody
- total = 0 #set counter for order-sum
- for category_name, order_articles in @order.get_articles
- for category_name, order_articles in @order.articles_grouped_by_category
%tr{:style => "background-color:#EFEFEF"}
%td{:style => "text-align:left;"}=h category_name
%td{:colspan => "9"}
@ -76,8 +76,11 @@
- if goa
- quantity = goa.quantity
- tolerance = goa.tolerance
- result = goa.result[:total]
- sub_total = oa.price.fc_price * (quantity + tolerance)
- result = goa.result
- if @order.open?
- sub_total = oa.price.fc_price * (quantity + tolerance)
- else
- sub_total = oa.price.fc_price * result
- else
- quantity, tolerance, result, sub_total = 0, 0, 0, 0
- total += sub_total

2
app/views/ordering/order.rhtml
View file

@ -82,7 +82,7 @@
<%-
total = 0
i = 0
@articles_by_category.each do |category, order_articles|
@articles_grouped_by_category.each do |category, order_articles|
-%>
<tr style="background-color:#EFEFEF">
<td style="text-align:left"><b><%=h category %></b></td>