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

Merge pull request #2330 from CihanSenturk/master

Browse Source 
Account see performance filter issue
This commit is contained in:
Cüneyt Şentürk 2021-12-03 09:33:26 +03:00 committed by GitHub
commit 1c7cf7a5d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Banking/Accounts.php
View File

@ -12,6 +12,7 @@ use App\Models\Banking\Transaction;
use App\Models\Banking\Transfer; use App\Models\Banking\Transfer;
use App\Utilities\Reports as Utility; use App\Utilities\Reports as Utility;
use App\Models\Setting\Currency; use App\Models\Setting\Currency;
use Date;
class Accounts extends Controller class Accounts extends Controller
{ {
@ -244,7 +245,11 @@ class Accounts extends Controller
public function seePerformance(Account $account) public function seePerformance(Account $account)
{ {
$data['account_id'] = $account->id; $data = [
'year' => Date::now()->year,
'basis' => 'accrual',
'account_id' => $account->id,
];
$report = Utility::getClassInstance('App\Reports\IncomeExpenseSummary'); $report = Utility::getClassInstance('App\Reports\IncomeExpenseSummary');

6
app/Listeners/Report/AddSearchString.php
View File

@ -40,7 +40,11 @@ class AddSearchString extends Listener
} }
foreach ($old as $key => $value) { foreach ($old as $key => $value) {
$filters[] = $key . ':' . $value; $filter = $key . ':' . $value;
if (!in_array($filter, $filters)) {
$filters[] = $filter;
}
} }
foreach ($request as $key => $value) { foreach ($request as $key => $value) {