diff --git a/app/views/ordering/my_order_result.haml b/app/views/ordering/my_order_result.haml index 249e826e..14d5b6c7 100644 --- a/app/views/ordering/my_order_result.haml +++ b/app/views/ordering/my_order_result.haml @@ -74,7 +74,10 @@ %th %abbr{:title => "Menge + Toleranz"} Bestellt %th - %abbr{:title => "Unter Berücksichtigung der anderen Gruppen"} Bekommen + %abbr{:title => "Unter Berücksichtigung der derzeitigen Bestellungen aller Gruppen"} + - if @order.open? + Zu + Erhalten %th Gesamtpreis %tbody - total = 0 #set counter for order-sum @@ -101,7 +104,7 @@ - total += sub_total - # give the article different colors, dependent on order-result - class_name = "ignored" - - if (quantity > 0) + - if (quantity + tolerance > 0) - class_name = result > 0 ? 'success' : 'failed' %tr{:class => cycle('even', 'odd', :name => 'articles') + " " + class_name} %td{:style => "width:40%"}