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

Report show set default financial year filter..

Browse Source
This commit is contained in:
Cüneyt Şentürk 2021-06-01 22:02:30 +03:00
parent a9c4a7db08
commit 8cc4e32e04
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Traits/DateTime.php
View File

@ -190,22 +190,14 @@ trait DateTime
public function getMonthlyDateFormat($year = null) public function getMonthlyDateFormat($year = null)
{ {
$format = 'M'; $format = 'M Y';
if ($this->getFinancialStart($year)->month != 1) {
$format = 'M Y';
}
return $format; return $format;
} }
public function getQuarterlyDateFormat($year = null) public function getQuarterlyDateFormat($year = null)
{ {
$format = 'M'; $format = 'M Y';
if ($this->getFinancialStart($year)->month != 1) {
$format = 'M Y';
}
return $format; return $format;
} }

1
resources/lang/en-GB/general.php
View File

@ -160,6 +160,7 @@ return [
'recurring_and_more' => 'Recurring and more..', 'recurring_and_more' => 'Recurring and more..',
'due_on' => 'Due on', 'due_on' => 'Due on',
'amount_due' => 'Amount due', 'amount_due' => 'Amount due',
'financial_year' => 'Financial Year',
'card' => [ 'card' => [
'cards' => 'Card|Cards', 'cards' => 'Card|Cards',

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

@ -38,6 +38,10 @@
$value = (strpos(trans('general.' . $filter_name), '|') !== false) ? trans_choice('general.' . $filter_name, 1) : trans('general.' . $filter_name); $value = (strpos(trans('general.' . $filter_name), '|') !== false) ? trans_choice('general.' . $filter_name, 1) : trans('general.' . $filter_name);
} }
if ($key == 'year') {
$value = trans('general.financial_year');
}
$type = 'select'; $type = 'select';
if (isset($class->filters['types']) && !empty($class->filters['types'][$filter_name])) { if (isset($class->filters['types']) && !empty($class->filters['types'][$filter_name])) {
@ -60,10 +64,16 @@
'values' => $filter_values, 'values' => $filter_values,
]; ];
} }
$filtered[] = [
'option' => 'year',
'operator' => '=',
'value' => \Date::now()->year,
];
@endphp @endphp
<div class="align-items-center"> <div class="align-items-center">
<x-search-string :filters="$filters" /> <x-search-string :filters="$filters" :filtered="$filtered" />
</div> </div>
{!! Form::close() !!} {!! Form::close() !!}
</div> </div>