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

Fiddled a bit with created_at/updated_at for invoices.

This commit is contained in:
Paul van Tilburg 2011-11-09 16:02:04 +01:00
parent 6aa19d1e08
commit c4e3161b87
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stoptime.rb
View File

@ -78,6 +78,7 @@ module StopTime::Models
def bill_period def bill_period
bte = billable_time_entries bte = billable_time_entries
if bte.empty? if bte.empty?
# FIXME: better defaults?
[updated_at, updated_at] [updated_at, updated_at]
else else
[bte.first.start, bte.last.end] [bte.first.start, bte.last.end]
@ -119,7 +120,8 @@ module StopTime::Models
end end
def period def period
return [updated_at, updated_at] if tasks.empty? # FIXME: maybe should be updated_at?
return [created_at, created_at] if tasks.empty?
p = tasks.first.bill_period p = tasks.first.bill_period
tasks.each do |task| tasks.each do |task|
tp = task.bill_period tp = task.bill_period
@ -849,7 +851,7 @@ module StopTime::Views
a invoice.number, a invoice.number,
:href => R(CustomersNInvoicesX, @customer.id, invoice.number) :href => R(CustomersNInvoicesX, @customer.id, invoice.number)
end end
td { invoice.updated_at } td { invoice.created_at }
td { _format_period(invoice.period) } td { _format_period(invoice.period) }
# FIXME: really retrieve the payed flag. # FIXME: really retrieve the payed flag.
td { _form_input_checkbox("payed_#{invoice.number}") } td { _form_input_checkbox("payed_#{invoice.number}") }
@ -911,7 +913,7 @@ module StopTime::Views
end end
tr do tr do
td { b "Date" } td { b "Date" }
td { @invoice.updated_at.to_formatted_s(:date_only) } td { @invoice.created_at.to_formatted_s(:date_only) }
end end
tr do tr do
td { b "Period" } td { b "Period" }