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

Merge pull request #2257 from sevannerse/basis-default-filter-reports

Browse Source 
Basis default filter reports
This commit is contained in:
Cüneyt Şentürk
2021-10-05 22:17:12 +03:00
committed by GitHub
parent 6f50088621 8bdb6e2e98
commit 60f79340fd
9 changed files with 75 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
resources/views/partials/reports/filter.blade.php
View File

@ -10,7 +10,7 @@
$filtered = [];
$skipped = [
'keys', 'names', 'types', 'routes'
'keys', 'names', 'types', 'routes', 'defaults'
];
foreach ($class->filters as $filter_name => $filter_values) {
@ -58,6 +58,16 @@
$url = (is_array($route)) ? route($route[0], $route[1]) : route($route);
}
$default_value = null;
if (isset($class->filters['defaults']) && !empty($class->filters['defaults'][$filter_name])) {
$default_value = $class->filters['defaults'][$filter_name];
}
if ($key == 'year') {
$default_value = \Date::now()->year;
}
$filters[] = [
'key' => $key,
'value' => $value,
@ -66,11 +76,11 @@
'values' => $filter_values,
];
if ($key == 'year') {
if (!is_null($default_value)) {
$filtered[] = [
'option' => $key,
'operator' => '=',
'value' => \Date::now()->year,
'value' => $default_value,
];
}