From e40b6fe1a8bed02504f463799b9263c50a094984 Mon Sep 17 00:00:00 2001 From: Gregg Tanzillo Date: Wed, 20 Jun 2018 10:54:38 +0200 Subject: [PATCH] Merge pull request #17606 from lpichler/remove_utc_conversion_from_report_interval_in_chargeback Remove conversion to UTC in Chargeback (cherry picked from commit 9fe07d02c8ee1367b84a0c80a42e25386662349a) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1593677 --- app/models/chargeback/report_options.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/models/chargeback/report_options.rb b/app/models/chargeback/report_options.rb index 72d1de4ccd8..252b15641c1 100644 --- a/app/models/chargeback/report_options.rb +++ b/app/models/chargeback/report_options.rb @@ -62,14 +62,14 @@ def report_time_range ts = Time.now.in_time_zone(tz) case interval when 'daily' - start_time = (ts - start_interval_offset.days).beginning_of_day.utc - end_time = (ts - end_interval_offset.days).end_of_day.utc + start_time = (ts - start_interval_offset.days).beginning_of_day + end_time = (ts - end_interval_offset.days).end_of_day when 'weekly' - start_time = (ts - start_interval_offset.weeks).beginning_of_week.utc - end_time = (ts - end_interval_offset.weeks).end_of_week.utc + start_time = (ts - start_interval_offset.weeks).beginning_of_week + end_time = (ts - end_interval_offset.weeks).end_of_week when 'monthly' - start_time = (ts - start_interval_offset.months).beginning_of_month.utc - end_time = (ts - end_interval_offset.months).end_of_month.utc + start_time = (ts - start_interval_offset.months).beginning_of_month + end_time = (ts - end_interval_offset.months).end_of_month else raise _("interval '%{interval}' is not supported") % {:interval => interval} end