kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup as described in #1272

Browse Source
This commit is contained in:
James Cole
2018-04-22 17:12:22 +02:00
parent 8032684ad0
commit 36a5f17af2
12 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Transaction/BulkController.php
View File

@@ -30,8 +30,6 @@ use FireflyIII\Http\Requests\BulkEditJournalRequest;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Services\Internal\Update\JournalUpdateService;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Log;
use Preferences;

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

@@ -158,7 +158,7 @@ class SingleController extends Controller
$budgets = ExpandedForm::makeSelectListWithEmpty($this->budgets->getActiveBudgets());
$piggyBanks = $this->piggyBanks->getPiggyBanksWithAmount();
$piggies = ExpandedForm::makeSelectListWithEmpty($piggyBanks);
$preFilled = Session::has('preFilled') ? session('preFilled') : [];
$preFilled = session()->has('preFilled') ? session('preFilled') : [];
$subTitle = trans('form.add_new_' . $what);
$subTitleIcon = 'fa-plus';
$optionalFields = Preferences::get('transaction_journal_optional_fields', [])->data;
@@ -171,13 +171,13 @@ class SingleController extends Controller
$preFilled['destination_account_id'] = $source;
}
Session::put('preFilled', $preFilled);
session()->put('preFilled', $preFilled);
// put previous url in session if not redirect from store (not "create another").
if (true !== session('transactions.create.fromStore')) {
$this->rememberPreviousUri('transactions.create.uri');
}
Session::forget('transactions.create.fromStore');
session()->forget('transactions.create.fromStore');
asort($piggies);
@@ -318,7 +318,7 @@ class SingleController extends Controller
if (true !== session('transactions.edit.fromUpdate')) {
$this->rememberPreviousUri('transactions.edit.uri');
}
Session::forget('transactions.edit.fromUpdate');
session()->forget('transactions.edit.fromUpdate');
return view(
'transactions.single.edit',
@@ -369,7 +369,7 @@ class SingleController extends Controller
// @codeCoverageIgnoreStart
if (true === $createAnother) {
Session::put('transactions.create.fromStore', true);
session()->put('transactions.create.fromStore', true);
return redirect(route('transactions.create', [$request->input('what')]))->withInput();
}
@@ -426,7 +426,7 @@ class SingleController extends Controller
// @codeCoverageIgnoreStart
if (1 === (int)$request->get('return_to_edit')) {
Session::put('transactions.edit.fromUpdate', true);
session()->put('transactions.edit.fromUpdate', true);
return redirect(route('transactions.edit', [$journal->id]))->withInput(['return_to_edit' => 1]);
}

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

@@ -122,7 +122,7 @@ class SplitController extends Controller
if (true !== session('transactions.edit-split.fromUpdate')) {
$this->rememberPreviousUri('transactions.edit-split.uri');
}
Session::forget('transactions.edit-split.fromUpdate');
session()->forget('transactions.edit-split.fromUpdate');
return view(
'transactions.split.edit', compact(
@@ -170,7 +170,7 @@ class SplitController extends Controller
// @codeCoverageIgnoreStart
if (1 === (int)$request->get('return_to_edit')) {
// set value so edit routine will not overwrite URL:
Session::put('transactions.edit-split.fromUpdate', true);
session()->put('transactions.edit-split.fromUpdate', true);
return redirect(route('transactions.split.edit', [$journal->id]))->withInput(['return_to_edit' => 1]);
}