Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Temporairly deactivated helper in new delivery form.

Browse source
This commit is contained in:
Benjamin Meichsner 2013-01-26 15:57:29 +01:00
parent 310a97912c
commit 04b611a080
3 changed files with 28 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/views/deliveries/_form.html.haml
View file

@ -12,9 +12,7 @@
}) })
}); });
.row-fluid = simple_form_for [@supplier, @delivery], validate: true do |f|
.span6
= simple_form_for [@supplier, @delivery], validate: true do |f|
= f.hidden_field :supplier_id = f.hidden_field :supplier_id
#stock_changes #stock_changes
= f.fields_for :stock_changes do |stock_change_form| = f.fields_for :stock_changes do |stock_change_form|
@ -26,6 +24,10 @@
= link_to "Artikel aus Lieferung entfernen", "#", class: 'destroy_stock_change' = link_to "Artikel aus Lieferung entfernen", "#", class: 'destroy_stock_change'
%p %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
%p
%small
Ist ein Artikel noch nicht in der Lagerverwaltung, muss er erst
#{link_to("neu angelegt", new_stock_article_path)} werden.
%hr/ %hr/
= f.input :delivered_on, as: :date_picker = f.input :delivered_on, as: :date_picker
= f.input :note, input_html: {size: '35x4'} = f.input :note, input_html: {size: '35x4'}
@ -33,10 +35,11 @@
= f.submit class: 'btn btn-primary' = f.submit class: 'btn btn-primary'
= link_to "oder abbrechen", supplier_deliveries_path(@supplier) = link_to "oder abbrechen", supplier_deliveries_path(@supplier)
/
TODO: Fix this!!
.span6 .span6
%h2 Neuen Lagerartikel anlegen %h2 Neuen Lagerartikel anlegen
%p %p
//TODO: Fix this!!
Suche nach Artikeln aus dem Suche nach Artikeln aus dem
%i= @supplier.name %i= @supplier.name
Katalog: Katalog:

4
app/views/stockit/index.html.haml
View file

@ -15,9 +15,9 @@
%li= link_to "Nicht verfügbare Artikel zeigen/verstecken", "#", 'data-toggle-this' => 'tr.unavailable', tabindex: -1 %li= link_to "Nicht verfügbare Artikel zeigen/verstecken", "#", 'data-toggle-this' => 'tr.unavailable', tabindex: -1
.btn-group .btn-group
= link_to "Neuen Lagerartikel anlegen", new_stock_article_path, class: 'btn btn-primary'
= link_to_if @current_user.role_orders?, "Lagerbestellung online stellen", new_order_path(supplier_id: 0), = link_to_if @current_user.role_orders?, "Lagerbestellung online stellen", new_order_path(supplier_id: 0),
class: 'btn' class: 'btn', class: 'btn btn-primary'
= link_to "Neuen Lagerartikel anlegen", new_stock_article_path, class: 'btn'
= link_to "Inventur anlegen", new_stock_taking_path, class: 'btn' = link_to "Inventur anlegen", new_stock_taking_path, class: 'btn'
= link_to "Inventurübersicht", stock_takings_path, class: 'btn' = link_to "Inventurübersicht", stock_takings_path, class: 'btn'

4
app/views/stockit/new.html.haml
View file

@ -13,7 +13,9 @@
}) })
%p /
TODO: Fix this
%p
Suche nach Artikeln aus allen Katalogen: Suche nach Artikeln aus allen Katalogen:
= text_field_tag 'article_search' = text_field_tag 'article_search'
#stock_article_form #stock_article_form