app/views/customers/_invoice.html.erb @@ -1,8 +1,14 @@ class CustomersController < ApplicationController def index - @customers = current_user.customers.find :all - + if params[:search] + @customers = current_user.customers.find :all, :conditions => ['name LIKE ?', "%#{params[:search]}%"] + else + unless read_fragment({:id => current_user.id}) + @customers = current_user.customers.find :all + end + end respond_to do |format| + format.js format.html # index.html.erb format.xml { render :xml => @customers } end @@ -68,7 +74,7 @@ class CustomersController < ApplicationController respond_to do |format| flash[:notice] = "Kunde wurde gelöscht" - format.html { redirect_to(admin_customers_url) } + format.html { redirect_to(customers_url) } format.xml { head :ok } end end app/controllers/customers_controller.rb @@ -1,6 +1,8 @@ class Customer < ActiveRecord::Base belongs_to :user has_many :addresses + has_many :invoices, :through => :addresses + has_many :open_invoices, :through => :addresses, :source => :invoices, :conditions => ['payed = ?', false] attr_protected :user_id attr_protected :customer_id app/models/customer.rb @@ -1,5 +1,6 @@ <% if params[:customer_id] %> - <li><%= link_to_unless_current 'neue Adresse', new_customer_address_path(:customer_id => params[:customer_id]) %></li> + <li><%= link_to_unless_current 'zurück zum Kunden', customer_path(params[:customer_id]) %></li> + <li><%= link_to_unless_current 'neue Adresse', new_customer_address_path(params[:customer_id]) %></li> <% else %> <li><%= link_to_unless_current 'neue Adresse', new_address_path %></li> <% end %> app/views/addresses/_navigation.html.erb @@ -2,6 +2,7 @@ <%= error_messages_for :address %> <% form_for :address, @address, :url => address_url(@address), :html => {:method => :put} do |f| %> + <%= hidden_field_tag(:customer_id, params[:customer_id]) unless params[:customer_id].nil? %> <%= render :partial => 'form', :locals => {:f => f} %> <%= submit_tag 'Speichern' %> <% end %> app/views/addresses/edit.html.erb @@ -1,6 +1,9 @@ -<tr> - <td><%= link_to h(address.company), customer_address_url(@customerw, address) %></td> +<tr class="<%= cycle 'odd', 'even' %>"> + <td><%= link_to h(address.company), customer_address_path(@customer, address) %></td> <td><%= h address.name %></td> <td><%= h address.street %> <%= h address.postcode %> <%= h address.city %> <%= h address.country %></td> <td><%= h address.tax_number %></td> + <td><%= link_to 'zeigen', customer_address_path(@customer, address) %> + <%= link_to 'bearbeiten', edit_customer_address_path(@customer, address) %> + <%= link_to_destroy 'löschen', {:id => address.id}, {:href => confirm_destroy_customer_address_path(@customer, address)} %></td> </tr> app/views/customers/_address.html.erb @@ -1 +1,7 @@ -<li><%= link_to customer.name, customer_url(customer) %></li> \ No newline at end of file +<tr id="customer-<%= customer.id %>" class="<%= cycle 'odd', 'even' %>"> + <td><%= customer.id %></td> + <td><%= link_to customer.name, customer_url(customer) %></td> + <td><%= customer.invoices.count %></td> + <td><%= customer.open_invoices.count %></td> + <td><%= link_to 'ändern', edit_customer_path(customer) %> <%= link_to 'zeigen', customer_path(customer) %> <%= link_to_destroy 'löschen', {:id => customer.id}, {:href => confirm_destroy_customer_path(customer)} %></td> +</tr> app/views/customers/_customer.html.erb @@ -1,3 +1,14 @@ -<ul> +<% @page_title = 'Kunden' %> + +<table id="customers"> + <tr> + <th>#</th> + <th>Name</th> + <th>Rechnungen</th> + <th>davon offen</th> + <th>Aktionen</th> + </tr> + <% cache({:id => current_user.id}) do %> <%= render :partial => 'customer', :collection => @customers %> -</ul> \ No newline at end of file + <% end %> +</table> \ No newline at end of file app/views/customers/index.html.erb @@ -1,17 +1,38 @@ <% @page_title = 'Kunde %s ' % @customer.name %> <h3>Adressen</h3> - <%= link_to 'Neue Adresse anlegen', new_customer_address_url(@customer) %> + <%= link_to 'Neue Adresse anlegen', new_customer_address_path(@customer) %> <% if @customer.addresses.nil? %> <p>Noch keine Adressen vorhanden</p> <% else %> -<table class="form"> +<table id="addresses"> <tr> - <th width="20%">Firmenname</th> - <th width="20%">Ansprechperson</th> - <th width="50%">Adresse</th> - <th width="10%">Steuernummer</th> + <th width="14%">Firmenname</th> + <th width="10%">Ansprechperson</th> + <th width="40%">Adresse</th> + <th width="16%">Steuernummer</th> + <th width="20%">Aktionen</th> </tr> <%= render :partial => 'address', :collection => @customer.addresses %> </table> +<% end %> +<h3>Rechnungen</h3> + <%= link_to 'Neue Rechnung stellen', new_customer_invoice_path(@customer) %> +<% if @customer.invoices.nil? %> + <p>Noch keine Rechnungen vorhanden.</p> +<% else %> +<table id="invoices"> + <tr> + <th width="2%">#</th> + <th width="12%">Rechnungsdatum</th> + <th width="10%">bezahlt am</th> + <th width="40%">Titel</th> + <th width="8%">Bruttobetrag</th> + <th width="8%">Steueranteil</th> + <th width="20%">Aktionen</th> + </tr> + <% reset_cycle %> + <%= render :partial => 'invoice', :collection => @customer.invoices %> +</table> + <% end %> \ No newline at end of file app/views/customers/show.html.erb @@ -1,9 +1,11 @@ ActionController::Routing::Routes.draw do |map| - map.resources :customers, :has_many => :addresses + map.resources :customers, :member => {:confirm_destroy => :get} do |customer| + customer.resources :addresses, :invoices, :member => {:confirm_destroy => :get} + end map.resources :users, :has_many => :addresses - map.resources :addresses - map.resources :invoices, :has_many => :items, :member => {:confirm_destroy => :get} + map.resources :addresses, :member => {:confirm_destroy => :get} + map.resources :invoices, :has_many => :items, :member => {:confirm_destroy => :get}, :has_one => :customer map.resources :items map.root :controller => 'invoices' config/routes.rb 1a73e87734b98d1b04112222bf6292e67141bd2e TomK32 tomk32@tomk32.de http://github.com/TomK32/exabuch/commit/2b7905c9858878abd2c823fba5ad621e543a022d 2b7905c9858878abd2c823fba5ad621e543a022d 2008-05-13T00:09:07-07:00 2008-05-13T00:09:07-07:00 completed customer controller a4fd6f74aad6ef8ff534eb22024534ae7d046d51 TomK32 tomk32@tomk32.de