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

Clean up session code

Browse Source
This commit is contained in:
James Cole
2017-02-17 20:14:22 +01:00
parent 5d0cdc4ffa
commit 65a899bf25
11 changed files with 155 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
app/Http/Controllers/BillController.php
View File

@@ -22,7 +22,6 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Preferences;
use Session;
use URL;
use View;
@@ -53,9 +52,11 @@ class BillController extends Controller
}
/**
* @param Request $request
*
* @return View
*/
public function create()
public function create(Request $request)
{
$periods = [];
foreach (config('firefly.bill_periods') as $current) {
@@ -68,52 +69,55 @@ class BillController extends Controller
if (session('bills.create.fromStore') !== true) {
$this->rememberPreviousUri('bills.create.uri');
}
Session::forget('bills.create.fromStore');
Session::flash('gaEventCategory', 'bills');
Session::flash('gaEventAction', 'create');
$request->session()->forget('bills.create.fromStore');
$request->session()->flash('gaEventCategory', 'bills');
$request->session()->flash('gaEventAction', 'create');
return view('bills.create', compact('periods', 'subTitle'));
}
/**
* @param Bill $bill
* @param Request $request
* @param Bill $bill
*
* @return View
*/
public function delete(Bill $bill)
public function delete(Request $request, Bill $bill)
{
// put previous url in session
$this->rememberPreviousUri('bills.delete.uri');
Session::flash('gaEventCategory', 'bills');
Session::flash('gaEventAction', 'delete');
$request->session()->flash('gaEventCategory', 'bills');
$request->session()->flash('gaEventAction', 'delete');
$subTitle = trans('firefly.delete_bill', ['name' => $bill->name]);
return view('bills.delete', compact('bill', 'subTitle'));
}
/**
* @param Request $request
* @param BillRepositoryInterface $repository
* @param Bill $bill
*
* @return \Illuminate\Http\RedirectResponse
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function destroy(BillRepositoryInterface $repository, Bill $bill)
public function destroy(Request $request, BillRepositoryInterface $repository, Bill $bill)
{
$name = $bill->name;
$repository->destroy($bill);
Session::flash('success', strval(trans('firefly.deleted_bill', ['name' => $name])));
$request->session()->flash('success', strval(trans('firefly.deleted_bill', ['name' => $name])));
Preferences::mark();
return redirect($this->getPreviousUri('bills.delete.uri'));
}
/**
* @param Bill $bill
* @param Request $request
* @param Bill $bill
*
* @return View
*/
public function edit(Bill $bill)
public function edit(Request $request, Bill $bill)
{
$periods = [];
foreach (config('firefly.bill_periods') as $current) {
@@ -125,9 +129,9 @@ class BillController extends Controller
if (session('bills.edit.fromUpdate') !== true) {
$this->rememberPreviousUri('bills.edit.uri');
}
Session::forget('bills.edit.fromUpdate');
Session::flash('gaEventCategory', 'bills');
Session::flash('gaEventAction', 'edit');
$request->session()->forget('bills.edit.fromUpdate');
$request->session()->flash('gaEventCategory', 'bills');
$request->session()->flash('gaEventAction', 'edit');
return view('bills.edit', compact('subTitle', 'periods', 'bill'));
}
@@ -163,15 +167,16 @@ class BillController extends Controller
}
/**
* @param Request $request
* @param BillRepositoryInterface $repository
* @param Bill $bill
*
* @return \Illuminate\Http\RedirectResponse
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function rescan(BillRepositoryInterface $repository, Bill $bill)
public function rescan(Request $request, BillRepositoryInterface $repository, Bill $bill)
{
if (intval($bill->active) == 0) {
Session::flash('warning', strval(trans('firefly.cannot_scan_inactive_bill')));
$request->session()->flash('warning', strval(trans('firefly.cannot_scan_inactive_bill')));
return redirect(URL::previous());
}
@@ -183,7 +188,7 @@ class BillController extends Controller
}
Session::flash('success', strval(trans('firefly.rescanned_bill')));
$request->session()->flash('success', strval(trans('firefly.rescanned_bill')));
Preferences::mark();
return redirect(URL::previous());
@@ -231,12 +236,12 @@ class BillController extends Controller
{
$billData = $request->getBillData();
$bill = $repository->store($billData);
Session::flash('success', strval(trans('firefly.stored_new_bill', ['name' => e($bill->name)])));
$request->session()->flash('success', strval(trans('firefly.stored_new_bill', ['name' => e($bill->name)])));
Preferences::mark();
if (intval($request->get('create_another')) === 1) {
// set value so create routine will not overwrite URL:
Session::put('bills.create.fromStore', true);
$request->session()->put('bills.create.fromStore', true);
return redirect(route('bills.create'))->withInput();
}
@@ -258,12 +263,12 @@ class BillController extends Controller
$billData = $request->getBillData();
$bill = $repository->update($bill, $billData);
Session::flash('success', strval(trans('firefly.updated_bill', ['name' => e($bill->name)])));
$request->session()->flash('success', strval(trans('firefly.updated_bill', ['name' => e($bill->name)])));
Preferences::mark();
if (intval($request->get('return_to_edit')) === 1) {
// set value so edit routine will not overwrite URL:
Session::put('bills.edit.fromUpdate', true);
$request->session()->put('bills.edit.fromUpdate', true);
return redirect(route('bills.edit', [$bill->id]))->withInput(['return_to_edit' => 1]);
}