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

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2018-07-08 12:08:53 +02:00
parent 2f2f907ffe
commit b315882f58
56 changed files with 465 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/Http/Controllers/PiggyBankController.php
View File

@@ -37,7 +37,6 @@ use Illuminate\Support\Collection;
use Log;
use Preferences;
use Symfony\Component\HttpFoundation\ParameterBag;
use View;
/**
* Class PiggyBankController.
@@ -78,7 +77,7 @@ class PiggyBankController extends Controller
*
* @param PiggyBank $piggyBank
*
* @return View
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function add(PiggyBank $piggyBank)
{
@@ -104,7 +103,7 @@ class PiggyBankController extends Controller
*
* @param PiggyBank $piggyBank
*
* @return View
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function addMobile(PiggyBank $piggyBank)
{
@@ -145,7 +144,7 @@ class PiggyBankController extends Controller
/**
* @param PiggyBank $piggyBank
*
* @return View
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function delete(PiggyBank $piggyBank)
{
@@ -165,7 +164,7 @@ class PiggyBankController extends Controller
public function destroy(PiggyBank $piggyBank)
{
session()->flash('success', (string)trans('firefly.deleted_piggy_bank', ['name' => $piggyBank->name]));
Preferences::mark();
app('preferences')->mark();
$this->piggyRepos->destroy($piggyBank);
return redirect($this->getPreviousUri('piggy-banks.delete.uri'));
@@ -174,7 +173,7 @@ class PiggyBankController extends Controller
/**
* @param PiggyBank $piggyBank
*
* @return View
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function edit(PiggyBank $piggyBank)
{
@@ -212,7 +211,7 @@ class PiggyBankController extends Controller
/**
* @param Request $request
*
* @return View
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function index(Request $request)
{
@@ -286,7 +285,7 @@ class PiggyBankController extends Controller
['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
)
);
Preferences::mark();
app('preferences')->mark();
return redirect(route('piggy-banks.index'));
}
@@ -326,7 +325,7 @@ class PiggyBankController extends Controller
['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
)
);
Preferences::mark();
app('preferences')->mark();
return redirect(route('piggy-banks.index'));
}
@@ -347,7 +346,7 @@ class PiggyBankController extends Controller
/**
* @param PiggyBank $piggyBank
*
* @return View
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function remove(PiggyBank $piggyBank)
{
@@ -367,7 +366,7 @@ class PiggyBankController extends Controller
*
* @param PiggyBank $piggyBank
*
* @return View
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function removeMobile(PiggyBank $piggyBank)
{
@@ -400,7 +399,7 @@ class PiggyBankController extends Controller
/**
* @param PiggyBank $piggyBank
*
* @return View
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function show(PiggyBank $piggyBank)
{
@@ -431,17 +430,19 @@ class PiggyBankController extends Controller
$piggyBank = $this->piggyRepos->store($data);
session()->flash('success', (string)trans('firefly.stored_piggy_bank', ['name' => $piggyBank->name]));
Preferences::mark();
app('preferences')->mark();
$redirect = redirect($this->getPreviousUri('piggy-banks.create.uri'));
if (1 === (int)$request->get('create_another')) {
// @codeCoverageIgnoreStart
session()->put('piggy-banks.create.fromStore', true);
return redirect(route('piggy-banks.create'))->withInput();
$redirect = redirect(route('piggy-banks.create'))->withInput();
// @codeCoverageIgnoreEnd
}
return redirect($this->getPreviousUri('piggy-banks.create.uri'));
return $redirect;
}
/**
@@ -456,16 +457,18 @@ class PiggyBankController extends Controller
$piggyBank = $this->piggyRepos->update($piggyBank, $data);
session()->flash('success', (string)trans('firefly.updated_piggy_bank', ['name' => $piggyBank->name]));
Preferences::mark();
app('preferences')->mark();
$redirect = redirect($this->getPreviousUri('piggy-banks.edit.uri'));
if (1 === (int)$request->get('return_to_edit')) {
// @codeCoverageIgnoreStart
session()->put('piggy-banks.edit.fromUpdate', true);
return redirect(route('piggy-banks.edit', [$piggyBank->id]));
$redirect = redirect(route('piggy-banks.edit', [$piggyBank->id]));
// @codeCoverageIgnoreEnd
}
return redirect($this->getPreviousUri('piggy-banks.edit.uri'));
return $redirect;
}
}