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

fixed year filter in reports

Browse Source
This commit is contained in:
Denis Duliçi
2021-01-23 12:16:58 +03:00
parent 4c73a19b12
commit 9c0cc9ae87
5 changed files with 78 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,11 +7,12 @@ use App\Models\Common\Contact;
use App\Models\Setting\Category;
use App\Traits\Contacts;
use App\Traits\DateTime;
use App\Traits\SearchString;
use Date;
abstract class Report
{
use Contacts, DateTime;
use Contacts, DateTime, SearchString;
protected $classes = [];
@@ -102,7 +103,13 @@ abstract class Report
public function applySearchStringFilter($event)
{
$event->model->usingSearchString(request('search'));
$input = request('search');
// Remove year as it's handled based on financial start
$search_year = 'year:' . $this->getSearchStringValue('year', '', $input);
$input = str_replace($search_year, '', $input);
$event->model->usingSearchString($input);
}
public function applyAccountGroup($event)