mozcode
/
stoptime
1
0
Fork 0
Code Issues 25 Pull Requests Releases Wiki Activity

Moved the CustomersNInvoicesNew lower to fix routing order.

This commit is contained in:
Paul van Tilburg 2011-11-08 13:08:22 +01:00
parent 69497e93d4
commit f543ac554a
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
stoptime.rb
View File

@ -400,18 +400,6 @@ module StopTime::Controllers
end
end
class CustomersNInvoicesNew
def get(customer_id)
@customer = Customer.find(customer_id)
@entries = @customer.time_entries.all(:order => "start ASC",
:conditions => ["invoice_id IS NULL"])
@fixed_cost_tasks = @customer.tasks.all(:order => "updated_at ASC",
:conditions => ["fixed_cost IS NOT NULL AND billed = ?", 'f'])
p @entries, @fixed_cost_tasks
render :invoice_select_form
end
end
class CustomersNInvoicesX
def get(customer_id, invoice_number)
# FIXME: make this (much) nicer!
@ -452,6 +440,18 @@ module StopTime::Controllers
end
end
class CustomersNInvoicesNew
def get(customer_id)
@customer = Customer.find(customer_id)
@entries = @customer.time_entries.all(:order => "start ASC",
:conditions => ["invoice_id IS NULL"])
@fixed_cost_tasks = @customer.tasks.all(:order => "updated_at ASC",
:conditions => ["fixed_cost IS NOT NULL AND billed = ?", 'f'])
p @entries, @fixed_cost_tasks
render :invoice_select_form
end
end
class Timereg
def get
@entries = TimeEntry.all(:order => "start DESC")