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

Code reordering and reformatting. I should really start employing style CI.

Browse Source
This commit is contained in:
James Cole
2021-09-18 10:26:12 +02:00
parent 9b9d52e99f
commit 4003cea759
344 changed files with 2776 additions and 2605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Middleware/Binder.php
View File

@@ -83,7 +83,7 @@ class Binder
*
* @param string $key
* @param string $value
* @param Route $route
* @param Route $route
*
* @return mixed
*/

3
app/Http/Middleware/Installer.php
View File

@@ -107,6 +107,7 @@ class Installer
}
throw new FireflyException(sprintf('Could not access the database: %s', $message), 0, $e);
}
//Log::debug('Everything seems OK with the tables.');
return false;
@@ -157,6 +158,7 @@ class Installer
return true;
}
//Log::info(sprintf('Configured DB version (%d) equals expected DB version (%d)', $dbVersion, $configVersion));
return false;
@@ -183,6 +185,7 @@ class Installer
return true;
}
//Log::info(sprintf('Installed Firefly III version (%s) equals expected Firefly III version (%s)', $dbVersion, $configVersion));
return false;

102
app/Http/Middleware/InterestingMessage.php
View File

@@ -90,57 +90,6 @@ class InterestingMessage
return null !== $transactionGroupId && null !== $message;
}
/**
* @param Request $request
*/
private function handleAccountMessage(Request $request): void
{
// get parameters from request.
$accountId = $request->get('account_id');
$message = $request->get('message');
/** @var Account $account */
$account = auth()->user()->accounts()->withTrashed()->find($accountId);
if (null === $account) {
return;
}
if ('deleted' === $message) {
session()->flash('success', (string)trans('firefly.account_deleted', ['name' => $account->name]));
}
if ('created' === $message) {
session()->flash('success', (string)trans('firefly.stored_new_account', ['name' => $account->name]));
}
if ('updated' === $message) {
session()->flash('success', (string)trans('firefly.updated_account', ['name' => $account->name]));
}
}
/**
* @param Request $request
*/
private function handleBillMessage(Request $request): void
{
// get parameters from request.
$billId = $request->get('bill_id');
$message = $request->get('message');
/** @var Bill $bill */
$bill = auth()->user()->bills()->withTrashed()->find($billId);
if (null === $bill) {
return;
}
if ('deleted' === $message) {
session()->flash('success', (string)trans('firefly.deleted_bill', ['name' => $bill->name]));
}
if ('created' === $message) {
session()->flash('success', (string)trans('firefly.stored_new_bill', ['name' => $bill->name]));
}
}
/**
* @param Request $request
*/
@@ -197,6 +146,33 @@ class InterestingMessage
return null !== $accountId && null !== $message;
}
/**
* @param Request $request
*/
private function handleAccountMessage(Request $request): void
{
// get parameters from request.
$accountId = $request->get('account_id');
$message = $request->get('message');
/** @var Account $account */
$account = auth()->user()->accounts()->withTrashed()->find($accountId);
if (null === $account) {
return;
}
if ('deleted' === $message) {
session()->flash('success', (string)trans('firefly.account_deleted', ['name' => $account->name]));
}
if ('created' === $message) {
session()->flash('success', (string)trans('firefly.stored_new_account', ['name' => $account->name]));
}
if ('updated' === $message) {
session()->flash('success', (string)trans('firefly.updated_account', ['name' => $account->name]));
}
}
/**
* @param Request $request
*
@@ -210,4 +186,28 @@ class InterestingMessage
return null !== $billId && null !== $message;
}
/**
* @param Request $request
*/
private function handleBillMessage(Request $request): void
{
// get parameters from request.
$billId = $request->get('bill_id');
$message = $request->get('message');
/** @var Bill $bill */
$bill = auth()->user()->bills()->withTrashed()->find($billId);
if (null === $bill) {
return;
}
if ('deleted' === $message) {
session()->flash('success', (string)trans('firefly.deleted_bill', ['name' => $bill->name]));
}
if ('created' === $message) {
session()->flash('success', (string)trans('firefly.stored_new_bill', ['name' => $bill->name]));
}
}
}

2
app/Http/Middleware/IsDemoUser.php
View File

@@ -60,7 +60,7 @@ class IsDemoUser
return response()->redirectTo($previous);
}
return response()->redirectTo(route('index'));
return response()->redirectTo(route('index'));
}
return $next($request);