fix timezone - time with local timezone to default timezone
This commit is contained in:
@@ -78,15 +78,15 @@ private
|
||||
def get_date_range_from_params
|
||||
if params[:from].present? && params[:to].present?
|
||||
if params[:from_time].present? && params[:to_time].present?
|
||||
from = Time.parse("#{params[:from]} #{params[:from_time]}")
|
||||
to = Time.parse("#{params[:to]} #{params[:to_time]}")
|
||||
from = Time.zone.parse("#{params[:from]} #{params[:from_time]}")
|
||||
to = Time.zone.parse("#{params[:to]} #{params[:to_time]}")
|
||||
else
|
||||
from = Time.parse(params[:from])
|
||||
to = Time.parse(params[:to]).end_of_day
|
||||
from = Time.zone.parse(params[:from])
|
||||
to = Time.zone.parse(params[:to]).end_of_day
|
||||
end
|
||||
else
|
||||
from = Time.now.beginning_of_day
|
||||
to = Time.now.end_of_day
|
||||
from = Time.current.beginning_of_day
|
||||
to = Time.current.end_of_day
|
||||
end
|
||||
return from, to
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user