kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Added modifications to reports enabling the custom fiscal year changes.

Browse Source
This commit is contained in:
Graham Miller
2016-01-27 13:38:34 +10:00
parent eb31934fb7
commit 5ee8d04800
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Helpers/Report/ReportHelper.php
View File

@@ -4,6 +4,7 @@ namespace FireflyIII\Helpers\Report;
use Carbon\Carbon; use Carbon\Carbon;
use DB; use DB;
use FireflyIII\Helpers\FiscalHelper;
use FireflyIII\Helpers\Collection\Account as AccountCollection; use FireflyIII\Helpers\Collection\Account as AccountCollection;
use FireflyIII\Helpers\Collection\Balance; use FireflyIII\Helpers\Collection\Balance;
use FireflyIII\Helpers\Collection\BalanceEntry; use FireflyIII\Helpers\Collection\BalanceEntry;
@@ -388,13 +389,14 @@ class ReportHelper implements ReportHelperInterface
$start = clone $date; $start = clone $date;
$end = Carbon::now(); $end = Carbon::now();
$months = []; $months = [];
$fiscalHelper = new FiscalHelper;
while ($start <= $end) { while ($start <= $end) {
$year = $start->year; $year = $fiscalHelper->endOfFiscalYear($start)->year;
if (!isset($months[$year])) { if (!isset($months[$year])) {
$months[$year] = [ $months[$year] = [
'start' => Carbon::createFromDate($year, 1, 1)->format('Y-m-d'), 'start' => $fiscalHelper->startOfFiscalYear($start)->format('Y-m-d'),
'end' => Carbon::createFromDate($year, 12, 31)->format('Y-m-d'), 'end' => $fiscalHelper->endOfFiscalYear($start)->format('Y-m-d'),
'months' => [], 'months' => [],
]; ];
} }