From a85d979bf278eb983b11474111e7c16fb288d4fd Mon Sep 17 00:00:00 2001 From: sausin Date: Fri, 14 Dec 2018 20:00:47 +0530 Subject: [PATCH] Update IncomeSummary.php --- app/Http/Controllers/Reports/IncomeSummary.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Reports/IncomeSummary.php b/app/Http/Controllers/Reports/IncomeSummary.php index 50a02a5f4..76f8dda10 100644 --- a/app/Http/Controllers/Reports/IncomeSummary.php +++ b/app/Http/Controllers/Reports/IncomeSummary.php @@ -26,6 +26,17 @@ class IncomeSummary extends Controller $status = request('status'); $year = request('year', Date::now()->year); + + // check and assign year start + if (($financial_start = Date::parse(setting('general.financial_start')))->month != 1) { + // check if a specific year is requested + if (!is_null(request('year'))) { + $financial_start->year = $year; + } + + $year = [$financial_start->format('Y'), $financial_start->addYear()->format('Y')]; + $financial_start->subYear()->subMonth(); + } $categories = Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id')->toArray(); @@ -39,9 +50,11 @@ class IncomeSummary extends Controller // Dates for ($j = 1; $j <= 12; $j++) { - $dates[$j] = Date::parse($year . '-' . $j)->format('F'); + $ym_string = is_array($year) ? $financial_start->addMonth()->format('Y-m') : $year . '-' . $j; + + $dates[$j] = Date::parse($ym_string)->format('F'); - $incomes_graph[Date::parse($year . '-' . $j)->format('F-Y')] = 0; + $incomes_graph[Date::parse($ym_string)->format('F-Y')] = 0; // Totals $totals[$dates[$j]] = array(