Updated the tasks model for fixed cost tasks and added invoices.
This commit is contained in:
parent
3a26743e0b
commit
c5d28419de
38
stoptime.rb
38
stoptime.rb
|
@ -75,10 +75,20 @@ module StopTime::Models
|
||||||
class Task < Base
|
class Task < Base
|
||||||
has_many :time_entries
|
has_many :time_entries
|
||||||
belongs_to :customer
|
belongs_to :customer
|
||||||
|
|
||||||
|
def fixed_cost?
|
||||||
|
not self.fixed_cost.blank?
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class TimeEntry < Base
|
class TimeEntry < Base
|
||||||
belongs_to :task
|
belongs_to :task
|
||||||
|
has_one :invoice
|
||||||
|
end
|
||||||
|
|
||||||
|
class Invoice < Base
|
||||||
|
has_many :time_entries
|
||||||
|
belongs_to :customer
|
||||||
end
|
end
|
||||||
|
|
||||||
class StopTimeTables < V 1.0
|
class StopTimeTables < V 1.0
|
||||||
|
@ -95,7 +105,7 @@ module StopTime::Models
|
||||||
t.timestamps
|
t.timestamps
|
||||||
end
|
end
|
||||||
create_table TimeEntry.table_name do |t|
|
create_table TimeEntry.table_name do |t|
|
||||||
t.integer :task_id
|
t.integer :task_id, :invoice_id
|
||||||
t.datetime :start, :end
|
t.datetime :start, :end
|
||||||
t.timestamps
|
t.timestamps
|
||||||
end
|
end
|
||||||
|
@ -139,6 +149,32 @@ module StopTime::Models
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
class FixedCostTaskSupport < V 1.4
|
||||||
|
def self.up
|
||||||
|
add_column(Task.table_name, :billed, :boolean)
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.down
|
||||||
|
add_column(Task.table_name, :billed)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
class InvoiceSupport < V 1.5
|
||||||
|
def self.up
|
||||||
|
create_table Invoice.table_name do |t|
|
||||||
|
t.integer :number, :customer_id
|
||||||
|
t.boolean :payed
|
||||||
|
t.timestamps
|
||||||
|
end
|
||||||
|
add_column(TimeEntry.table_name, :invoice_id, :integer)
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.down
|
||||||
|
drop_table Invoice.table_name
|
||||||
|
remove_column(TimeEntry.table_name, :invoice_id)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
end # StopTime::Models
|
end # StopTime::Models
|
||||||
|
|
||||||
module StopTime::Controllers
|
module StopTime::Controllers
|
||||||
|
|
Loading…
Reference in New Issue