kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-22 20:16:22 +00:00
Code Issues Projects Releases Wiki Activity

Refactor some views for double account report.

Browse Source
This commit is contained in:
James Cole
2019-09-03 17:30:45 +02:00
parent 7fb5c12a29
commit 4743230136
8 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/ReportController.php
View File

@@ -320,7 +320,7 @@ class ReportController extends Controller
$categories = implode(',', $request->getCategoryList()->pluck('id')->toArray());
$budgets = implode(',', $request->getBudgetList()->pluck('id')->toArray());
$tags = implode(',', $request->getTagList()->pluck('id')->toArray());
$expense = implode(',', $request->getExpenseList()->pluck('id')->toArray());
$double = implode(',', $request->getDoubleList()->pluck('id')->toArray());
$uri = route('reports.index');
if (0 === $request->getAccountList()->count()) {
@@ -348,7 +348,7 @@ class ReportController extends Controller
return redirect(route('reports.index'));
}
if ('account' === $reportType && 0 === $request->getExpenseList()->count()) {
if ('account' === $reportType && 0 === $request->getDoubleList()->count()) {
session()->flash('error', (string)trans('firefly.select_at_least_one_expense'));
return redirect(route('reports.index'));
@@ -375,7 +375,7 @@ class ReportController extends Controller
$uri = route('reports.report.tag', [$accounts, $tags, $start, $end]);
break;
case 'account':
$uri = route('reports.report.account', [$accounts, $expense, $start, $end]);
$uri = route('reports.report.account', [$accounts, $double, $start, $end]);
break;
}

4
app/Http/Requests/ReportFormRequest.php
View File

@@ -147,11 +147,11 @@ class ReportFormRequest extends Request
}
/**
* Validate list of expense accounts.
* Validate list of accounts which exist twice in system.
*
* @return Collection
*/
public function getExpenseList(): Collection
public function getDoubleList(): Collection
{
/** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class);