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

date filter on dashboard will work fiscal year based akaunting/software#78

Browse Source
This commit is contained in:
Sevan Nerse 2021-03-23 17:32:39 +03:00
parent 468b84354c
commit 6c44c53a60
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Common/Dashboards.php
View File

@ -50,13 +50,6 @@ class Dashboards extends Controller
*/ */
public function show($dashboard_id = null) public function show($dashboard_id = null)
{ {
$date_picker_shortcuts = $this->getDatePickerShortcuts();
if (!request()->has('start_date')) {
request()->merge(['start_date' => $date_picker_shortcuts[trans('reports.this_year')]['start']]);
request()->merge(['end_date' => $date_picker_shortcuts[trans('reports.this_year')]['end']]);
}
$dashboard_id = $dashboard_id ?? session('dashboard_id'); $dashboard_id = $dashboard_id ?? session('dashboard_id');
try { try {
@ -79,6 +72,13 @@ class Dashboards extends Controller
return Widgets::canShow($widget->class); return Widgets::canShow($widget->class);
}); });
$date_picker_shortcuts = $this->getDatePickerShortcuts();
if (!request()->has('start_date')) {
request()->merge(['start_date' => $date_picker_shortcuts[trans('reports.this_year')]['start']]);
request()->merge(['end_date' => $date_picker_shortcuts[trans('reports.this_year')]['end']]);
}
return view('common.dashboards.show', compact('dashboard', 'widgets', 'date_picker_shortcuts')); return view('common.dashboards.show', compact('dashboard', 'widgets', 'date_picker_shortcuts'));
} }

4
app/Traits/DateTime.php
View File

@ -150,6 +150,10 @@ trait DateTime
$this_quarter = $quarter; $this_quarter = $quarter;
} }
if (!isset($this_quarter)) {
$this_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'),