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

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2017-11-05 19:49:20 +01:00
parent 33d89d52c2
commit d2ab03061f
37 changed files with 95 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/AccountController.php
View File

@@ -282,7 +282,7 @@ class AccountController extends Controller
$currencyId = intval($account->getMeta('currency_id'));
$currency = $currencyRepos->find($currencyId);
if ($currencyId === 0) {
$currency = app('amount')->getDefaultCurrency();
$currency = app('amount')->getDefaultCurrency();
}

2
app/Http/Controllers/Chart/BudgetController.php
View File

@@ -94,7 +94,7 @@ class BudgetController extends Controller
$cache->addProperty('chart.budget.budget');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return Response::json($cache->get()); // @codeCoverageIgnore
}
$final = clone $last;

4
app/Http/Controllers/CurrencyController.php
View File

@@ -217,13 +217,13 @@ class CurrencyController extends Controller
{
$currencies = $this->repository->get();
$defaultCurrency = $this->repository->getCurrencyByPreference(Preferences::get('currencyPreference', config('firefly.default_currency', 'EUR')));
$isOwner = true;
$isOwner = true;
if (!$this->userRepository->hasRole(auth()->user(), 'owner')) {
$request->session()->flash('info', trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
$isOwner = false;
}
return view('currencies.index', compact('currencies', 'defaultCurrency','isOwner'));
return view('currencies.index', compact('currencies', 'defaultCurrency', 'isOwner'));
}
/**

2
app/Http/Controllers/HomeController.php
View File

@@ -116,7 +116,7 @@ class HomeController extends Controller
}
}
// last few lines
$logContent = 'Truncated from this point <----|'.substr($logContent, -4096);
$logContent = 'Truncated from this point <----|' . substr($logContent, -4096);
return view('debug', compact('phpVersion', 'extensions', 'carbon', 'now', 'drivers', 'currentDriver', 'userAgent', 'phpOs', 'interface', 'logContent'));

1
app/Http/Controllers/JavascriptController.php
View File

@@ -24,7 +24,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\TransactionCurrency;

2
app/Http/Controllers/NewUserController.php
View File

@@ -93,7 +93,7 @@ class NewUserController extends Controller
// also store currency preference from input:
$currency = $currencyRepository->find(intval($request->input('amount_currency_id_bank_balance')));
if(!is_null($currency->id)) {
if (!is_null($currency->id)) {
// store currency preference:
Preferences::set('currencyPreference', $currency->code);
Preferences::mark();

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

@@ -232,13 +232,13 @@ class SplitController extends Controller
{
$sourceAccounts = $journal->sourceAccountList();
$destinationAccounts = $journal->destinationAccountList();
$notes = '';
$notes = '';
/** @var Note $note */
$note = $journal->notes()->first();
if (!is_null($note)) {
$notes = $note->text;
}
$array = [
$array = [
'journal_description' => $request->old('journal_description', $journal->description),
'journal_amount' => $journal->amountPositive(),
'sourceAccounts' => $sourceAccounts,