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

Merge pull request #2029 from sevannerse/master

Browse Source 
previous quarter shortcut on the dashboard date filter fixed
This commit is contained in:
Cüneyt Şentürk 2021-05-07 16:44:08 +03:00 committed by GitHub
commit 4644e92c3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Traits/DateTime.php
View File

@ -144,16 +144,24 @@ trait DateTime
foreach ($financial_quarters as $quarter) { foreach ($financial_quarters as $quarter) {
if ($today->lessThan($quarter->getStartDate()) || $today->greaterThan($quarter->getEndDate())) { if ($today->lessThan($quarter->getStartDate()) || $today->greaterThan($quarter->getEndDate())) {
$previous_quarter = $quarter;
continue; continue;
} }
$this_quarter = $quarter; $this_quarter = $quarter;
break;
} }
if (!isset($this_quarter)) { if (!isset($this_quarter)) {
$this_quarter = $financial_quarters[0]; $this_quarter = $financial_quarters[0];
} }
if (!isset($previous_quarter)) {
$previous_quarter = $financial_quarters[0];
}
$date_picker_shortcuts = [ $date_picker_shortcuts = [
trans('reports.this_year') => [ trans('reports.this_year') => [
'start' => $financial_year->getStartDate()->format('Y-m-d'), 'start' => $financial_year->getStartDate()->format('Y-m-d'),
@ -168,8 +176,8 @@ trait DateTime
'end' => $this_quarter->getEndDate()->format('Y-m-d'), 'end' => $this_quarter->getEndDate()->format('Y-m-d'),
], ],
trans('reports.previous_quarter') => [ trans('reports.previous_quarter') => [
'start' => $this_quarter->getStartDate()->copy()->subQuarter()->format('Y-m-d'), 'start' => $previous_quarter->getStartDate()->format('Y-m-d'),
'end' => $this_quarter->getEndDate()->copy()->subQuarter()->format('Y-m-d'), 'end' => $previous_quarter->getEndDate()->format('Y-m-d'),
], ],
trans('reports.last_12_months') => [ trans('reports.last_12_months') => [
'start' => $today->copy()->subYear()->startOfDay()->format('Y-m-d'), 'start' => $today->copy()->subYear()->startOfDay()->format('Y-m-d'),