gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-09 20:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2017-09-09 06:41:45 +02:00
parent 0543733e3d
commit 3a3eb4e84f
38 changed files with 212 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Transaction/LinkController.php
View File

@@ -101,7 +101,7 @@ class LinkController extends Controller
if ($alreadyLinked) {
Session::flash('error', trans('firefly.journals_error_linked'));
return redirect(route('transactions.show', $journal->id));
return redirect(route('transactions.show', [$journal->id]));
}
Log::debug(sprintf('Journal is %d, opposing is %d', $journal->id, $other->id));
@@ -123,9 +123,15 @@ class LinkController extends Controller
$journalLink->save();
Session::flash('success', trans('firefly.journals_linked'));
return redirect(route('transactions.show', $journal->id));
return redirect(route('transactions.show', [$journal->id]));
}
/**
* @param LinkTypeRepositoryInterface $repository
* @param TransactionJournalLink $link
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function switch(LinkTypeRepositoryInterface $repository, TransactionJournalLink $link)
{

8
app/Http/Controllers/Transaction/SingleController.php
View File

@@ -413,9 +413,9 @@ class SingleController extends Controller
/**
* @return array
*/
private function groupedActiveAccountList(): array
private function groupedAccountList(): array
{
$accounts = $this->accounts->getActiveAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
$accounts = $this->accounts->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
$return = [];
/** @var Account $account */
foreach ($accounts as $account) {
@@ -433,9 +433,9 @@ class SingleController extends Controller
/**
* @return array
*/
private function groupedAccountList(): array
private function groupedActiveAccountList(): array
{
$accounts = $this->accounts->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
$accounts = $this->accounts->getActiveAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
$return = [];
/** @var Account $account */
foreach ($accounts as $account) {

6
app/Http/Controllers/Transaction/SplitController.php
View File

@@ -211,8 +211,8 @@ class SplitController extends Controller
}
/**
* @param SplitJournalFormRequest $request
* @param TransactionJournal $journal
* @param SplitJournalFormRequest|Request $request
* @param TransactionJournal $journal
*
* @return array
*/
@@ -295,7 +295,7 @@ class SplitController extends Controller
}
/**
* @param Request $request
* @param SplitJournalFormRequest|Request $request
*
* @return array
*/