Add transport costs to Order

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

@@ -36,8 +36,15 @@
       %th= heading_helper Article, :tax
       %th= heading_helper Article, :deposit
       %th{:colspan => "2"}
-        = link_to t('.add_article'), new_order_order_article_path(@order), remote: true,
-          class: 'btn btn-small' unless @order.closed?
+        - unless @order.closed?
+          .btn-group
+            = link_to t('.add_article'), new_order_order_article_path(@order), remote: true,
+              class: 'btn btn-small'
+            = link_to '#', data: {toggle: 'dropdown'}, class: 'btn btn-small dropdown-toggle' do
+              %span.caret
+            %ul.dropdown-menu
+              %li= link_to t('.add_article'), new_order_order_article_path(@order), remote: true
+              %li= link_to t('.edit_transport'), edit_transport_finance_order_path(@order), remote: true
   %tbody.list#result_table
     - for order_article in @articles.select { |oa| oa.units > 0 }
       = render :partial => "order_article_result", :locals => {:order_article => order_article}
@@ -47,3 +54,10 @@
 
     - 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?

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

@@ -0,0 +1,11 @@
+= simple_form_for @order, url: update_transport_finance_order_path(@order), method: :put do |f|
+  .modal-header
+    = close_button :modal
+    %h3= t('.title')
+  .modal-body
+    = f.input :transport
+    = f.input :transport_distribution, as: :radio_buttons, collection: Order.transport_distributions,
+      include_blank: false, label_method: ->(k){ t("activerecord.attributes.order.transport_distributions.#{k.first}") }
+  .modal-footer
+    = link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}
+    = f.submit t('ui.save'), class: 'btn btn-primary'

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

@@ -8,7 +8,7 @@
     - for group_order in @order.group_orders
       %tr{:class => cycle('even', 'odd')}
         %td= group_order.ordergroup_name
-        %td.numeric= number_to_currency(group_order.price)
+        %td.numeric= number_to_currency(group_order.total)
   .form-actions
     = submit_tag t('.clear'), class: 'btn btn-primary'
     = link_to t('.or_cancel'), new_finance_order_path(order_id: @order.id)

app/views/finance/balancing/edit_transport.js.haml

@@ -0,0 +1,2 @@
+$('#modalContainer').html('#{j(render("edit_transport"))}');
+$('#modalContainer').modal();