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

Update DateTime.php

Browse Source
This commit is contained in:
sausin 2018-12-14 20:03:18 +05:30 committed by GitHub
parent 8a998b1a3a
commit a90b3cc6ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Traits/DateTime.php
View File

@ -29,6 +29,18 @@ trait DateTime
$start = Date::parse($year . '-01-01')->format('Y-m-d'); $start = Date::parse($year . '-01-01')->format('Y-m-d');
$end = Date::parse($year . '-12-31')->format('Y-m-d'); $end = Date::parse($year . '-12-31')->format('Y-m-d');
// check if financial year has been customized
$financial_start = Date::parse(setting('general.financial_start'));
if (Date::now()->startOfYear()->format('Y-m-d') !== $financial_start->format('Y-m-d')) {
if (!is_null(request('year'))) {
$financial_start->year = $year;
}
$start = $financial_start->format('Y-m-d');
$end = $financial_start->addYear(1)->subDays(1)->format('Y-m-d');
}
return $query->whereBetween($field, [$start, $end]); return $query->whereBetween($field, [$start, $end]);
} }
@ -70,4 +82,4 @@ trait DateTime
return $groups; return $groups;
} }
} }