move receive screen to orders

app/views/orders/_edit_amounts.html.haml

@@ -40,7 +40,7 @@
 
     function init_add_article(sel) {
       $(sel).removeAttr('disabled').select2({
-        placeholder: '#{t '.add_article'}',
+        placeholder: '#{t 'orders.add_article.title'}',
         data: new_article_data,
         // TODO implement adding a new article, like in deliveries
       }).on('change', function(e) {
@@ -50,7 +50,7 @@
         }
 
         $.ajax({
-          url: '#{finance_receive_add_article_path(@order)}',
+          url: '#{add_article_order_path(@order)}',
           type: 'get',
           data: {article_id: selectedArticle.id},
           contentType: 'application/json; charset=UTF-8'
@@ -71,8 +71,8 @@
 %table.ordered-articles.table.table-striped.stupidtable
   %thead
     %tr
-      %th.sort{:data => {:sort => 'string'}}= t('.number')
-      %th.sort{:data => {:sort => 'string'}}= t('.article')
+      %th.sort{:data => {:sort => 'string'}}= heading_helper Article, :order_number, short: true
+      %th.sort{:data => {:sort => 'string'}}= heading_helper Article, :name
       %th= heading_helper GroupOrderArticle, :units
       %th Members
       %th Ordered
@@ -81,7 +81,7 @@
       %th
   %tbody#result_table
     - @order_articles.each do |order_article|
-      = render :partial => 'edit_article', :locals => {:order_article => order_article}
+      = render :partial => 'edit_amount', :locals => {:order_article => order_article}
   %tfoot
     %tr
       %th{:colspan => 8}

app/views/orders/index.html.haml

@@ -54,7 +54,7 @@
               %td= truncate(order.note)
               %td
                 -# TODO btn-success class only if not received before
-                = link_to t('.receive'), edit_finance_receive_path(order), class: 'btn btn-small btn-success'
+                = link_to t('.receive'), receive_order_path(order), class: 'btn btn-small btn-success'
 
               %td
                 = link_to t('ui.edit'), '#', class: 'btn btn-small disabled'

app/views/orders/receive.html.haml

@@ -1,8 +1,8 @@
 - title "Receiving #{@order.name}"
 
-= form_tag(finance_receive_path(@order), :method => :put) do
+= form_tag(receive_order_path(@order)) do
   %section#results
-    = render 'edit_articles'
+    = render 'edit_amounts'
 
   .form-actions
     .pull-left
@@ -18,6 +18,6 @@
 
     .pull-right
       = submit_tag t('.submit'), class: 'btn btn-primary'
-      = link_to t('ui.or_cancel'), finance_order_index_path
+      = link_to t('ui.or_cancel'), order_path(@order)
 
 %p= link_to_top

app/views/orders/show.html.haml

@@ -31,6 +31,9 @@
         = link_to t('ui.edit'), edit_order_path(@order), class: 'btn'
         = link_to t('.action_end'), finish_order_path(@order), method: :post, class: 'btn btn-success',
           confirm: t('.confirm_end', order: @order.name)
+      - elsif not @order.closed?
+        -# TODO btn-success class only if not received before
+        = link_to t('orders.index.receive'), receive_order_path(@order), class: 'btn btn-success'
       - unless @order.closed?
         = link_to t('ui.delete'), @order, confirm: t('.confirm_delete'), method: :delete,
           class: 'btn btn-danger'