IntenseFinance/firefly-iii
3
0 Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-10-13 08:52:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Code clean up.

Browse Source
This commit is contained in:
James Cole committed 2017-11-15 10:52:29 +01:00
1 parent aee17221eb
commit 649dca77f5
305 files changed
+1200 -1600
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/Http/Controllers/Account/ReconcileController.php
+16 -7
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Account;
use Carbon\Carbon;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Http\Controllers\Controller;
@@ -84,7 +83,6 @@ class ReconcileController extends Controller
$return['html'] = view('accounts.reconcile.overview', compact('account', 'start', 'end'))->render();
return Response::json($return);
}
/**
@@ -132,9 +130,21 @@ class ReconcileController extends Controller
$indexUri = route('accounts.reconcile', [$account->id, '%start%', '%end%']);
return view(
'accounts.reconcile.index', compact(
'account', 'currency', 'subTitleIcon', 'start', 'end', 'subTitle', 'startBalance', 'endBalance', 'transactionsUri',
'selectionStart', 'selectionEnd', 'overviewUri', 'indexUri'
'accounts.reconcile.index',
compact(
'account',
'currency',
'subTitleIcon',
'start',
'end',
'subTitle',
'startBalance',
'endBalance',
'transactionsUri',
'selectionStart',
'selectionEnd',
'overviewUri',
'indexUri'
)
);
}
@@ -169,5 +179,4 @@ class ReconcileController extends Controller
return Response::json(['html' => $html]);
}
}
}
app/Http/Controllers/AccountController.php
+11 -4
View File
@@ -103,7 +103,6 @@ class AccountController extends Controller
$request->session()->flash('gaEventAction', 'create-' . $what);
return view('accounts.create', compact('subTitleIcon', 'what', 'subTitle', 'currencySelectList', 'allCurrencies', 'roles'));
}
/**
@@ -208,8 +207,17 @@ class AccountController extends Controller
$request->session()->flash('gaEventAction', 'edit-' . $what);
return view(
'accounts.edit', compact(
'allCurrencies', 'currencySelectList', 'account', 'currency', 'subTitle', 'subTitleIcon', 'what', 'roles', 'preFilled'
'accounts.edit',
compact(
'allCurrencies',
'currencySelectList',
'account',
'currency',
'subTitle',
'subTitleIcon',
'what',
'roles',
'preFilled'
)
);
}
@@ -386,7 +394,6 @@ class AccountController extends Controller
// redirect to previous URL.
return redirect($this->getPreviousUri('accounts.edit.uri'));
}
app/Http/Controllers/Admin/ConfigurationController.php
-4
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Admin;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\ConfigurationRequest;
use FireflyIII\Support\Facades\FireflyConfig;
@@ -55,7 +54,6 @@ class ConfigurationController extends Controller
return $next($request);
}
);
}
/**
@@ -76,7 +74,6 @@ class ConfigurationController extends Controller
'admin.configuration.index',
compact('subTitle', 'subTitleIcon', 'singleUserMode', 'isDemoSite', 'siteOwner')
);
}
/**
@@ -99,5 +96,4 @@ class ConfigurationController extends Controller
return Redirect::route('admin.configuration.index');
}
}
app/Http/Controllers/Admin/HomeController.php
-2
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Admin;
use FireflyIII\Events\AdminRequestedTestMessage;
use FireflyIII\Http\Controllers\Controller;
use Illuminate\Http\Request;
@@ -62,5 +61,4 @@ class HomeController extends Controller
return redirect(route('admin.index'));
}
}
app/Http/Controllers/Admin/LinkController.php
-2
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Admin;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\LinkTypeFormRequest;
use FireflyIII\Models\LinkType;
@@ -236,5 +235,4 @@ class LinkController extends Controller
// redirect to previous URL.
return redirect($this->getPreviousUri('link_types.edit.uri'));
}
}
app/Http/Controllers/Admin/UserController.php
+6 -7
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Admin;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\UserFormRequest;
use FireflyIII\Repositories\User\UserRepositoryInterface;
@@ -107,7 +106,6 @@ class UserController extends Controller
];
return view('admin.users.edit', compact('user', 'subTitle', 'subTitleIcon', 'codes'));
}
/**
@@ -136,7 +134,6 @@ class UserController extends Controller
return view('admin.users.index', compact('subTitle', 'subTitleIcon', 'users'));
}
/**
@@ -156,7 +153,12 @@ class UserController extends Controller
return view(
'admin.users.show',
compact(
'title', 'mainTitleIcon', 'subTitle', 'subTitleIcon', 'information', 'user'
'title',
'mainTitleIcon',
'subTitle',
'subTitleIcon',
'information',
'user'
)
);
}
@@ -195,8 +197,5 @@ class UserController extends Controller
// redirect to previous URL.
return redirect($this->getPreviousUri('users.edit.uri'));
}
}
app/Http/Controllers/AttachmentController.php
-3
View File
@@ -108,7 +108,6 @@ class AttachmentController extends Controller
*/
public function download(AttachmentRepositoryInterface $repository, Attachment $attachment)
{
if ($repository->exists($attachment)) {
$content = $repository->getContent($attachment);
$quoted = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));
@@ -198,7 +197,5 @@ class AttachmentController extends Controller
// redirect to previous URL.
return redirect($this->getPreviousUri('attachments.edit.uri'));
}
}
app/Http/Controllers/Auth/ForgotPasswordController.php
-1
View File
@@ -59,6 +59,5 @@ class ForgotPasswordController extends Controller
{
parent::__construct();
$this->middleware('guest');
}
}
app/Http/Controllers/Auth/LoginController.php
+5 -6
View File
@@ -42,7 +42,6 @@ use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Http\Request;
use Schema;
class LoginController extends Controller
{
/*
@@ -85,16 +84,16 @@ class LoginController extends Controller
// check for presence of tables:
$hasTable = Schema::hasTable('users');
if(!$hasTable) {
if (!$hasTable) {
$message = 'Firefly III could not find the "users" table. This is a strong indication your database credentials are wrong or the database has not been initialized. Did you follow the installation instructions correctly?';
return view('error',compact('message'));
return view('error', compact('message'));
}
// check for presence of currency:
$currency = TransactionCurrency::where('code','EUR')->first();
if(is_null($currency)) {
$currency = TransactionCurrency::where('code', 'EUR')->first();
if (is_null($currency)) {
$message = 'Firefly III could not find the EURO currency. This is a strong indication the database has not been initialized correctly. Did you follow the installation instructions?';
return view('error',compact('message'));
return view('error', compact('message'));
}
// forget 2fa cookie:
app/Http/Controllers/Auth/RegisterController.php
+2 -1
View File
@@ -158,7 +158,8 @@ class RegisterController extends Controller
protected function validator(array $data)
{
return Validator::make(
$data, [
$data,
[
'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|secure_password|confirmed',
]
app/Http/Controllers/Auth/TwoFactorController.php
-2
View File
@@ -49,7 +49,6 @@ class TwoFactorController extends Controller
*/
public function index(Request $request)
{
$user = auth()->user();
// to make sure the validator in the next step gets the secret, we push it in session
@@ -105,5 +104,4 @@ class TwoFactorController extends Controller
return redirect(route('home'))->withCookie($cookie);
}
}
app/Http/Controllers/BillController.php
-3
View File
@@ -264,7 +264,6 @@ class BillController extends Controller
// redirect to previous URL.
return redirect($this->getPreviousUri('bills.create.uri'));
}
/**
@@ -291,7 +290,5 @@ class BillController extends Controller
}
return redirect($this->getPreviousUri('bills.edit.uri'));
}
}
app/Http/Controllers/BudgetController.php
+19 -9
View File
@@ -94,7 +94,6 @@ class BudgetController extends Controller
Preferences::mark();
return Response::json(['name' => $budget->name, 'limit' => $budgetLimit ? $budgetLimit->id : 0, 'amount' => $amount]);
}
/**
@@ -142,7 +141,6 @@ class BudgetController extends Controller
*/
public function destroy(Request $request, Budget $budget)
{
$name = $budget->name;
$this->repository->destroy($budget);
$request->session()->flash('success', strval(trans('firefly.deleted_budget', ['name' => $name])));
@@ -170,7 +168,6 @@ class BudgetController extends Controller
$request->session()->flash('gaEventAction', 'edit');
return view('budgets.edit', compact('budget', 'subTitle'));
}
/**
@@ -246,9 +243,23 @@ class BudgetController extends Controller
return view(
'budgets.index',
compact(
'available', 'currentMonth', 'next', 'nextText', 'prev', 'prevText',
'periodStart', 'periodEnd', 'budgetInformation', 'inactive', 'budgets',
'spent', 'budgeted', 'previousLoop', 'nextLoop', 'start', 'end'
'available',
'currentMonth',
'next',
'nextText',
'prev',
'prevText',
'periodStart',
'periodEnd',
'budgetInformation',
'inactive',
'budgets',
'spent',
'budgeted',
'previousLoop',
'nextLoop',
'start',
'end'
)
);
}
@@ -442,7 +453,8 @@ class BudgetController extends Controller
$page = intval($request->get('page'));
$pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
$subTitle = trans(
'firefly.budget_in_period', [
'firefly.budget_in_period',
[
'name' => $budget->name,
'start' => $budgetLimit->start_date->formatLocalized($this->monthAndDayFormat),
'end' => $budgetLimit->end_date->formatLocalized($this->monthAndDayFormat),
@@ -461,7 +473,6 @@ class BudgetController extends Controller
$limits = $this->getLimits($budget, $start, $end);
return view('budgets.show', compact('limits', 'budget', 'budgetLimit', 'transactions', 'subTitle'));
}
/**
@@ -601,5 +612,4 @@ class BudgetController extends Controller
return $entries;
}
}
app/Http/Controllers/CategoryController.php
-3
View File
@@ -114,7 +114,6 @@ class CategoryController extends Controller
*/
public function destroy(Request $request, CategoryRepositoryInterface $repository, Category $category)
{
$name = $category->name;
$repository->destroy($category);
@@ -143,7 +142,6 @@ class CategoryController extends Controller
$request->session()->flash('gaEventAction', 'edit');
return view('categories.edit', compact('category', 'subTitle'));
}
/**
@@ -487,5 +485,4 @@ class CategoryController extends Controller
return $entries;
}
}
app/Http/Controllers/Chart/AccountController.php
-3
View File
@@ -243,7 +243,6 @@ class AccountController extends Controller
$cache->store($data);
return Response::json($data);
}
/**
@@ -326,7 +325,6 @@ class AccountController extends Controller
$cache->store($data);
return Response::json($data);
}
/**
@@ -580,5 +578,4 @@ class AccountController extends Controller
return $return;
}
}
app/Http/Controllers/Chart/BudgetController.php
-3
View File
@@ -208,7 +208,6 @@ class BudgetController extends Controller
$cache->store($data);
return Response::json($data);
}
/**
@@ -255,7 +254,6 @@ class BudgetController extends Controller
$cache->store($data);
return Response::json($data);
}
/**
@@ -301,7 +299,6 @@ class BudgetController extends Controller
$cache->store($data);
return Response::json($data);
}
/**
app/Http/Controllers/Chart/BudgetReportController.php
-3
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Chart;
use Carbon\Carbon;
use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
use FireflyIII\Helpers\Chart\MetaPieChartInterface;
@@ -95,7 +94,6 @@ class BudgetReportController extends Controller
$data = $this->generator->pieChart($chartData);
return Response::json($data);
}
/**
@@ -277,5 +275,4 @@ class BudgetReportController extends Controller
return $grouped;
}
}
app/Http/Controllers/Chart/CategoryController.php
-5
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Chart;
use Carbon\Carbon;
use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
use FireflyIII\Http\Controllers\Controller;
@@ -120,7 +119,6 @@ class CategoryController extends Controller
$cache->store($data);
return Response::json($data);
}
/**
@@ -269,7 +267,6 @@ class CategoryController extends Controller
$chartData[0]['entries'][$label] = bcmul($spent, '-1');
$chartData[1]['entries'][$label] = $earned;
$chartData[2]['entries'][$label] = $sum;
}
$data = $this->generator->multiSet($chartData);
$cache->store($data);
@@ -358,7 +355,5 @@ class CategoryController extends Controller
$cache->store($data);
return $data;
}
}
app/Http/Controllers/Chart/CategoryReportController.php
-2
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Chart;
use Carbon\Carbon;
use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
use FireflyIII\Helpers\Chart\MetaPieChartInterface;
@@ -41,7 +40,6 @@ use Illuminate\Support\Collection;
use Navigation;
use Response;
/**
* Separate controller because many helper functions are shared.
*
app/Http/Controllers/Chart/PiggyBankController.php
-2
View File
@@ -31,7 +31,6 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Response;
/**
* Class PiggyBankController
*
@@ -86,6 +85,5 @@ class PiggyBankController extends Controller
$cache->store($data);
return Response::json($data);
}
}
app/Http/Controllers/Chart/ReportController.php
+4 -6
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Chart;
use Carbon\Carbon;
use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
use FireflyIII\Http\Controllers\Controller;
@@ -149,7 +148,6 @@ class ReportController extends Controller
$cache->store($data);
return Response::json($data);
}
/**
@@ -224,7 +222,6 @@ class ReportController extends Controller
$cache->store($data);
return Response::json($data);
}
/**
@@ -270,14 +267,14 @@ class ReportController extends Controller
$tasker = app(AccountTaskerInterface::class);
while ($currentStart <= $end) {
$currentEnd = Navigation::endOfPeriod($currentStart, '1M');
$earned = strval(
array_sum(
array_map(
function ($item) {
return $item['sum'];
}, $tasker->getIncomeReport($currentStart, $currentEnd, $accounts)
},
$tasker->getIncomeReport($currentStart, $currentEnd, $accounts)
)
)
);
@@ -287,7 +284,8 @@ class ReportController extends Controller
array_map(
function ($item) {
return $item['sum'];
}, $tasker->getExpenseReport($currentStart, $currentEnd, $accounts)
},
$tasker->getExpenseReport($currentStart, $currentEnd, $accounts)
)
)
);
app/Http/Controllers/Chart/TagReportController.php
-2
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Chart;
use Carbon\Carbon;
use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
use FireflyIII\Helpers\Chart\MetaPieChartInterface;
@@ -375,5 +374,4 @@ class TagReportController extends Controller
return $grouped;
}
}
app/Http/Controllers/Controller.php
-3
View File
@@ -110,7 +110,6 @@ class Controller extends BaseController
return $next($request);
}
);
}
/**
@@ -162,7 +161,6 @@ class Controller extends BaseController
if (in_array($account->accountType->type, $valid)) {
return redirect(route('accounts.show', [$account->id]));
}
}
// @codeCoverageIgnoreStart
Session::flash('error', strval(trans('firefly.cannot_redirect_to_account')));
@@ -178,5 +176,4 @@ class Controller extends BaseController
{
Session::put($identifier, URL::previous());
}
}
app/Http/Controllers/CurrencyController.php
-3
View File
@@ -102,7 +102,6 @@ class CurrencyController extends Controller
*/
public function defaultCurrency(Request $request, TransactionCurrency $currency)
{
Preferences::set('currencyPreference', $currency->code);
Preferences::mark();
@@ -111,7 +110,6 @@ class CurrencyController extends Controller
Cache::forget('FFCURRENCYCODE');
return redirect(route('currencies.index'));
}
@@ -205,7 +203,6 @@ class CurrencyController extends Controller
$request->session()->flash('gaEventAction', 'edit');
return view('currencies.edit', compact('currency', 'subTitle', 'subTitleIcon'));
}
/**
app/Http/Controllers/ExportController.php
-2
View File
@@ -98,7 +98,6 @@ class ExportController extends Controller
->header('Content-Length', strlen($content));
return $response;
}
/**
@@ -134,7 +133,6 @@ class ExportController extends Controller
$today = Carbon::create()->format('Y-m-d');
return view('export.index', compact('job', 'checked', 'accountList', 'formats', 'defaultFormat', 'first', 'today'));
}
/**
app/Http/Controllers/HelpController.php
-5
View File
@@ -66,7 +66,6 @@ class HelpController extends Controller
$html = $this->getHelpText($route, $language);
return Response::json(['html' => $html]);
}
/**
@@ -112,7 +111,6 @@ class HelpController extends Controller
}
$content = $this->help->getFromGithub($route, $language);
}
// help still empty?
@@ -120,11 +118,8 @@ class HelpController extends Controller
$this->help->putInCache($route, $language, $content);
return $content;
}
return '<p>' . strval(trans('firefly.route_has_no_help')) . '</p>';
}
}
app/Http/Controllers/HomeController.php
+19 -8
View File
@@ -63,7 +63,6 @@ class HomeController extends Controller
*/
public function dateRange(Request $request)
{
$start = new Carbon($request->get('start'));
$end = new Carbon($request->get('end'));
$label = $request->get('label');
@@ -122,11 +121,23 @@ class HomeController extends Controller
$logContent = 'Truncated from this point <----|' . substr($logContent, -4096);
return view(
'debug', compact(
'phpVersion', 'extensions', 'carbon', 'now', 'drivers', 'currentDriver', 'userAgent', 'phpOs', 'interface', 'logContent', 'isDocker', 'isSandstorm','trustedProxies'
'debug',
compact(
'phpVersion',
'extensions',
'carbon',
'now',
'drivers',
'currentDriver',
'userAgent',
'phpOs',
'interface',
'logContent',
'isDocker',
'isSandstorm',
'trustedProxies'
)
);
}
/**
@@ -176,7 +187,8 @@ class HomeController extends Controller
$subTitle = trans('firefly.welcomeBack');
$transactions = [];
$frontPage = Preferences::get(
'frontPageAccounts', $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])->pluck('id')->toArray()
'frontPageAccounts',
$repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])->pluck('id')->toArray()
);
/** @var Carbon $start */
$start = session('start', Carbon::now()->startOfMonth());
@@ -199,7 +211,8 @@ class HomeController extends Controller
}
return view(
'index', compact('count', 'subTitle', 'transactions', 'showDeps', 'billCount')
'index',
compact('count', 'subTitle', 'transactions', 'showDeps', 'billCount')
);
}
@@ -228,7 +241,6 @@ class HomeController extends Controller
if (!$found) {
echo 'touch ' . $route->getName() . '.md;';
}
}
}
@@ -247,5 +259,4 @@ class HomeController extends Controller
return redirect(route('home'));
}
}
app/Http/Controllers/Import/BankController.php
-6
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Import;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Support\Import\Information\InformationInterface;
use FireflyIII\Support\Import\Prerequisites\PrerequisitesInterface;
@@ -60,7 +59,6 @@ class BankController extends Controller
$remoteAccounts = $object->getAccounts();
return view('import.bank.form', compact('remoteAccounts', 'bank'));
}
/**
@@ -75,7 +73,6 @@ class BankController extends Controller
*/
public function postForm(Request $request, string $bank)
{
$class = config(sprintf('firefly.import_pre.%s', $bank));
/** @var PrerequisitesInterface $object */
$object = app($class);
@@ -95,8 +92,6 @@ class BankController extends Controller
// get import file
// get import config
}
/**
@@ -161,5 +156,4 @@ class BankController extends Controller
return redirect(route('import.bank.form', [$bank]));
}
}
app/Http/Controllers/Import/FileController.php
-3
View File
@@ -39,7 +39,6 @@ use Response;
use Session;
use View;
/**
* Class FileController.
*
@@ -128,8 +127,6 @@ class FileController extends Controller
->header('Content-Length', strlen($result));
return $response;
}
/**
app/Http/Controllers/ImportController.php
-1
View File
@@ -72,5 +72,4 @@ class ImportController extends Controller
return view('import.index', compact('subTitle', 'subTitleIcon', 'importFileTypes', 'defaultImportType'));
}
}
app/Http/Controllers/JavascriptController.php
-1
View File
@@ -182,6 +182,5 @@ class JavascriptController extends Controller
return $return;
}
}
app/Http/Controllers/Json/AutoCompleteController.php
-3
View File
@@ -58,7 +58,6 @@ class AutoCompleteController extends Controller
sort($return);
return Response::json($return);
}
/**
@@ -111,7 +110,6 @@ class AutoCompleteController extends Controller
*/
public function journalsWithId(JournalCollectorInterface $collector, TransactionJournal $except)
{
$cache = new CacheProperties;
$cache->addProperty('recent-journals-id');
@@ -178,5 +176,4 @@ class AutoCompleteController extends Controller
return Response::json($return);
}
}
app/Http/Controllers/Json/BoxController.php
-2
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Json;
use Carbon\Carbon;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Http\Controllers\Controller;
@@ -214,5 +213,4 @@ class BoxController extends Controller
return Response::json($return);
}
}
app/Http/Controllers/Json/ExchangeController.php
-2
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Json;
use Carbon\Carbon;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\TransactionCurrency;
@@ -73,5 +72,4 @@ class ExchangeController extends Controller
return Response::json($return);
}
}
app/Http/Controllers/Json/FrontpageController.php
-2
View File
@@ -61,7 +61,6 @@ class FrontpageController extends Controller
$info[] = $entry;
}
}
$html = '';
if (count($info) > 0) {
@@ -70,5 +69,4 @@ class FrontpageController extends Controller
return Response::json(['html' => $html]);
}
}
app/Http/Controllers/Json/IntroController.php
-2
View File
@@ -56,7 +56,6 @@ class IntroController
// merge arrays and add last step again
$steps = array_merge($steps, $specificSteps);
$steps[] = $lastStep;
}
if (!$this->hasOutroStep($route)) {
$steps = array_merge($steps, $specificSteps);
@@ -174,5 +173,4 @@ class IntroController
return $steps;
}
}
app/Http/Controllers/Json/TransactionController.php
-2
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Json;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
@@ -89,5 +88,4 @@ class TransactionController extends Controller
return Response::json($result);
}
}
app/Http/Controllers/JsonController.php
-2
View File
@@ -105,7 +105,6 @@ class JsonController extends Controller
sort($return);
return Response::json($return);
}
/**
@@ -143,5 +142,4 @@ class JsonController extends Controller
return Response::json(['html' => $view]);
}
}
app/Http/Controllers/NewUserController.php
-4
View File
@@ -47,7 +47,6 @@ class NewUserController extends Controller
$this->middleware(
function ($request, $next) {
return $next($request);
}
);
@@ -61,7 +60,6 @@ class NewUserController extends Controller
*/
public function index(AccountRepositoryInterface $repository)
{
View::share('title', trans('firefly.welcome'));
View::share('mainTitleIcon', 'fa-fire');
@@ -70,7 +68,6 @@ class NewUserController extends Controller
if ($count > 0) {
return redirect(route('index'));
}
return view('new-user.index');
@@ -154,5 +151,4 @@ class NewUserController extends Controller
return true;
}
}
app/Http/Controllers/PiggyBankController.php
+8 -6
View File
@@ -174,7 +174,6 @@ class PiggyBankController extends Controller
*/
public function edit(AccountRepositoryInterface $repository, PiggyBank $piggyBank)
{
$accounts = ExpandedForm::makeSelectList($repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]));
$subTitle = trans('firefly.update_piggy_title', ['name' => $piggyBank->name]);
$subTitleIcon = 'fa-pencil';
@@ -290,7 +289,8 @@ class PiggyBankController extends Controller
if ($repository->canAddAmount($piggyBank, $amount)) {
$repository->addAmount($piggyBank, $amount);
Session::flash(
'success', strval(
'success',
strval(
trans(
'firefly.added_amount_to_piggy',
['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
@@ -304,7 +304,8 @@ class PiggyBankController extends Controller
Log::error('Cannot add ' . $amount . ' because canAddAmount returned false.');
Session::flash(
'error', strval(
'error',
strval(
trans(
'firefly.cannot_add_amount_piggy',
['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
@@ -332,7 +333,8 @@ class PiggyBankController extends Controller
'success',
strval(
trans(
'firefly.removed_amount_from_piggy', ['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
'firefly.removed_amount_from_piggy',
['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
)
)
);
@@ -344,7 +346,8 @@ class PiggyBankController extends Controller
$amount = strval(round($request->get('amount'), 12));
Session::flash(
'error', strval(
'error',
strval(
trans(
'firefly.cannot_remove_from_piggy',
['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
@@ -391,7 +394,6 @@ class PiggyBankController extends Controller
$subTitle = e($piggyBank->name);
return view('piggy-banks.show', compact('piggyBank', 'events', 'subTitle', 'note'));
}
/**
app/Http/Controllers/Popup/ReportController.php
-5
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Popup;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collection\BalanceLine;
@@ -80,7 +79,6 @@ class ReportController extends Controller
return $next($request);
}
);
}
@@ -119,8 +117,6 @@ class ReportController extends Controller
}
return Response::json(['html' => $html]);
}
/**
@@ -251,5 +247,4 @@ class ReportController extends Controller
return $attributes;
}
}
app/Http/Controllers/PreferencesController.php
+12 -4
View File
@@ -113,9 +113,18 @@ class PreferencesController extends Controller
return view(
'preferences.index',
compact(
'language', 'accounts', 'frontPageAccounts', 'tjOptionalFields',
'viewRange', 'customFiscalYear', 'transactionPageSize', 'fiscalYearStart', 'is2faEnabled',
'has2faSecret', 'showIncomplete', 'showDeps'
'language',
'accounts',
'frontPageAccounts',
'tjOptionalFields',
'viewRange',
'customFiscalYear',
'transactionPageSize',
'fiscalYearStart',
'is2faEnabled',
'has2faSecret',
'showIncomplete',
'showDeps'
)
);
}
@@ -236,5 +245,4 @@ class PreferencesController extends Controller
return $parts['host'];
}
}
app/Http/Controllers/ProfileController.php
+1 -5
View File
@@ -64,7 +64,6 @@ class ProfileController extends Controller
}
);
$this->middleware(IsLimitedUser::class)->except(['confirmEmailChange', 'undoEmailChange']);
}
/**
@@ -253,7 +252,7 @@ class ProfileController extends Controller
/**
*
*/
function regenerate()
public function regenerate()
{
$token = auth()->user()->generateAccessToken();
Preferences::set('access_token', $token);
@@ -328,8 +327,5 @@ class ProfileController extends Controller
}
return true;
}
}
app/Http/Controllers/Report/AccountController.php
-1
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Report;
use Carbon\Carbon;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Repositories\Account\AccountTaskerInterface;
app/Http/Controllers/Report/BalanceController.php
-1
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Report;
use Carbon\Carbon;
use FireflyIII\Helpers\Report\BalanceReportHelperInterface;
use FireflyIII\Http\Controllers\Controller;
app/Http/Controllers/Report/BudgetController.php
-2
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Report;
use Carbon\Carbon;
use FireflyIII\Helpers\Report\BudgetReportHelperInterface;
use FireflyIII\Http\Controllers\Controller;
@@ -68,7 +67,6 @@ class BudgetController extends Controller
$cache->store($result);
return $result;
}
/**
app/Http/Controllers/Report/CategoryController.php
-3
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Report;
use Carbon\Carbon;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Category;
@@ -172,6 +171,4 @@ class CategoryController extends Controller
return $data;
}
}
app/Http/Controllers/Report/OperationsController.php
+4 -7
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Report;
use Carbon\Carbon;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Repositories\Account\AccountTaskerInterface;
@@ -63,7 +62,6 @@ class OperationsController extends Controller
$cache->store($result);
return $result;
}
/**
@@ -92,7 +90,6 @@ class OperationsController extends Controller
$cache->store($result);
return $result;
}
/**
@@ -121,7 +118,8 @@ class OperationsController extends Controller
array_map(
function ($item) {
return $item['sum'];
}, $incomes
},
$incomes
)
);
@@ -129,7 +127,8 @@ class OperationsController extends Controller
array_map(
function ($item) {
return $item['sum'];
}, $expenses
},
$expenses
)
);
@@ -137,7 +136,5 @@ class OperationsController extends Controller
$cache->store($result);
return $result;
}
}
app/Http/Controllers/ReportController.php
+10 -14
View File
@@ -69,7 +69,6 @@ class ReportController extends Controller
return $next($request);
}
);
}
/**
@@ -89,7 +88,8 @@ class ReportController extends Controller
}
View::share(
'subTitle', trans(
'subTitle',
trans(
'firefly.report_audit',
[
'start' => $start->formatLocalized($this->monthFormat),
@@ -104,7 +104,6 @@ class ReportController extends Controller
$result = $generator->generate();
return $result;
}
/**
@@ -125,7 +124,8 @@ class ReportController extends Controller
}
View::share(
'subTitle', trans(
'subTitle',
trans(
'firefly.report_budget',
[
'start' => $start->formatLocalized($this->monthFormat),
@@ -140,7 +140,6 @@ class ReportController extends Controller
$result = $generator->generate();
return $result;
}
/**
@@ -161,7 +160,8 @@ class ReportController extends Controller
}
View::share(
'subTitle', trans(
'subTitle',
trans(
'firefly.report_category',
[
'start' => $start->formatLocalized($this->monthFormat),
@@ -176,7 +176,6 @@ class ReportController extends Controller
$result = $generator->generate();
return $result;
}
/**
@@ -197,7 +196,8 @@ class ReportController extends Controller
}
View::share(
'subTitle', trans(
'subTitle',
trans(
'firefly.report_default',
[
'start' => $start->formatLocalized($this->monthFormat),
@@ -211,7 +211,6 @@ class ReportController extends Controller
$result = $generator->generate();
return $result;
}
/**
@@ -343,7 +342,8 @@ class ReportController extends Controller
}
View::share(
'subTitle', trans(
'subTitle',
trans(
'firefly.report_tag',
[
'start' => $start->formatLocalized($this->monthFormat),
@@ -358,7 +358,6 @@ class ReportController extends Controller
$result = $generator->generate();
return $result;
}
/**
@@ -372,7 +371,6 @@ class ReportController extends Controller
$result = view('reports.options.budget', compact('budgets'))->render();
return $result;
}
/**
@@ -386,7 +384,6 @@ class ReportController extends Controller
$result = view('reports.options.category', compact('categories'))->render();
return $result;
}
/**
@@ -412,6 +409,5 @@ class ReportController extends Controller
$result = view('reports.options.tag', compact('tags'))->render();
return $result;
}
}
app/Http/Controllers/RuleController.php
+12 -14
View File
@@ -110,7 +110,8 @@ class RuleController extends Controller
Session::flash('gaEventAction', 'create-rule');
return view(
'rules.rule.create', compact('subTitleIcon', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroup', 'subTitle')
'rules.rule.create',
compact('subTitleIcon', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroup', 'subTitle')
);
}
@@ -143,7 +144,6 @@ class RuleController extends Controller
*/
public function destroy(RuleRepositoryInterface $repository, Rule $rule)
{
$title = $rule->title;
$repository->destroy($rule);
@@ -164,7 +164,6 @@ class RuleController extends Controller
$repository->moveDown($rule);
return redirect(route('rules.index'));
}
/**
@@ -212,9 +211,16 @@ class RuleController extends Controller
Session::flash('gaEventAction', 'edit-rule');
return view(
'rules.rule.edit', compact(
'rule', 'subTitle',
'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroups'
'rules.rule.edit',
compact(
'rule',
'subTitle',
'primaryTrigger',
'oldTriggers',
'oldActions',
'triggerCount',
'actionCount',
'ruleGroups'
)
);
}
@@ -283,7 +289,6 @@ class RuleController extends Controller
}
return Response::json('true');
}
/**
@@ -301,7 +306,6 @@ class RuleController extends Controller
}
return Response::json('true');
}
/**
@@ -411,7 +415,6 @@ class RuleController extends Controller
*/
public function testTriggersByRule(Rule $rule)
{
$triggers = $rule->ruleTriggers;
if (count($triggers) === 0) {
@@ -454,7 +457,6 @@ class RuleController extends Controller
$repository->moveUp($rule);
return redirect(route('rules.index'));
}
/**
@@ -510,7 +512,6 @@ class RuleController extends Controller
$repository->store($data);
}
}
/**
@@ -655,7 +656,6 @@ class RuleController extends Controller
*/
private function getValidTriggerList(TestRuleFormRequest $request): array
{
$triggers = [];
$data = [
'rule-triggers' => $request->get('rule-trigger'),
@@ -675,6 +675,4 @@ class RuleController extends Controller
return $triggers;
}
}
app/Http/Controllers/RuleGroupController.php
-5
View File
@@ -111,7 +111,6 @@ class RuleGroupController extends Controller
*/
public function destroy(Request $request, RuleGroupRepositoryInterface $repository, RuleGroup $ruleGroup)
{
$title = $ruleGroup->title;
$moveTo = auth()->user()->ruleGroups()->find(intval($request->get('move_rules_before_delete')));
@@ -135,7 +134,6 @@ class RuleGroupController extends Controller
$repository->moveDown($ruleGroup);
return redirect(route('rules.index'));
}
/**
@@ -156,7 +154,6 @@ class RuleGroupController extends Controller
Session::flash('gaEventAction', 'edit-rule-group');
return view('rules.rule-group.edit', compact('ruleGroup', 'subTitle'));
}
/**
@@ -248,7 +245,6 @@ class RuleGroupController extends Controller
$repository->moveUp($ruleGroup);
return redirect(route('rules.index'));
}
/**
@@ -281,6 +277,5 @@ class RuleGroupController extends Controller
// redirect to previous URL.
return redirect($this->getPreviousUri('rule-groups.edit.uri'));
}
}
app/Http/Controllers/SearchController.php
-4
View File
@@ -51,7 +51,6 @@ class SearchController extends Controller
return $next($request);
}
);
}
/**
@@ -96,8 +95,5 @@ class SearchController extends Controller
$html = view('search.search', compact('transactions'))->render();
return Response::json(['count' => $transactions->count(), 'html' => $html]);
}
}
app/Http/Controllers/TagController.php
-5
View File
@@ -124,7 +124,6 @@ class TagController extends Controller
*/
public function destroy(Tag $tag)
{
$tagName = $tag->tag;
$this->repository->destroy($tag);
@@ -284,7 +283,6 @@ class TagController extends Controller
}
return redirect($this->getPreviousUri('tags.create.uri'));
}
/**
@@ -356,8 +354,5 @@ class TagController extends Controller
$cache->store($collection);
return $collection;
}
}
app/Http/Controllers/Transaction/ConvertController.php
+10 -5
View File
@@ -107,9 +107,16 @@ class ConvertController extends Controller
return view(
'transactions.convert',
compact(
'sourceType', 'destinationType', 'journal', 'assetAccounts',
'positiveAmount', 'sourceAccount', 'destinationAccount', 'sourceType',
'subTitle', 'subTitleIcon'
'sourceType',
'destinationType',
'journal',
'assetAccounts',
'positiveAmount',
'sourceAccount',
'destinationAccount',
'sourceType',
'subTitle',
'subTitleIcon'
)
);
@@ -271,7 +278,5 @@ class ConvertController extends Controller
}
return $source;
}
}
app/Http/Controllers/Transaction/LinkController.php
+4 -5
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\JournalLinkRequest;
use FireflyIII\Models\TransactionJournal;
@@ -60,7 +59,6 @@ class LinkController extends Controller
return $next($request);
}
);
}
@@ -103,7 +101,10 @@ class LinkController extends Controller
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function store(
JournalLinkRequest $request, LinkTypeRepositoryInterface $repository, JournalRepositoryInterface $journalRepository, TransactionJournal $journal
JournalLinkRequest $request,
LinkTypeRepositoryInterface $repository,
JournalRepositoryInterface $journalRepository,
TransactionJournal $journal
) {
$linkInfo = $request->getLinkInfo();
if ($linkInfo['transaction_journal_id'] === 0) {
@@ -150,10 +151,8 @@ class LinkController extends Controller
*/
public function switch(LinkTypeRepositoryInterface $repository, TransactionJournalLink $link)
{
$repository->switchLink($link);
return redirect(URL::previous());
}
}
app/Http/Controllers/Transaction/MassController.php
+1 -5
View File
@@ -78,7 +78,6 @@ class MassController extends Controller
Session::flash('gaEventAction', 'mass-delete');
return view('transactions.mass-delete', compact('journals', 'subTitle'));
}
/**
@@ -115,7 +114,6 @@ class MassController extends Controller
// redirect to previous URL:
return redirect($this->getPreviousUri('transactions.mass-delete.uri'));
}
@@ -161,7 +159,7 @@ class MassController extends Controller
}
// cannot edit reconciled transactions / journals:
if($journal->transactions->first()->reconciled) {
if ($journal->transactions->first()->reconciled) {
$messages[] = trans('firefly.cannot_edit_reconciled', ['description' => $journal->description, 'id' => $journal->id]);
continue;
}
@@ -270,13 +268,11 @@ class MassController extends Controller
$count++;
}
}
}
Preferences::mark();
Session::flash('success', trans('firefly.mass_edited_transactions_success', ['amount' => $count]));
// redirect to previous URL:
return redirect($this->getPreviousUri('transactions.mass-edit.uri'));
}
}
app/Http/Controllers/Transaction/SingleController.php
-4
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use Carbon\Carbon;
use ExpandedForm;
use FireflyIII\Events\StoredTransactionJournal;
@@ -99,7 +98,6 @@ class SingleController extends Controller
return $next($request);
}
);
}
public function cloneTransaction(TransactionJournal $journal)
@@ -214,8 +212,6 @@ class SingleController extends Controller
Session::flash('gaEventAction', 'delete-' . $what);
return view('transactions.single.delete', compact('journal', 'subTitle', 'what'));
}
/**
app/Http/Controllers/Transaction/SplitController.php
+11 -8
View File
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use ExpandedForm;
use FireflyIII\Events\UpdatedTransactionJournal;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
@@ -136,9 +135,17 @@ class SplitController extends Controller
return view(
'transactions.split.edit',
compact(
'subTitleIcon', 'currencies', 'optionalFields',
'preFilled', 'subTitle', 'uploadSize', 'assetAccounts',
'budgets', 'journal', 'accountArray', 'previous'
'subTitleIcon',
'currencies',
'optionalFields',
'preFilled',
'subTitle',
'uploadSize',
'assetAccounts',
'budgets',
'journal',
'accountArray',
'previous'
)
);
}
@@ -306,7 +313,6 @@ class SplitController extends Controller
}
$return[] = $set;
}
return $return;
@@ -322,7 +328,6 @@ class SplitController extends Controller
$return = [];
$transactions = $request->get('transactions');
foreach ($transactions as $transaction) {
$return[] = [
'description' => $transaction['description'],
'source_account_id' => $transaction['source_account_id'] ?? 0,
@@ -373,6 +378,4 @@ class SplitController extends Controller
return $array;
}
}
app/Http/Controllers/TransactionController.php
-5
View File
@@ -64,7 +64,6 @@ class TransactionController extends Controller
return $next($request);
}
);
}
/**
@@ -130,7 +129,6 @@ class TransactionController extends Controller
return view('transactions.index', compact('subTitle', 'what', 'subTitleIcon', 'transactions', 'periods', 'start', 'end', 'moment'));
}
/**
@@ -146,7 +144,6 @@ class TransactionController extends Controller
$repository->reconcile($transaction);
}
}
/**
@@ -173,7 +170,6 @@ class TransactionController extends Controller
Preferences::mark();
return Response::json([true]);
}
/**
@@ -300,5 +296,4 @@ class TransactionController extends Controller
return $return;
}
}