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

fixed report groups and filters

Browse Source
This commit is contained in:
Denis Duliçi
2021-01-24 22:51:01 +03:00
parent 2b90f877d2
commit 3181a058db
10 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,11 +114,11 @@ abstract class Report
public function applyAccountGroup($event)
{
if (($event->model->getTable() != 'invoices') && ($event->model->getTable() != 'bills')) {
if ($event->model->getTable() != 'documents') {
return;
}
$filter = request('accounts', []);
$filter = explode(',', $this->getSearchStringValue('account_id'));
$event->model->account_id = 0;

4
app/Listeners/Report/AddAccounts.php
View File

@@ -74,7 +74,9 @@ class AddAccounts extends Listener
return;
}
if ($accounts = request('accounts')) {
if ($account_ids = $this->getSearchStringValue('account_id')) {
$accounts = explode(',', $account_ids);
$rows = collect($event->class->filters['accounts'])->filter(function ($value, $key) use ($accounts) {
return in_array($key, $accounts);
});

4
app/Listeners/Report/AddCustomers.php
View File

@@ -73,7 +73,9 @@ class AddCustomers extends Listener
return;
}
if ($customers = request('customers')) {
if ($customer_ids = $this->getSearchStringValue('customer_id')) {
$customers = explode(',', $customer_ids);
$rows = collect($event->class->filters['customers'])->filter(function ($value, $key) use ($customers) {
return in_array($key, $customers);
});

4
app/Listeners/Report/AddExpenseCategories.php
View File

@@ -56,7 +56,9 @@ class AddExpenseCategories extends Listener
return;
}
if ($categories = request('categories')) {
if ($category_ids = $this->getSearchStringValue('category_id')) {
$categories = explode(',', $category_ids);
$rows = collect($event->class->filters['categories'])->filter(function ($value, $key) use ($categories) {
return in_array($key, $categories);
});

4
app/Listeners/Report/AddIncomeCategories.php
View File

@@ -56,7 +56,9 @@ class AddIncomeCategories extends Listener
return;
}
if ($categories = request('categories')) {
if ($category_ids = $this->getSearchStringValue('category_id')) {
$categories = explode(',', $category_ids);
$rows = collect($event->class->filters['categories'])->filter(function ($value, $key) use ($categories) {
return in_array($key, $categories);
});

4
app/Listeners/Report/AddIncomeExpenseCategories.php
View File

@@ -75,7 +75,9 @@ class AddIncomeExpenseCategories extends Listener
break;
case 'App\Reports\IncomeExpenseSummary':
if ($categories = request('categories')) {
if ($category_ids = $this->getSearchStringValue('category_id')) {
$categories = explode(',', $category_ids);
$rows = collect($event->class->filters['categories'])->filter(function ($value, $key) use ($categories) {
return in_array($key, $categories);
});

20
app/Listeners/Report/AddSearch.php → app/Listeners/Report/AddSearchString.php
View File

@@ -4,9 +4,8 @@ namespace App\Listeners\Report;
use App\Abstracts\Listeners\Report as Listener;
use App\Events\Report\FilterApplying;
use App\Events\Report\FilterShowing;
class AddSearch extends Listener
class AddSearchString extends Listener
{
protected $classes = [
'App\Reports\IncomeSummary',
@@ -16,21 +15,6 @@ class AddSearch extends Listener
'App\Reports\TaxSummary',
];
/**
* Handle filter showing event.
*
* @param $event
* @return void
*/
public function handleFilterShowing(FilterShowing $event)
{
if ($this->skipThisClass($event)) {
return;
}
//$event->class->filters['search'] = $this->getSearch();
}
/**
* Handle filter applying event.
*
@@ -43,7 +27,7 @@ class AddSearch extends Listener
return;
}
// Apply date
// Apply search string
$this->applySearchStringFilter($event);
}
}

4
app/Listeners/Report/AddVendors.php
View File

@@ -73,7 +73,9 @@ class AddVendors extends Listener
return;
}
if ($vendors = request('vendors')) {
if ($vendor_ids = $this->getSearchStringValue('vendor_id')) {
$vendors = explode(',', $vendor_ids);
$rows = collect($event->class->filters['vendors'])->filter(function ($value, $key) use ($vendors) {
return in_array($key, $vendors);
});

2
app/Providers/Event.php
View File

@@ -92,7 +92,7 @@ class Event extends Provider
'App\Listeners\Report\AddExpenseCategories',
'App\Listeners\Report\AddIncomeCategories',
'App\Listeners\Report\AddIncomeExpenseCategories',
'App\Listeners\Report\AddSearch',
'App\Listeners\Report\AddSearchString',
'App\Listeners\Report\AddRowsToTax',
];
}