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

Update IncomeExpenseSummary.php

Browse Source
This commit is contained in:
sausin
2018-12-14 19:59:12 +05:30
committed by GitHub
parent 78b090b188
commit d1fd63e308
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/Reports/IncomeExpenseSummary.php
View File

@ -30,6 +30,18 @@ class IncomeExpenseSummary extends Controller
$status = request('status'); $status = request('status');
$year = request('year', Date::now()->year); $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_filter = request('categories'); $categories_filter = request('categories');
$income_categories = Category::enabled()->type('income')->when($categories_filter, function ($query) use ($categories_filter) { $income_categories = Category::enabled()->type('income')->when($categories_filter, function ($query) use ($categories_filter) {
@ -42,9 +54,11 @@ class IncomeExpenseSummary extends Controller
// Dates // Dates
for ($j = 1; $j <= 12; $j++) { 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');
$profit_graph[Date::parse($year . '-' . $j)->format('F-Y')] = 0; $profit_graph[Date::parse($ym_string)->format('F-Y')] = 0;
// Totals // Totals
$totals[$dates[$j]] = array( $totals[$dates[$j]] = array(