kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-19 08:00:19 +00:00
Code Issues Projects Releases Wiki Activity

Code clean up.

Browse Source
This commit is contained in:
James Cole
2017-11-15 10:52:29 +01:00
parent aee17221eb
commit 649dca77f5
305 changed files with 1200 additions and 1600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/Transaction/ConvertController.php
View File

@@ -107,9 +107,16 @@ class ConvertController extends Controller
return view(
'transactions.convert',
compact(
'sourceType', 'destinationType', 'journal', 'assetAccounts',
'positiveAmount', 'sourceAccount', 'destinationAccount', 'sourceType',
'subTitle', 'subTitleIcon'
'sourceType',
'destinationType',
'journal',
'assetAccounts',
'positiveAmount',
'sourceAccount',
'destinationAccount',
'sourceType',
'subTitle',
'subTitleIcon'
)
);
@@ -271,7 +278,5 @@ class ConvertController extends Controller
}
return $source;
}
}

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

@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\JournalLinkRequest;
use FireflyIII\Models\TransactionJournal;
@@ -60,7 +59,6 @@ class LinkController extends Controller
return $next($request);
}
);
}
@@ -103,7 +101,10 @@ class LinkController extends Controller
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function store(
JournalLinkRequest $request, LinkTypeRepositoryInterface $repository, JournalRepositoryInterface $journalRepository, TransactionJournal $journal
JournalLinkRequest $request,
LinkTypeRepositoryInterface $repository,
JournalRepositoryInterface $journalRepository,
TransactionJournal $journal
) {
$linkInfo = $request->getLinkInfo();
if ($linkInfo['transaction_journal_id'] === 0) {
@@ -150,10 +151,8 @@ class LinkController extends Controller
*/
public function switch(LinkTypeRepositoryInterface $repository, TransactionJournalLink $link)
{
$repository->switchLink($link);
return redirect(URL::previous());
}
}

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

@@ -78,7 +78,6 @@ class MassController extends Controller
Session::flash('gaEventAction', 'mass-delete');
return view('transactions.mass-delete', compact('journals', 'subTitle'));
}
/**
@@ -115,7 +114,6 @@ class MassController extends Controller
// redirect to previous URL:
return redirect($this->getPreviousUri('transactions.mass-delete.uri'));
}
@@ -161,7 +159,7 @@ class MassController extends Controller
}
// cannot edit reconciled transactions / journals:
if($journal->transactions->first()->reconciled) {
if ($journal->transactions->first()->reconciled) {
$messages[] = trans('firefly.cannot_edit_reconciled', ['description' => $journal->description, 'id' => $journal->id]);
continue;
}
@@ -270,13 +268,11 @@ class MassController extends Controller
$count++;
}
}
}
Preferences::mark();
Session::flash('success', trans('firefly.mass_edited_transactions_success', ['amount' => $count]));
// redirect to previous URL:
return redirect($this->getPreviousUri('transactions.mass-edit.uri'));
}
}

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

@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use Carbon\Carbon;
use ExpandedForm;
use FireflyIII\Events\StoredTransactionJournal;
@@ -99,7 +98,6 @@ class SingleController extends Controller
return $next($request);
}
);
}
public function cloneTransaction(TransactionJournal $journal)
@@ -214,8 +212,6 @@ class SingleController extends Controller
Session::flash('gaEventAction', 'delete-' . $what);
return view('transactions.single.delete', compact('journal', 'subTitle', 'what'));
}
/**

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

@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use ExpandedForm;
use FireflyIII\Events\UpdatedTransactionJournal;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
@@ -136,9 +135,17 @@ class SplitController extends Controller
return view(
'transactions.split.edit',
compact(
'subTitleIcon', 'currencies', 'optionalFields',
'preFilled', 'subTitle', 'uploadSize', 'assetAccounts',
'budgets', 'journal', 'accountArray', 'previous'
'subTitleIcon',
'currencies',
'optionalFields',
'preFilled',
'subTitle',
'uploadSize',
'assetAccounts',
'budgets',
'journal',
'accountArray',
'previous'
)
);
}
@@ -306,7 +313,6 @@ class SplitController extends Controller
}
$return[] = $set;
}
return $return;
@@ -322,7 +328,6 @@ class SplitController extends Controller
$return = [];
$transactions = $request->get('transactions');
foreach ($transactions as $transaction) {
$return[] = [
'description' => $transaction['description'],
'source_account_id' => $transaction['source_account_id'] ?? 0,
@@ -373,6 +378,4 @@ class SplitController extends Controller
return $array;
}
}