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

close #2543 Fixed: remove not equal report basis and financial year option. ( #363b0t5 )

Browse Source
This commit is contained in:
Cüneyt Şentürk
2022-07-21 15:11:52 +03:00
parent 9ca9a5c94a
commit 766c6faea3
5 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
resources/views/components/reports/filter.blade.php
View File

@@ -4,7 +4,7 @@
$filtered = [];
$skipped = [
'keys', 'names', 'types', 'routes', 'defaults'
'keys', 'names', 'types', 'routes', 'defaults', 'operators',
];
foreach ($class->filters as $filter_name => $filter_values) {
@@ -58,31 +58,46 @@
$default_value = $class->filters['defaults'][$filter_name];
}
$operators = [];
if (isset($class->filters['operators']) && !empty($class->filters['operators'][$filter_name])) {
$operators = $class->filters['operators'][$filter_name];
}
if ($key == 'year') {
$default_value = \Date::now()->year;
$operators = [
'equal' => true,
'not_equal' => false,
'range' => false,
];
}
$filters[] = [
'key' => $key,
'value' => $value,
'type' => $type,
'url' => $url,
'values' => $filter_values,
'key' => $key,
'value' => $value,
'type' => $type,
'url' => $url,
'values' => $filter_values,
'operators' => $operators,
];
if (!is_null($default_value)) {
if (! is_null($default_value)) {
$filtered[] = [
'option' => $key,
'operator' => '=',
'value' => $default_value,
'option' => $key,
'operator' => '=',
'value' => $default_value,
'operators' => $operators,
];
}
if (old($key) || request()->get($key)) {
$filtered[] = [
'option' => $key,
'operator' => '=',
'value' => old($key, request()->get($key)),
'option' => $key,
'operator' => '=',
'value' => old($key, request()->get($key)),
'operators' => $operators,
];
}
}