Order-refactoring part II.

app/views/shared/_articles_by_articles.html.haml

@@ -4,20 +4,23 @@
       %th{:colspan => '3'} Legende
     %tr
       %th{:style => 'width:70%'} Bestellgruppe
-      %th Menge
+      %th Bestellt
+      %th Bekommen
       %th Gesamtpreis
 
-- for order_article in order.order_articles.all(:include => [:article, :article_price])
+- for order_article in order.order_articles.ordered.all(:include => [:article, :article_price])
   %table{:style => "margin-bottom:1em"}
     %thead
       %tr
-        %th{:colspan => "3"}
+        %th{:colspan => "4"}
           = order_article.article.name
-          = "(#{order_article.article.unit} | #{order_article.price.unit_quantity} | #{number_to_currency(order_article.price.fc_price)})"
+          = "(#{order_article.article.unit} | #{order_article.price.unit_quantity} | #{number_to_currency(order_article.price.gross_price)})"
     %tbody
       - for goa in order_article.group_order_articles
         %tr{:class => cycle('even', 'odd', :name => 'groups')}
           %td{:style => "width:70%"}=h goa.group_order.ordergroup.name
           %td= "#{goa.quantity} (#{goa.tolerance})"
+          %td
+            %b= "#{goa.quantity_result} + #{goa.tolerance_result}"
           %td= number_to_currency(order_article.price.fc_price * goa.quantity)
   - reset_cycle('groups')

app/views/shared/_articles_by_groups.html.haml

@@ -18,13 +18,13 @@
         %th{:colspan => "6"}=h group_order.ordergroup.name
     %tbody
       - total = 0
-      - for goa in group_order.group_order_articles.all(:include => :order_article)
+      - for goa in group_order.group_order_articles.ordered.all(:include => :order_article)
         - fc_price = goa.order_article.price.fc_price
         - subTotal = fc_price * goa.quantity
         - total += subTotal
         %tr{:class => cycle('even', 'odd', :name => 'articles')}
           %td{:style => "width:40%"}=h goa.order_article.article.name
-          %td= "#{goa.quantity} (#{goa.tolerance})"
+          %td= "#{goa.result[:quantity]} (#{goa.result[:tolerance]})"
           %td= number_to_currency(fc_price)
           %td= goa.order_article.price.unit_quantity
           %td= goa.order_article.article.unit