Fixed deliveries.
This commit is contained in:
benni
parent
552c553b77
commit
9af26e1da6
14 changed files with 184 additions and 225 deletions
|
|
@ -1,6 +1,6 @@
|
|||
- simple_form_for @supplier do |f|
|
||||
= simple_form_for @supplier do |f|
|
||||
- if @supplier.shared_supplier
|
||||
%p Lieferantin wird mit externer Datenbank verknüpft.
|
||||
.alert.alert-success Lieferantin ist mit externer Datenbank verknüpft.
|
||||
= f.hidden_field :shared_supplier_id
|
||||
= f.input :name
|
||||
= f.input :address
|
||||
|
|
@ -12,8 +12,9 @@
|
|||
= f.input :contact_person
|
||||
= f.input :customer_number
|
||||
= f.input :delivery_days
|
||||
= f.input :order_howto
|
||||
= f.input :note
|
||||
= f.input :order_howto, as: :text, input_html: {rows: 5}
|
||||
= f.input :note, as: :text, input_html: {rows: 5}
|
||||
= f.input :min_order_quantity
|
||||
= f.submit
|
||||
= link_to 'oder abbrechen', suppliers_path
|
||||
.form-actions
|
||||
= f.submit class: 'btn'
|
||||
= link_to 'oder abbrechen', suppliers_path
|
||||
|
|
@ -1,46 +1,29 @@
|
|||
- title "Artikeldatenbank"
|
||||
- title "Lieferanten"
|
||||
|
||||
.left_column{:style => "width:60%"}
|
||||
.box_title
|
||||
%h2 Lieferantinnen
|
||||
.column_content
|
||||
%p
|
||||
%i
|
||||
Erstelle eine
|
||||
= link_to 'neue Lieferantin', new_supplier_path
|
||||
oder
|
||||
= link_to 'importiere', shared_suppliers_suppliers_path
|
||||
aus der externen Artikeldatenbank.
|
||||
%table.list
|
||||
%thead
|
||||
%tr
|
||||
%th Name
|
||||
%th Telefon
|
||||
%th Kunden-Nr
|
||||
%th
|
||||
%th
|
||||
%th
|
||||
%tbody
|
||||
- for supplier in @suppliers
|
||||
%tr{:class => cycle('even','odd', :name => 'suppliers')}
|
||||
%td= link_to h(supplier.name) , supplier
|
||||
%td=h supplier.phone
|
||||
%td=h supplier.customer_number
|
||||
%td= link_to "Artikel (#{supplier.articles.count})", supplier_articles_path(supplier)
|
||||
%td= link_to "im Lager (#{supplier.stock_articles.count})", stock_articles_path
|
||||
%td= link_to "Lieferungen (#{supplier.deliveries.count})", supplier_deliveries_path(supplier)
|
||||
|
||||
.right_column{:style => "width:37%"}
|
||||
.box_title
|
||||
%h2 Letzte Lieferungen
|
||||
.column_content
|
||||
%table
|
||||
%p
|
||||
= link_to 'Neue Lieferantin anlegen', new_supplier_path, class: 'btn btn-primary'
|
||||
oder
|
||||
= link_to 'importiere', shared_suppliers_suppliers_path
|
||||
aus der externen Artikeldatenbank.
|
||||
%table.table.table-striped
|
||||
%thead
|
||||
%tr
|
||||
%th Name
|
||||
%th Telefon
|
||||
%th Kunden-Nr
|
||||
%th
|
||||
%th
|
||||
%th
|
||||
%tbody
|
||||
- for supplier in @suppliers
|
||||
%tr
|
||||
%th Datum
|
||||
%th Betrag
|
||||
%th Lieferantin
|
||||
- for delivery in @deliveries
|
||||
%tr
|
||||
%td= link_to delivery.delivered_on, [delivery.supplier, delivery]
|
||||
%td= link_to_invoice(delivery)
|
||||
%td=h delivery.supplier.name
|
||||
%td= link_to h(supplier.name) , supplier
|
||||
%td= supplier.phone
|
||||
%td= supplier.customer_number
|
||||
%td= link_to "Artikel (#{supplier.articles.count})", supplier_articles_path(supplier)
|
||||
%td= link_to "im Lager (#{supplier.stock_articles.count})", stock_articles_path
|
||||
%td= link_to "Lieferungen (#{supplier.deliveries.count})", supplier_deliveries_path(supplier)
|
||||
%td
|
||||
= link_to "Bearbeiten", edit_supplier_path(supplier), class: 'btn btn-mini'
|
||||
= link_to "Löschen", supplier_path(supplier), method: :delete,
|
||||
confirm: "Achtung, willst Du wirklich den Lieferanten #{supplier.name} löschen?", class: 'btn btn-mini btn-danger'
|
||||
|
|
@ -1,27 +1,28 @@
|
|||
%h1 Externe Listen
|
||||
- title "Externe Listen"
|
||||
%p
|
||||
%i
|
||||
Hier werden die Lieferantinnen der externen Datenbank angezeigt.
|
||||
%br/
|
||||
Ihr könnt externe Lieferantinnen importieren, indem ihr sie einfach abonniert. (siehe unten)
|
||||
%br/
|
||||
Damit wird eine neue Lieferantin angelegt und mit der externen Datenbank verknüpft.
|
||||
Hier werden die Lieferantinnen der externen Datenbank angezeigt.
|
||||
%br/
|
||||
Ihr könnt externe Lieferantinnen importieren, indem ihr sie einfach abonniert. (siehe unten)
|
||||
%br/
|
||||
Damit wird eine neue Lieferantin angelegt und mit der externen Datenbank verknüpft.
|
||||
|
||||
#shared_suppliers
|
||||
%i externe Lieferantinnen
|
||||
%table
|
||||
%table.table.table-striped
|
||||
%thead
|
||||
%tr
|
||||
%th Lieferantin
|
||||
%th Adresse
|
||||
%th Notiz
|
||||
%th Liefertag
|
||||
%th abonniert?
|
||||
%th
|
||||
%tbody
|
||||
- for shared_supplier in @shared_suppliers
|
||||
%tr{:class => cycle('even', 'odd', :name => "shared_suppliers")}
|
||||
%td=h shared_supplier.name
|
||||
%td=h shared_supplier.address
|
||||
%td=h shared_supplier.note
|
||||
%td=h shared_supplier.delivery_days
|
||||
%td= image_tag("icon_message.gif", :size => "16x16", :border => "0",:alt => "abonniert!") if shared_supplier.supplier
|
||||
%td= link_to "abonnieren", new_supplier_path(:shared_supplier_id => shared_supplier) unless shared_supplier.supplier
|
||||
%tr
|
||||
%td= shared_supplier.name
|
||||
%td= shared_supplier.address
|
||||
%td= shared_supplier.note
|
||||
%td= shared_supplier.delivery_days
|
||||
%td
|
||||
- if shared_supplier.supplier
|
||||
%i.icon-ok
|
||||
- else
|
||||
= link_to "abonnieren", new_supplier_path(:shared_supplier_id => shared_supplier), class: 'btn'
|
||||
|
|
@ -1,74 +1,57 @@
|
|||
- title "Lieferantin #{h(@supplier.name)}"
|
||||
- title @supplier.name
|
||||
|
||||
.left_column{:style => "width:45%"}
|
||||
.box_title
|
||||
%h2=h @supplier.name
|
||||
.column_content
|
||||
.row-fluid
|
||||
.span6
|
||||
- if shared_supplier = @supplier.shared_supplier
|
||||
%p
|
||||
%strong Die Lieferantin ist mit der externen Artikledatenbank verknüpft.
|
||||
.alert.alert-info
|
||||
Die Lieferantin ist mit der externen Artikledatenbank verknüpft.
|
||||
|
||||
%table{:style => "width:40em"}
|
||||
%tr
|
||||
%td Adresse:
|
||||
%td{:style => "font-weight:bold"}=h @supplier.address
|
||||
%tr
|
||||
%td Telefon:
|
||||
%td{:style => "font-weight:bold"}=h @supplier.phone
|
||||
%tr
|
||||
%td Telefon2:
|
||||
%td{:style => "font-weight:bold"}=h @supplier.phone2
|
||||
%tr
|
||||
%td FAX:
|
||||
%td{:style => "font-weight:bold"}=h @supplier.fax
|
||||
%tr
|
||||
%td Email:
|
||||
%td{:style => "font-weight:bold"}=h @supplier.email
|
||||
%tr
|
||||
%td Hompage:
|
||||
%td{:style => "font-weight:bold"}=h @supplier.url
|
||||
%tr
|
||||
%td Kontakt-Person:
|
||||
%td{:style => "font-weight:bold"}=h @supplier.contact_person
|
||||
%tr
|
||||
%td Kundennummer:
|
||||
%td{:style => "font-weight:bold"}=h @supplier.customer_number
|
||||
%tr
|
||||
%td Liefertage:
|
||||
%td{:style => "font-weight:bold"}=h @supplier.delivery_days
|
||||
%tr
|
||||
%td BestellHowTo:
|
||||
%td{:style => "font-weight:bold"}=h @supplier.order_howto
|
||||
%tr
|
||||
%td Notiz:
|
||||
%td{:style => "font-weight:bold"}=h @supplier.note
|
||||
%tr
|
||||
%td Liefertage:
|
||||
%td{:style => "font-weight:bold"}=h @supplier.delivery_days
|
||||
%tr
|
||||
%td Mindestbestellmenge:
|
||||
%td{:style => "font-weight:bold"}=h @supplier.min_order_quantity
|
||||
%br/
|
||||
%dl.dl-horizontal
|
||||
%dt Adresse:
|
||||
%dd= @supplier.address
|
||||
%dt Telefon:
|
||||
%dd= @supplier.phone
|
||||
%dt Telefon2:
|
||||
%dd= @supplier.phone2
|
||||
%dt FAX:
|
||||
%dd= @supplier.fax
|
||||
%dt Email:
|
||||
%dd= @supplier.email
|
||||
%dt Hompage:
|
||||
%dd= @supplier.url
|
||||
%dt Kontakt-Person:
|
||||
%dd= @supplier.contact_person
|
||||
%dt Kundennummer:
|
||||
%dd= @supplier.customer_number
|
||||
%dt Liefertage:
|
||||
%dd= @supplier.delivery_days
|
||||
%dt BestellHowTo:
|
||||
%dd= @supplier.order_howto
|
||||
%dt Notiz:
|
||||
%dd= @supplier.note
|
||||
%dt Liefertage:
|
||||
%dd= @supplier.delivery_days
|
||||
%dt Mindestbestellmenge:
|
||||
%dd= @supplier.min_order_quantity
|
||||
|
||||
.clearfix
|
||||
- if @current_user.role_suppliers?
|
||||
= link_to 'Bearbeiten', edit_supplier_path(@supplier)
|
||||
|
|
||||
= link_to 'Löschen', @supplier, :confirm => 'Bist Du sicher?', :method => :delete
|
||||
|
|
||||
= link_to 'zurück', suppliers_path
|
||||
.form-actions
|
||||
= link_to 'Bearbeiten', edit_supplier_path(@supplier), class: 'btn'
|
||||
= link_to 'Löschen', @supplier, :confirm => 'Bist Du sicher?', :method => :delete, class: 'btn btn-danger'
|
||||
|
||||
.right_column{:style => "width:45%"}
|
||||
.box_title
|
||||
.span6
|
||||
%h2 Letzte Lieferungen
|
||||
.column_content
|
||||
%table
|
||||
%tr
|
||||
%th Datum
|
||||
%th Betrag
|
||||
- for delivery in @deliveries
|
||||
%table.table.table-horizontal
|
||||
%thead
|
||||
%tr
|
||||
%td= link_to delivery.delivered_on, [@supplier, delivery]
|
||||
%td= link_to_invoice(delivery)
|
||||
%p
|
||||
= link_to "Neue Lieferung anlegen", new_supplier_delivery_path(@supplier)
|
||||
|
|
||||
%th Datum
|
||||
%th Betrag
|
||||
%tbody
|
||||
- for delivery in @deliveries
|
||||
%tr
|
||||
%td= link_to delivery.delivered_on, [@supplier, delivery]
|
||||
%td= link_to_invoice(delivery)
|
||||
.form-actions
|
||||
= link_to "Neue Lieferung anlegen", new_supplier_delivery_path(@supplier), class: 'btn'
|
||||
= link_to "Zeige alle Lieferungen", supplier_deliveries_path(@supplier)
|
||||
Loading…
Add table
Add a link
Reference in a new issue