diff --git a/stoptime.rb b/stoptime.rb index 0ca2e62..c5e4ae8 100644 --- a/stoptime.rb +++ b/stoptime.rb @@ -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")