Simplifiying balancing view part 2. Lets call it finished.

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

@@ -1,21 +0,0 @@
-%h2 Mengenänderung
-%p
-  = group_order_article.group_order.ordergroup.name
-  hat von
-  = group_order_article.order_article.article.name
-  bekommen:
-
-- remote_form_for group_order_article, |
-  :url => {:action => 'update_group_order_article', :id => group_order_article }, |
-  :before => "Element.show('loader')", :success => "Element.hide('loader')" do |form| |
-  
-  = form.error_messages
-  %p
-    %b Menge:
-    (Einheit: 
-    = group_order_article.order_article.article.unit
-    ) 
-    = form.text_field :result, :size => "6"
-  = submit_tag "Speichern"
-  | 
-  = link_to_function 'Abbrechen', "Element.hide('edit_box')"  

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

@@ -1,7 +0,0 @@
-%h2 
-  Bearbeiten von
-  = @order_article.article.name
-
-- remote_form_for :order_article, :url => {:action => 'update_order_article', :id => @order_article }, |
-  :before => "Element.show('loader')", :success => "Element.hide('loader')" do |
-  = render :partial => "order_article_form"

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

@@ -7,7 +7,7 @@
         %td Einheiten
         %td Gesamtpreis
         %td{:colspan => "3",:style => "width:14em"}
-          = link_to '[Gruppe hinzufügen]', new_finance_group_order_article_path(order_id: order_article.order_id),
+          = link_to '[Gruppe hinzufügen]', new_finance_group_order_article_path(order_article_id: order_article.id),
             remote: true
     %tbody
       - for group_order_article in order_article.group_order_articles.ordered.all(:include => [:group_order])
@@ -17,19 +17,17 @@
             = group_order_article.group_order.ordergroup.name
           %td{:id => "group_order_article_#{group_order_article.id}_quantity", :style => "white-space:nowrap"}
             = group_order_article.result
-            /= button_to_remote( "+", :url => {:action => "update_group_order_article_result", :id => group_order_article, :modifier => '+'}, :html => {:style => "float:left"}, :success => "Element.hide('loader');", :before => "Element.show('loader');")
-            /= button_to_remote( "-", :url => {:action => "update_group_order_article_result", :id => group_order_article, :modifier => '-'}, :success => "Element.hide('loader');", :before => "Element.show('loader');")
+            = button_to "+", update_result_finance_group_order_article_path(group_order_article, modifier: '+'),
+              method: :put, remote: true, style: 'float:left'
+            = button_to "-", update_result_finance_group_order_article_path(group_order_article, modifier: '-'),
+              method: :put, remote: true
           %td.currency
             = number_to_currency(group_order_article.order_article.price.fc_price * group_order_article.result, :unit => "")
           %td.actions{:style=>"width:1em"}
-            = link_to icon(:edit), '#'
-            /:update => 'edit_box', |
-            /:url => {:action => 'edit_group_order_article', :id => group_order_article}, |
-            /:success => "Element.hide('loader'); Element.show('edit_box')" |
+            = link_to icon(:edit), edit_finance_group_order_article_path(group_order_article), remote: true
           %td.actions{:style=>"width:1em"}
-            = link_to icon(:delete), '#'
-            /:url => {:action => 'destroy_group_order_article', :id => group_order_article}, |
-            /:confirm => 'Bist du sicher?', :method => 'post' |
+            = link_to icon(:delete), finance_group_order_article_path(group_order_article), method: :delete,
+              remote: true
           %td
     %tfoot
       %tr{:class => cycle('even', 'odd', :name => 'results')}

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

@@ -1,17 +0,0 @@
-%h2
-  Neue Gruppenmenge für
-  = group_order_article.order_article.article.name
-- remote_form_for group_order_article, :url => {:action => 'create_group_order_article'}, |
-  :before => "Element.show('loader')", :success => "Element.hide('loader')" do |form| |
-  = form.error_messages
-  %p
-    Gruppe:
-    = form.select :ordergroup_id, Ordergroup.all(:order => "name").collect{ |og| [og.name, og.id] }
-  %p
-    Menge:
-    = form.text_field :result, :size => 5
-    = form.hidden_field :order_article_id
-  %p
-    = submit_tag "Speichern"
-    | 
-    = link_to_function 'Abbrechen', "Element.hide('edit_box')"

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

@@ -19,7 +19,7 @@
 %td= order_article.price.tax
 %td= order_article.price.deposit
 %td
-  = link_to icon(:edit), edit_finance_order_order_article_path(@order, order_article), remote: true
+  = link_to icon(:edit), edit_finance_order_order_article_path(order_article.order, order_article), remote: true
 %td
-  = link_to icon(:delete), finance_order_order_article_path(@order, order_article), method: :delete,
+  = link_to icon(:delete), finance_order_order_article_path(order_article.order, order_article), method: :delete,
     remote: true, confirm: 'Bist du sicher?'

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

@@ -11,6 +11,6 @@
         %td= number_to_currency(group_order.price)
   %p
     %div{:style => "float:left"}
-      = button_to "Abschließen", :action => "close", :id => @order
+      = button_to "Abschließen", close_finance_order_path(@order), method: :put
     %div{:style => "float:right"}
-      = link_to 'Zurück zur Abrechnung', :action => 'new', :id => @order
+      = link_to 'Zurück zur Abrechnung', new_finance_order_path(order_id: @order.id)

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

@@ -58,6 +58,6 @@
               %td= order.name
               %td= format_date(order.ends)
               %td{:class => "currency"}= number_to_currency(order.sum(:fc))
-              %td= link_to "abrechnen", new_finance_order_path(id: order)
+              %td= link_to "abrechnen", new_finance_order_path(order_id: order.id)
     - else
       Super, alles schon abgerechnet...

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

@@ -1,7 +1,4 @@
 - title "beendete Bestellungen"
-%p{:style => "width:30em"}
-  %i
-    Beschreibungstext für die Abrechnunsmodi ....
 .left_column{:style => "width:70em"}
   .box_title
   .column_content
@@ -18,15 +15,15 @@
         %tbody
           - @orders.each do |order|
             %tr{:class => cycle("even","odd", :name => "order")}
-              %td= link_to truncate(order.name), :action => "new", :id => order
+              %td= link_to truncate(order.name), new_finance_order_path(order_id: order.id)
               %td=h format_time(order.ends) unless order.ends.nil?
               %td= order.closed? ? "abgerechnet (#{number_to_currency order.foodcoop_result})" : "beendet"
               %td= order.updated_by.nil? ? '??' : order.updated_by.nick
               %td
                 - unless order.closed?
-                  = link_to "abrechnen", :action => "new", :id => order
+                  = link_to "abrechnen", new_finance_order_path(order_id: order.id)
                   | 
-                  = link_to 'direkt schließen', {:action => 'close_direct', :id => order}, |
-                    :confirm => 'Wirklich die Bestellung schließen setzen?', :method => "post" |
+                  = link_to 'direkt schließen', close_direct_finance_order_path(order),
+                    :confirm => 'Wirklich die Bestellung schließen setzen?', :method => :put
     - else
       %i derzeit gibt es keine beendeten Bestellungen

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

@@ -1,8 +1,5 @@
 - title "#{@order.name} abrechnen"
 
-- if @order.closed?
-  %p
-    %b Achtung, Bestellung wurde schon abgerechnet!
 .left_column{:style => 'width: 24em'}
   .box_title
     %h2 Zusammenfassung
@@ -46,11 +43,11 @@
   .box_title
     #editOrderNav
       %ul
-        %li= link_to 'Gruppenübersicht', new_finance_order_path(@order, view: :groups_overview)
-        /%li= remote_link_to 'Artikelübersicht', :update => 'results', :url => {:action => 'new', :id => @order, :view => 'articlesOverview'}
-        /%li= remote_link_to 'Bestellung bearbeiten', :update => 'results', :url => {:action => 'new', :id => @order, :view => 'editResults'}
+        %li= link_to 'Bestellung bearbeiten', new_finance_order_path(order_id: @order.id, view: 'edit_results'), remote: true
+        %li= link_to 'Gruppenübersicht', new_finance_order_path(order_id: @order.id, view: 'groups_overview'), remote: true
+        %li= link_to 'Artikelübersicht', new_finance_order_path(order_id: @order.id, view: 'articles_overview'), remote: true
   .column_content
     #results
-      = render :partial => 'edit_results_by_articles'
+      = render partial: 'edit_results_by_articles'
     %p= link_to_top
 #edit_box{:style => 'display:none'}

app/views/finance/balancing/new.js.erb

@@ -0,0 +1 @@
+$('#results').html('<%= escape_javascript(render(partial: balancing_view_partial, locals: {order: @order})) %>');