kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-23 14:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Some refactoring.

Browse Source
This commit is contained in:
James Cole
2018-06-21 18:58:27 +02:00
parent 1d162edb59
commit 50b599b1a9
6 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Admin/HomeController.php
View File

@@ -51,9 +51,9 @@ class HomeController extends Controller
{ {
$title = (string)trans('firefly.administration'); $title = (string)trans('firefly.administration');
$mainTitleIcon = 'fa-hand-spock-o'; $mainTitleIcon = 'fa-hand-spock-o';
$sandstorm = 1 === (int)getenv('SANDSTORM'); $sandstorm = 1 === (int)getenv('SANDSTORM');
return view('admin.index', compact('title', 'mainTitleIcon','sandstorm')); return view('admin.index', compact('title', 'mainTitleIcon', 'sandstorm'));
} }
/** /**

6
app/Http/Controllers/DebugController.php
View File

@@ -185,9 +185,9 @@ class DebugController extends Controller
'two-factor.lost', 'reports.options', 'debug', 'import.create-job', 'import.download', 'import.start', 'import.status.json', 'two-factor.lost', 'reports.options', 'debug', 'import.create-job', 'import.download', 'import.start', 'import.status.json',
'preferences.delete-code', 'rules.test-triggers', 'piggy-banks.remove-money', 'piggy-banks.add-money', 'preferences.delete-code', 'rules.test-triggers', 'piggy-banks.remove-money', 'piggy-banks.add-money',
'accounts.reconcile.transactions', 'accounts.reconcile.overview', 'export.download', 'accounts.reconcile.transactions', 'accounts.reconcile.overview', 'export.download',
'transactions.clone', 'two-factor.index', 'api.v1', 'installer.','attachments.view','import.create', 'transactions.clone', 'two-factor.index', 'api.v1', 'installer.', 'attachments.view', 'import.create',
'import.job.download','import.job.start','import.job.status.json','import.job.store','recurring.events', 'import.job.download', 'import.job.start', 'import.job.status.json', 'import.job.store', 'recurring.events',
'recurring.suggest' 'recurring.suggest',
]; ];
$return = ' '; $return = ' ';
/** @var Route $route */ /** @var Route $route */

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

@@ -22,11 +22,8 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers; namespace FireflyIII\Http\Controllers;
use Artisan;
use Carbon\Carbon; use Carbon\Carbon;
use Exception;
use FireflyIII\Events\RequestedVersionCheckStatus; use FireflyIII\Events\RequestedVersionCheckStatus;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Http\Middleware\Installer; use FireflyIII\Http\Middleware\Installer;
use FireflyIII\Http\Middleware\IsDemoUser; use FireflyIII\Http\Middleware\IsDemoUser;
@@ -35,11 +32,9 @@ use FireflyIII\Models\AccountType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Routing\Route;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
use Preferences; use Preferences;
use Route as RouteFacade;
use View; use View;
/** /**
@@ -99,8 +94,6 @@ class HomeController extends Controller
} }
/** /**
* @param AccountRepositoryInterface $repository * @param AccountRepositoryInterface $repository
* *

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

@@ -230,7 +230,7 @@ class RuleController extends Controller
} }
$hasOldInput = null !== $request->old('_token'); $hasOldInput = null !== $request->old('_token');
$preFilled = [ $preFilled = [
'active' => $hasOldInput ? (bool)$request->old('active') : $rule->active, 'active' => $hasOldInput ? (bool)$request->old('active') : $rule->active,
'stop_processing' => $hasOldInput ? (bool)$request->old('stop_processing') : $rule->stop_processing, 'stop_processing' => $hasOldInput ? (bool)$request->old('stop_processing') : $rule->stop_processing,
'strict' => $hasOldInput ? (bool)$request->old('strict') : $rule->strict, 'strict' => $hasOldInput ? (bool)$request->old('strict') : $rule->strict,

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

@@ -34,9 +34,7 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use Illuminate\Http\RedirectResponse; use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Log; use Log;
@@ -93,7 +91,7 @@ class SingleController extends Controller
$destination = $this->repository->getJournalDestinationAccounts($journal)->first(); $destination = $this->repository->getJournalDestinationAccounts($journal)->first();
$budgetId = $this->repository->getJournalBudgetId($journal); $budgetId = $this->repository->getJournalBudgetId($journal);
$categoryName = $this->repository->getJournalCategoryName($journal); $categoryName = $this->repository->getJournalCategoryName($journal);
$tags = implode(',', $this->repository->getTags($journal)); $tags = implode(',', $this->repository->getTags($journal));
/** @var Transaction $transaction */ /** @var Transaction $transaction */
$transaction = $journal->transactions()->first(); $transaction = $journal->transactions()->first();
$amount = app('steam')->positive($transaction->amount); $amount = app('steam')->positive($transaction->amount);

3
app/Models/Account.php
View File

@@ -42,7 +42,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
* @property string $name * @property string $name
* @property string $iban * @property string $iban
* @property AccountType $accountType * @property AccountType $accountType
* @property bool $active * @property bool $active
* @property string $virtual_balance
*/ */
class Account extends Model class Account extends Model
{ {