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

Update TaxSummary.php

Browse Source
This commit is contained in:
sausin
2018-12-14 20:02:35 +05:30
committed by GitHub
parent 3422d29868
commit 8a998b1a3a
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/Reports/TaxSummary.php
View File

@ -28,6 +28,17 @@ class TaxSummary 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();
}
$t = Tax::enabled()->where('rate', '<>', '0')->pluck('name')->toArray();
@ -35,7 +46,9 @@ class TaxSummary extends Controller
// Dates
for ($j = 1; $j <= 12; $j++) {
$dates[$j] = Date::parse($year . '-' . $j)->format('M');
$ym_string = is_array($year) ? $financial_start->addMonth()->format('Y-m') : $year . '-' . $j;
$dates[$j] = Date::parse($ym_string)->format('M');
foreach ($taxes as $tax_name) {
$incomes[$tax_name][$dates[$j]] = [