shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update IncomeSummary.php

Browse Source
This commit is contained in:
sausin 2018-12-14 20:00:47 +05:30 committed by GitHub
parent 9f81918e4c
commit a85d979bf2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Controllers/Reports/IncomeSummary.php
View File

@ -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(