Moved the CustomersNInvoicesNew lower to fix routing order.
This commit is contained in:
parent
69497e93d4
commit
f543ac554a
24
stoptime.rb
24
stoptime.rb
|
@ -400,18 +400,6 @@ module StopTime::Controllers
|
||||||
end
|
end
|
||||||
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
|
class CustomersNInvoicesX
|
||||||
def get(customer_id, invoice_number)
|
def get(customer_id, invoice_number)
|
||||||
# FIXME: make this (much) nicer!
|
# FIXME: make this (much) nicer!
|
||||||
|
@ -452,6 +440,18 @@ module StopTime::Controllers
|
||||||
end
|
end
|
||||||
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
|
class Timereg
|
||||||
def get
|
def get
|
||||||
@entries = TimeEntry.all(:order => "start DESC")
|
@entries = TimeEntry.all(:order => "start DESC")
|
||||||
|
|
Loading…
Reference in New Issue