diff --git a/helpers/formatters.rb b/helpers/formatters.rb index 878b6bc2..70a05696 100755 --- a/helpers/formatters.rb +++ b/helpers/formatters.rb @@ -50,20 +50,20 @@ def format_query_string(s) URI.escape(s) end - def financial_year_formatter(y) - - #date = if(d.kind_of?(String)) then - #Date.parse d - #else - #d - #end - - #if date.month < 4 - #{}"FY#{(date.year-1).to_s[2..3]}/#{date.year.to_s[2..3]}" - #else - "FY#{y.to_s[2..3]}/#{(y+1).to_s[2..3]}" - #end + def financial_year_formatter(d) + + date = if(d.kind_of?(String)) then + Date.parse d + else + d + end + + if date.month < 4 + "FY#{(date.year-1).to_s[2..3]}/#{date.year.to_s[2..3]}" + else + "FY#{date.year.to_s[2..3]}/#{(date.year+1).to_s[2..3]}" end + end def financial_year now = Time.new