Fixed deliveries.

app/views/deliveries/_form.html.haml

@@ -1,4 +1,4 @@
-- content_for :head do
+- content_for :javascript do
   :javascript
     $(function() {
       $('.destroy_stock_change').live('click', function() {
@@ -12,32 +12,29 @@
       })
     });
 
-.left_column(style="width:50%")
-  = simple_form_for [@supplier,@delivery], :validate => true do |f|
-    .box_title
-      %h2 Lieferung anlegen
-    .column_content
+.row-fluid
+  .span6
+    = simple_form_for [@supplier, @delivery], validate: true do |f|
       = f.hidden_field :supplier_id
-      %b Lagerartikel des Lieferanten
       #stock_changes
         = f.fields_for :stock_changes do |stock_change_form|
           %p
             = stock_change_form.select :stock_article_id, stock_articles_for_select(@supplier)
             Menge
-            = stock_change_form.text_field :quantity, :size => 5, :autocomplete => 'off'
+            = stock_change_form.text_field :quantity, size: 5, autocomplete: 'off'
             = stock_change_form.hidden_field :_destroy
-            = link_to "Artikel aus Lieferung entfernen", "#", :class => 'destroy_stock_change'
+            = link_to "Artikel aus Lieferung entfernen", "#", class: 'destroy_stock_change'
       %p
-        = link_to "Lagerartikel der Lieferung hinzufügen", {:action => 'add_stock_change', :supplier_id => @supplier.id}, :remote => true
+        = link_to "Lagerartikel der Lieferung hinzufügen", {action: 'add_stock_change', supplier_id: @supplier.id}, remote: true
       %hr/
-      = f.input :delivered_on
-      = f.input :note, :input_html => {:size => '35x4'}
-      = f.submit
+      = f.input :delivered_on, as: :date_picker
+      = f.input :note, input_html: {size: '35x4'}
+      .form-actions
+        = f.submit class: 'btn btn-primary'
+        = link_to "oder abbrechen", supplier_deliveries_path(@supplier)
 
-.right_column{:style => "width:45%;"}
-  .box_title
+  .span6
     %h2 Neuen Lagerartikel anlegen
-  .column_content
     %p
       //TODO: Fix this!!
       Suche nach Artikeln aus dem
@@ -46,7 +43,4 @@
       = text_field_tag 'article_name'
     %hr/
     #stock_article_form
-      = render :partial => 'stock_article_form', :locals => {:stock_article => @supplier.stock_articles.build}
-
-%p{:style => "clear:both"}
-  = link_to 'Zurück', supplier_deliveries_path(@supplier)
+      = render 'stock_article_form', stock_article: @supplier.stock_articles.build

app/views/deliveries/_stock_article_form.html.haml

@@ -1,5 +1,5 @@
-= simple_form_for stock_article, add_stock_article_supplier_deliveries_path(@supplier), :remote => true,
- :validate => true do |f|
+= simple_form_for stock_article, url: add_stock_article_supplier_deliveries_path(@supplier), remote: true,
+  validate: true do |f|
   = f.hidden_field :supplier_id
   = f.input :name
   = f.input :unit
@@ -8,4 +8,4 @@
   = f.input :tax
   = f.input :deposit
   = f.association :article_category
-  = f.submit
+  = f.submit class: 'btn'

app/views/deliveries/index.html.haml

@@ -1,25 +1,23 @@
 - title "#{@supplier.name}/Lieferungen"
 
-%table.list{:style => "width:50em"}
+%table.table.table-striped
   %thead
     %tr
       %th Geliefert am
-      %th Rechnungsbetrag
+      %th.numeric Rechnungsbetrag
       %th Notiz
-      %th
-      %th
-      %th
   %tbody
     - for delivery in @deliveries
       %tr
         %td=h delivery.delivered_on
-        %td= link_to_invoice(delivery)
+        %td.numeric= link_to_invoice(delivery)
         %td= truncate delivery.note
-        %td= link_to 'Anzeigen', [@supplier, delivery]
-        %td= link_to 'Bearbeiten', edit_supplier_delivery_path(@supplier,delivery)
-        %td= link_to 'Löschen', [@supplier,delivery], :confirm => 'Are you sure?', :method => :delete
+        %td
+          = link_to 'Anzeigen', [@supplier, delivery], class: 'btn btn-mini'
+          = link_to 'Bearbeiten', edit_supplier_delivery_path(@supplier,delivery), class: 'btn btn-mini'
+          = link_to 'Löschen', [@supplier,delivery], :confirm => 'Are you sure?', :method => :delete,
+          class: 'btn btn-mini btn-danger'
 
-%br/
-= link_to "Neue Lieferung für #{@supplier.name} anlegen", new_supplier_delivery_path(@supplier)
+= link_to "Neue Lieferung für #{@supplier.name} anlegen", new_supplier_delivery_path(@supplier), class: 'btn btn-primary'
 |
 = link_to "Lieferantenübersicht", suppliers_path

app/views/deliveries/new.html.haml

@@ -1,3 +1,3 @@
 - title "Neue Lieferung von #{@supplier.name}"
 
-= render :partial => 'form'
+= render 'form'

app/views/deliveries/show.html.haml

@@ -1,55 +1,52 @@
 - title "Lieferung anzeigen"
 
-%p
-  %b Lieferantin:
-  =h @delivery.supplier.name
-%p
-  %b Geliefert am:
-  = @delivery.delivered_on
-%p
-  %b Rechnungsbetrag:
-  = link_to_invoice(@delivery)
-- if @delivery.invoice
-  %p
-    %b bereinigter Rechnungsbetrag:
-    = number_to_currency @delivery.invoice.net_amount
-%p
-  %b Notiz:
-  = simple_format @delivery.note
+%dl
+  %dt Lieferantin
+  %dd= @delivery.supplier.name
+  %dt Geliefert am
+  %dd= @delivery.delivered_on
+  %dt Rechnungsbetrag:
+  %dd= link_to_invoice(@delivery)
+  - if @delivery.invoice
+    %dt bereinigter Rechnungsbetrag:
+    %dd= number_to_currency @delivery.invoice.net_amount
+  %dt Notiz:
+  %dd= simple_format @delivery.note
 
 %h2 Artikel
-%table.list{:style => "width:30em"}
-  %tr
-    %th Artikel
-    %th Einheit
-    %th Menge
-    %th Nettopreis
-    %th Summe
-  - total_net, total_gross = 0,0
-  - for stock_change in @delivery.stock_changes.find :all, :include => :stock_article
-    - quantity = stock_change.quantity
-    - sum = quantity * stock_change.stock_article.price
-    - total_net += sum
-    - total_gross += quantity * stock_change.stock_article.gross_price
+%table.table.table-striped(style="width:500px")
+  %thead
     %tr
-      %td= stock_change.stock_article.name
-      %td= stock_change.stock_article.unit
-      %td= quantity
-      %td= number_to_currency stock_change.stock_article.price
-      %td= number_to_currency sum
-%p
-  Nettosumme:
-  = number_to_currency total_net
-%p
-  Bruttosumme:
-  = number_to_currency total_gross
+      %th Artikel
+      %th Einheit
+      %th.numeric Menge
+      %th.numeric Nettopreis
+      %th.numeric Summe
+  %tbody
+    - total_net, total_gross = 0,0
+    - @delivery.stock_changes.all.each do |stock_change|
+      - quantity = stock_change.quantity
+      - sum = quantity * stock_change.stock_article.price
+      - total_net += sum
+      - total_gross += quantity * stock_change.stock_article.gross_price
+      %tr
+        %td= stock_change.stock_article.name
+        %td= stock_change.stock_article.unit
+        %td.numeric= quantity
+        %td.numeric= number_to_currency stock_change.stock_article.price
+        %td.numeric= number_to_currency sum
+  %tfoot
+    %tr
+      %td(colspan="4") Nettosumme
+      %td.numeric= number_to_currency total_net
+    %tr
+      %td(colspan="4") Bruttosumme
+      %td.numeric= number_to_currency total_gross
+    - if @delivery.invoice
+      %tr
+        %td(colspan="4") Brutto - bereinigter Rechnungsbetrag:
+        %td.numeric= number_to_currency total_gross - @delivery.invoice.net_amount
 
-- if @delivery.invoice
-  %p
-    %b Brutto - bereinigter Rechnungsbetrag:
-    = number_to_currency total_gross - @delivery.invoice.net_amount
-
-%br/
-= link_to 'Bearbeiten', edit_supplier_delivery_path(@supplier,@delivery)
-|
-= link_to 'Lieferungsübersicht', supplier_deliveries_path(@supplier)
+%p
+  = link_to 'Bearbeiten', edit_supplier_delivery_path(@supplier,@delivery), class: 'btn'
+  = link_to 'Lieferungsübersicht', supplier_deliveries_path(@supplier)