Fix transport cost related issues

- Include transport costs when calculating the group sum of an order
- When creating a foodcoop transaction, use the exact inverted sum of the group transactions to prevent rounding issues
- Display transport costs above "The following were not ordered" to avoid confusion

Author: twothreenine

.rubocop_todo.yml

@@ -208,7 +208,7 @@ Metrics/BlockNesting:
 # Offense count: 18
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 304
+  Max: 305
 
 # Offense count: 51
 # Configuration parameters: AllowedMethods, AllowedPatterns.

app/models/order.rb

@@ -221,11 +221,11 @@ def sum(type = :gross)
       end
     elsif %i[groups groups_without_markup].include?(type)
       for go in group_orders.includes(group_order_articles: { order_article: %i[article article_price] })
-        for goa in go.group_order_articles
-          case type
-          when :groups
-            total += goa.result * goa.order_article.price.fc_price
-          when :groups_without_markup
+        case type
+        when :groups
+          total += go.total
+        when :groups_without_markup
+          for goa in go.group_order_articles
             total += goa.result * goa.order_article.price.gross_price
           end
         end
@@ -277,7 +277,7 @@ def close!(user, transaction_type = nil, financial_link = nil, create_foodcoop_t
     update_price_of_group_orders!
 
     transaction do                                        # Start updating account balances
-      charge_group_orders!(user, transaction_type, financial_link)
+      total_group_charges = charge_group_orders!(user, transaction_type, financial_link)
 
       if stockit?                                         # Decreases the quantity of stock_articles
         for oa in order_articles.includes(:article)
@@ -289,7 +289,7 @@ def close!(user, transaction_type = nil, financial_link = nil, create_foodcoop_t
       if create_foodcoop_transaction
         ft = FinancialTransaction.new({ financial_transaction_type: transaction_type,
                                         user: user,
-                                        amount: sum(:groups),
+                                        amount: total_group_charges * -1,
                                         note: transaction_note,
                                         financial_link: financial_link })
         ft.save!
@@ -408,12 +408,15 @@ def update_price_of_group_orders!
 
   def charge_group_orders!(user, transaction_type = nil, financial_link = nil)
     note = transaction_note
+    total = 0
     group_orders.includes(:ordergroup).find_each do |group_order|
       if group_order.ordergroup
         price = group_order.total * -1 # decrease! account balance
-        group_order.ordergroup.add_financial_transaction!(price, note, user, transaction_type, financial_link, group_order)
+        transaction = group_order.ordergroup.add_financial_transaction!(price, note, user, transaction_type, financial_link, group_order)
+        total += transaction.amount
       end
     end
+    total
   end
 
   def transaction_note

app/views/finance/balancing/_edit_results_by_articles.html.haml

@@ -49,15 +49,15 @@
     - for order_article in @articles.select { |oa| oa.units > 0 }
       = render :partial => "order_article_result", :locals => {:order_article => order_article}
 
-    %tr
-      %td{ colspan: 10 } The following were not ordered
-
-    - for order_article in @articles.select { |oa| oa.units == 0 }
-      = render :partial => "order_article_result", :locals => {:order_article => order_article}
-
     - if @order.transport
       %tr
         %td{ colspan: 5 }= heading_helper Order, :transport
         %td{ colspan: 3, data: {value: @order.transport} }= number_to_currency(@order.transport)
         %td= link_to t('ui.edit'), edit_transport_finance_order_path(@order), remote: true,
           class: 'btn btn-mini' unless order_article.order.closed?
+
+    %tr
+      %td{ colspan: 10 } The following were not ordered
+
+    - for order_article in @articles.select { |oa| oa.units == 0 }
+      = render :partial => "order_article_result", :locals => {:order_article => order_article}