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

refs #2543 Fixed: not equal year filter issue.

Browse Source
This commit is contained in:
Cüneyt Şentürk 2022-07-21 10:09:57 +03:00
parent 2ce7d7f651
commit e5a68d8450
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Abstracts/Listeners/Report.php
View File

@ -132,6 +132,9 @@ abstract class Report
$input = request('search'); $input = request('search');
// Remove year as it's handled based on financial start // Remove year as it's handled based on financial start
$search_not_year = 'not year:' . $this->getSearchStringValue('year', '', $input);
$input = str_replace($search_not_year, '', $input);
$search_year = 'year:' . $this->getSearchStringValue('year', '', $input); $search_year = 'year:' . $this->getSearchStringValue('year', '', $input);
$input = str_replace($search_year, '', $input); $input = str_replace($search_year, '', $input);

28
app/Traits/DateTime.php
View File

@ -5,6 +5,7 @@ namespace App\Traits;
use App\Traits\SearchString; use App\Traits\SearchString;
use Carbon\CarbonPeriod; use Carbon\CarbonPeriod;
use Date; use Date;
use Lorisleiva\LaravelSearchString\SearchStringManager;
trait DateTime trait DateTime
{ {
@ -41,6 +42,7 @@ trait DateTime
public function scopeMonthsOfYear($query, $field) public function scopeMonthsOfYear($query, $field)
{ {
$now = Date::now(); $now = Date::now();
$year = $this->getSearchStringValue('year', $now->year); $year = $this->getSearchStringValue('year', $now->year);
$financial_start = $this->getFinancialStart($year); $financial_start = $this->getFinancialStart($year);
@ -54,7 +56,31 @@ trait DateTime
$end = $financial_start->addYear(1)->subDays(1)->endOfDay()->format('Y-m-d H:i:s'); $end = $financial_start->addYear(1)->subDays(1)->endOfDay()->format('Y-m-d H:i:s');
} }
return $query->whereBetween($field, [$start, $end]); // Looking year or not year
$query_type = 'whereBetween';
if (request('search')) {
$search_string_manager = new SearchStringManager($query->getModel());
$parse = $search_string_manager->parse(request('search'));
if (! empty($parse->expressions)) {
foreach ($parse->expressions as $filter) {
if (! $filter instanceof \Lorisleiva\LaravelSearchString\AST\NotSymbol) {
continue;
}
if ($filter->expression->key != 'year') {
continue;
}
$query_type = 'whereNotBetween';
break;
}
}
}
return $query->{$query_type}($field, [$start, $end]);
} }
public function getTimezones() public function getTimezones()