From 5ee8d04800a3ac96e16e7df9d3601d2021a50637 Mon Sep 17 00:00:00 2001 From: Graham Miller Date: Wed, 27 Jan 2016 13:38:34 +1000 Subject: [PATCH] Added modifications to reports enabling the custom fiscal year changes. --- app/Helpers/Report/ReportHelper.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Helpers/Report/ReportHelper.php b/app/Helpers/Report/ReportHelper.php index 9cfccfd6f7..bedafc34ca 100644 --- a/app/Helpers/Report/ReportHelper.php +++ b/app/Helpers/Report/ReportHelper.php @@ -4,6 +4,7 @@ namespace FireflyIII\Helpers\Report; use Carbon\Carbon; use DB; +use FireflyIII\Helpers\FiscalHelper; use FireflyIII\Helpers\Collection\Account as AccountCollection; use FireflyIII\Helpers\Collection\Balance; use FireflyIII\Helpers\Collection\BalanceEntry; @@ -388,13 +389,14 @@ class ReportHelper implements ReportHelperInterface $start = clone $date; $end = Carbon::now(); $months = []; + $fiscalHelper = new FiscalHelper; while ($start <= $end) { - $year = $start->year; + $year = $fiscalHelper->endOfFiscalYear($start)->year; if (!isset($months[$year])) { $months[$year] = [ - 'start' => Carbon::createFromDate($year, 1, 1)->format('Y-m-d'), - 'end' => Carbon::createFromDate($year, 12, 31)->format('Y-m-d'), + 'start' => $fiscalHelper->startOfFiscalYear($start)->format('Y-m-d'), + 'end' => $fiscalHelper->endOfFiscalYear($start)->format('Y-m-d'), 'months' => [], ]; }