Open ended end dates, defaults to last year on invoices
This commit is contained in:
@@ -240,7 +240,7 @@
|
||||
(if date-range-value
|
||||
(-> (condp = date-range-value
|
||||
"week"
|
||||
(let [last-monday (atime/last-monday)]
|
||||
(let [last-monday (coerce/to-date-time (atime/last-monday))]
|
||||
(assoc m
|
||||
start-date-key (time/plus last-monday (time/days -7))
|
||||
end-date-key last-monday))
|
||||
@@ -248,16 +248,16 @@
|
||||
"month"
|
||||
(assoc m
|
||||
start-date-key (time/plus (time/now) (time/months -1))
|
||||
end-date-key (time/now))
|
||||
end-date-key nil)
|
||||
|
||||
"year"
|
||||
(assoc m
|
||||
start-date-key (time/plus (time/now) (time/years -1))
|
||||
end-date-key (time/now))
|
||||
end-date-key nil)
|
||||
|
||||
"all"
|
||||
(assoc m start-date-key (time/plus (time/now) (time/years -6))
|
||||
end-date-key (time/now))
|
||||
end-date-key nil)
|
||||
|
||||
m)
|
||||
(dissoc date-range-key))
|
||||
|
||||
Reference in New Issue
Block a user