kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-07 14:41:20 +00:00
Code Issues 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

3
app/Http/Controllers/Account/CreateController.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Account;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\AccountFormRequest;
@@ -135,7 +136,7 @@ class CreateController extends Controller
* @param AccountFormRequest $request
*
* @return RedirectResponse|Redirector
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
public function store(AccountFormRequest $request)
{

4
app/Http/Controllers/Account/DeleteController.php
View File

@@ -72,7 +72,7 @@ class DeleteController extends Controller
public function delete(Account $account)
{
if (!$this->isEditableAccount($account)) {
return $this->redirectAccountToAccount($account);
return $this->redirectAccountToAccount($account);
}
$typeName = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
@@ -98,7 +98,7 @@ class DeleteController extends Controller
public function destroy(Request $request, Account $account)
{
if (!$this->isEditableAccount($account)) {
return $this->redirectAccountToAccount($account);
return $this->redirectAccountToAccount($account);
}
$type = $account->accountType->type;

18
app/Http/Controllers/Account/EditController.php
View File

@@ -44,9 +44,9 @@ class EditController extends Controller
{
use ModelInformation;
private AttachmentHelperInterface $attachments;
private AttachmentHelperInterface $attachments;
private CurrencyRepositoryInterface $currencyRepos;
private AccountRepositoryInterface $repository;
private AccountRepositoryInterface $repository;
/**
* EditController constructor.
@@ -82,7 +82,7 @@ class EditController extends Controller
public function edit(Request $request, Account $account, AccountRepositoryInterface $repository)
{
if (!$this->isEditableAccount($account)) {
return $this->redirectAccountToAccount($account);
return $this->redirectAccountToAccount($account);
}
$objectType = config('firefly.shortNamesByFullName')[$account->accountType->type];
@@ -123,11 +123,11 @@ class EditController extends Controller
$request->session()->forget('accounts.edit.fromUpdate');
$openingBalanceAmount = app('steam')->positive((string)$repository->getOpeningBalanceAmount($account));
if('0' === $openingBalanceAmount) {
if ('0' === $openingBalanceAmount) {
$openingBalanceAmount = '';
}
$openingBalanceDate = $repository->getOpeningBalanceDate($account);
$currency = $this->repository->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
$openingBalanceDate = $repository->getOpeningBalanceDate($account);
$currency = $this->repository->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
// include this account in net-worth charts?
$includeNetWorth = $repository->getMetaValue($account, 'include_net_worth');
@@ -144,7 +144,7 @@ class EditController extends Controller
'opening_balance_date' => $openingBalanceDate,
'liability_type_id' => $account->account_type_id,
'opening_balance' => $openingBalanceAmount,
'liability_direction' => $this->repository->getMetaValue($account, 'liability_direction'),
'liability_direction' => $this->repository->getMetaValue($account, 'liability_direction'),
'virtual_balance' => $account->virtual_balance,
'currency_id' => $currency->id,
'include_net_worth' => $includeNetWorth,
@@ -185,7 +185,7 @@ class EditController extends Controller
public function update(AccountFormRequest $request, Account $account)
{
if (!$this->isEditableAccount($account)) {
return $this->redirectAccountToAccount($account);
return $this->redirectAccountToAccount($account);
}
$data = $request->getAccountData();
@@ -204,7 +204,7 @@ class EditController extends Controller
}
if (count($this->attachments->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
}
// redirect

9
app/Http/Controllers/Account/IndexController.php
View File

@@ -25,6 +25,7 @@ namespace FireflyIII\Http\Controllers\Account;
use Carbon\Carbon;
use Exception;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -72,7 +73,7 @@ class IndexController extends Controller
* @param string $objectType
*
* @return Factory|View
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
public function inactive(Request $request, string $objectType)
{
@@ -160,13 +161,15 @@ class IndexController extends Controller
$accounts->each(
function (Account $account) use ($activities, $startBalances, $endBalances) {
// See reference nr. 68
// See reference nr. 68
$account->lastActivityDate = $this->isInArray($activities, $account->id);
$account->startBalance = $this->isInArray($startBalances, $account->id);
$account->endBalance = $this->isInArray($endBalances, $account->id);
$account->difference = bcsub($account->endBalance, $account->startBalance);
$account->interest = number_format((float)$this->repository->getMetaValue($account, 'interest'), 4, '.', '');
$account->interestPeriod = (string)trans(sprintf('firefly.interest_calc_%s', $this->repository->getMetaValue($account, 'interest_period')));
$account->interestPeriod = (string)trans(
sprintf('firefly.interest_calc_%s', $this->repository->getMetaValue($account, 'interest_period'))
);
$account->accountTypeString = (string)trans(sprintf('firefly.account_type_%s', $account->accountType->type));
$account->location = $this->repository->getLocation($account);
$account->liability_direction = $this->repository->getMetaValue($account, 'liability_direction');

6
app/Http/Controllers/Account/ReconcileController.php
View File

@@ -91,7 +91,7 @@ class ReconcileController extends Controller
public function reconcile(Account $account, Carbon $start = null, Carbon $end = null)
{
if (!$this->isEditableAccount($account)) {
return $this->redirectAccountToAccount($account);
return $this->redirectAccountToAccount($account);
}
if (AccountType::ASSET !== $account->accountType->type) {
@@ -169,7 +169,7 @@ class ReconcileController extends Controller
public function submit(ReconciliationStoreRequest $request, Account $account, Carbon $start, Carbon $end)
{
if (!$this->isEditableAccount($account)) {
return $this->redirectAccountToAccount($account);
return $this->redirectAccountToAccount($account);
}
Log::debug('In ReconcileController::submit()');
@@ -218,7 +218,7 @@ class ReconcileController extends Controller
private function createReconciliation(Account $account, Carbon $start, Carbon $end, string $difference)
{
if (!$this->isEditableAccount($account)) {
return $this->redirectAccountToAccount($account);
return $this->redirectAccountToAccount($account);
}
$reconciliation = $this->accountRepos->getReconciliation($account);

6
app/Http/Controllers/Account/ShowController.php
View File

@@ -91,7 +91,7 @@ class ShowController extends Controller
$objectType = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
if (!$this->isEditableAccount($account)) {
return $this->redirectAccountToAccount($account);
return $this->redirectAccountToAccount($account);
}
/** @var Carbon $start */
@@ -100,7 +100,7 @@ class ShowController extends Controller
$end = $end ?? session('end');
if ($end < $start) {
[$start, $end] = [$end, $start];
[$start, $end] = [$end, $start];
}
$location = $this->repository->getLocation($account);
$attachments = $this->repository->getAttachments($account);
@@ -164,7 +164,7 @@ class ShowController extends Controller
public function showAll(Request $request, Account $account)
{
if (!$this->isEditableAccount($account)) {
return $this->redirectAccountToAccount($account);
return $this->redirectAccountToAccount($account);
}
$location = $this->repository->getLocation($account);
$isLiability = $this->repository->isLiability($account);

2
app/Http/Controllers/Admin/ConfigurationController.php
View File

@@ -64,7 +64,7 @@ class ConfigurationController extends Controller
*/
public function index()
{
$subTitle = (string)trans('firefly.instance_configuration');
$subTitle = (string)trans('firefly.instance_configuration');
$subTitleIcon = 'fa-wrench';
Log::channel('audit')->info('User visits admin config index.');

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

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Admin;
use FireflyIII\Events\AdminRequestedTestMessage;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Middleware\IsDemoUser;
use FireflyIII\User;
@@ -53,7 +54,7 @@ class HomeController extends Controller
* Index of the admin.
*
* @return Factory|View
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
public function index()
{

2
app/Http/Controllers/Admin/LinkController.php
View File

@@ -161,7 +161,7 @@ class LinkController extends Controller
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('link-types.edit.fromUpdate')) {
$this->rememberPreviousUri('link-types.edit.uri');
$this->rememberPreviousUri('link-types.edit.uri');
}
$request->session()->forget('link-types.edit.fromUpdate');

6
app/Http/Controllers/Auth/LoginController.php
View File

@@ -28,15 +28,17 @@ use DB;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Providers\RouteServiceProvider;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Foundation\Auth\ThrottlesLogins;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Routing\Redirector;
use Illuminate\Validation\ValidationException;
use Illuminate\View\View;
use Log;
/**
@@ -194,7 +196,7 @@ class LoginController extends Controller
*
* @param Request $request
*
* @return Factory|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\View|\Illuminate\Routing\Redirector|RedirectResponse
* @return Factory|Application|View|Redirector|RedirectResponse
* @throws FireflyException
*/
public function showLoginForm(Request $request)

3
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -27,6 +27,7 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Support\Http\Controllers\CreateStuff;
use FireflyIII\User;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Http\RedirectResponse;
@@ -78,7 +79,7 @@ class RegisterController extends Controller
*
* @param Request $request
*
* @return \Illuminate\Contracts\Foundation\Application|Redirector|RedirectResponse
* @return Application|Redirector|RedirectResponse
* @throws FireflyException
* @throws ValidationException
*/

5
app/Http/Controllers/Bill/CreateController.php
View File

@@ -30,6 +30,7 @@ use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\BillStoreRequest;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Log;
@@ -68,7 +69,7 @@ class CreateController extends Controller
*
* @param Request $request
*
* @return Factory|\Illuminate\Contracts\View\View
* @return Factory|View
*/
public function create(Request $request)
{
@@ -123,7 +124,7 @@ class CreateController extends Controller
}
if (count($this->attachments->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
}
return redirect(route('rules.create-from-bill', [$bill->id]));

5
app/Http/Controllers/Bill/EditController.php
View File

@@ -30,6 +30,7 @@ use FireflyIII\Http\Requests\BillUpdateRequest;
use FireflyIII\Models\Bill;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
@@ -68,7 +69,7 @@ class EditController extends Controller
* @param Request $request
* @param Bill $bill
*
* @return Factory|\Illuminate\Contracts\View\View
* @return Factory|View
*/
public function edit(Request $request, Bill $bill)
{
@@ -136,7 +137,7 @@ class EditController extends Controller
// flash messages
if (count($this->attachments->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
}
$redirect = redirect($this->getPreviousUri('bills.edit.uri'));

27
app/Http/Controllers/Bill/IndexController.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Bill;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Bill;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
@@ -105,18 +106,18 @@ class IndexController extends Controller
'object_group_title' => $array['object_group_title'],
'bills' => [],
];
// var_dump($array);exit;
// // expected today? default:
// $array['next_expected_match_diff'] = trans('firefly.not_expected_period');
// $nextExpectedMatch = new Carbon($array['next_expected_match']);
// if ($nextExpectedMatch->isToday()) {
// $array['next_expected_match_diff'] = trans('firefly.today');
// }
// $current = $array['pay_dates'][0] ?? null;
// if (null !== $current && !$nextExpectedMatch->isToday()) {
// $currentExpectedMatch = Carbon::createFromFormat('Y-m-d\TH:i:sP', $current);
// $array['next_expected_match_diff'] = $currentExpectedMatch->diffForHumans(today(), Carbon::DIFF_RELATIVE_TO_NOW);
// }
// var_dump($array);exit;
// // expected today? default:
// $array['next_expected_match_diff'] = trans('firefly.not_expected_period');
// $nextExpectedMatch = new Carbon($array['next_expected_match']);
// if ($nextExpectedMatch->isToday()) {
// $array['next_expected_match_diff'] = trans('firefly.today');
// }
// $current = $array['pay_dates'][0] ?? null;
// if (null !== $current && !$nextExpectedMatch->isToday()) {
// $currentExpectedMatch = Carbon::createFromFormat('Y-m-d\TH:i:sP', $current);
// $array['next_expected_match_diff'] = $currentExpectedMatch->diffForHumans(today(), Carbon::DIFF_RELATIVE_TO_NOW);
// }
$currency = $bill->transactionCurrency ?? $defaultCurrency;
$array['currency_id'] = $currency->id;
@@ -143,7 +144,7 @@ class IndexController extends Controller
* @param array $bills
*
* @return array
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
private function getSums(array $bills): array
{

2
app/Http/Controllers/Budget/CreateController.php
View File

@@ -133,7 +133,7 @@ class CreateController extends Controller
}
if (count($this->attachments->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
}
$redirect = redirect($this->getPreviousUri('budgets.create.uri'));

2
app/Http/Controllers/Budget/EditController.php
View File

@@ -144,7 +144,7 @@ class EditController extends Controller
}
if (count($this->attachments->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
}
if (1 === (int)$request->get('return_to_edit')) {

3
app/Http/Controllers/Budget/IndexController.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Budget;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\AvailableBudget;
use FireflyIII\Models\Budget;
@@ -90,7 +91,7 @@ class IndexController extends Controller
* @param Carbon|null $end
*
* @return Factory|View
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
public function index(Request $request, Carbon $start = null, Carbon $end = null)
{

4
app/Http/Controllers/Budget/ShowController.php
View File

@@ -47,7 +47,7 @@ class ShowController extends Controller
use PeriodOverview, AugumentData;
protected JournalRepositoryInterface $journalRepos;
private BudgetRepositoryInterface $repository;
private BudgetRepositoryInterface $repository;
/**
* ShowController constructor.
@@ -183,7 +183,7 @@ class ShowController extends Controller
public function showByBudgetLimit(Request $request, Budget $budget, BudgetLimit $budgetLimit)
{
if ($budgetLimit->budget->id !== $budget->id) {
throw new FireflyException('This budget limit is not part of this budget.');
throw new FireflyException('This budget limit is not part of this budget.');
}
$page = (int)$request->get('page');

2
app/Http/Controllers/Category/CreateController.php
View File

@@ -107,7 +107,7 @@ class CreateController extends Controller
}
if (count($this->attachments->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
}
$redirect = redirect(route('categories.index'));

2
app/Http/Controllers/Category/DeleteController.php
View File

@@ -80,7 +80,7 @@ class DeleteController extends Controller
/**
* Destroy a category.
*
* @param Request $request
* @param Request $request
* @param Category $category
*
* @return RedirectResponse|Redirector

2
app/Http/Controllers/Category/EditController.php
View File

@@ -115,7 +115,7 @@ class EditController extends Controller
}
if (count($this->attachments->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
}
$redirect = redirect($this->getPreviousUri('categories.edit.uri'));

3
app/Http/Controllers/Category/IndexController.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Category;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Category;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
@@ -66,7 +67,7 @@ class IndexController extends Controller
* @param Request $request
*
* @return Factory|View
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
public function index(Request $request)
{

5
app/Http/Controllers/Category/NoCategoryController.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Category;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\TransactionType;
@@ -74,7 +75,7 @@ class NoCategoryController extends Controller
* @param Carbon|null $end
*
* @return Factory|View
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
public function show(Request $request, Carbon $start = null, Carbon $end = null)
{
@@ -112,7 +113,7 @@ class NoCategoryController extends Controller
* @param Request $request
*
* @return Factory|View
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
public function showAll(Request $request)
{

5
app/Http/Controllers/Category/ShowController.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Category;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Category;
@@ -76,7 +77,7 @@ class ShowController extends Controller
* @param Carbon|null $end
*
* @return Factory|View
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
public function show(Request $request, Category $category, Carbon $start = null, Carbon $end = null)
{
@@ -116,7 +117,7 @@ class ShowController extends Controller
* @param Category $category
*
* @return Factory|View
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
public function showAll(Request $request, Category $category)
{

36
app/Http/Controllers/Chart/AccountController.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Chart;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Http\Controllers\Controller;
@@ -38,6 +39,7 @@ use FireflyIII\Support\Http\Controllers\ChartGeneration;
use FireflyIII\Support\Http\Controllers\DateCalculation;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Collection;
use JsonException;
use Log;
/**
@@ -83,7 +85,7 @@ class AccountController extends Controller
* This chart is (multi) currency aware.
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function expenseAccounts(): JsonResponse
{
@@ -96,7 +98,7 @@ class AccountController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.account.expense-accounts');
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
$start->subDay();
@@ -195,7 +197,7 @@ class AccountController extends Controller
* @param Carbon $end
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function expenseBudget(Account $account, Carbon $start, Carbon $end): JsonResponse
{
@@ -205,7 +207,7 @@ class AccountController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.account.expense-budget');
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
@@ -270,7 +272,7 @@ class AccountController extends Controller
* @param Carbon $end
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function expenseCategory(Account $account, Carbon $start, Carbon $end): JsonResponse
{
@@ -280,7 +282,7 @@ class AccountController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.account.expense-category');
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
/** @var GroupCollectorInterface $collector */
@@ -325,7 +327,7 @@ class AccountController extends Controller
* @param AccountRepositoryInterface $repository
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
public function frontpage(AccountRepositoryInterface $repository): JsonResponse
{
@@ -368,7 +370,7 @@ class AccountController extends Controller
* @param Carbon $end
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function incomeCategory(Account $account, Carbon $start, Carbon $end): JsonResponse
{
@@ -378,7 +380,7 @@ class AccountController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.account.income-category');
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
// grab all journals:
@@ -426,8 +428,8 @@ class AccountController extends Controller
* @param Carbon $end
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws \JsonException
* @throws FireflyException
* @throws JsonException
*/
public function period(Account $account, Carbon $start, Carbon $end): JsonResponse
{
@@ -438,7 +440,7 @@ class AccountController extends Controller
$cache->addProperty($end);
$cache->addProperty($account->id);
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
$currencies = $this->accountRepository->getUsedCurrencies($account);
@@ -465,8 +467,8 @@ class AccountController extends Controller
* @param TransactionCurrency $currency
*
* @return array
* @throws \FireflyIII\Exceptions\FireflyException
* @throws \JsonException
* @throws FireflyException
* @throws JsonException
*/
private function periodByCurrency(Carbon $start, Carbon $end, Account $account, TransactionCurrency $currency): array
{
@@ -518,7 +520,7 @@ class AccountController extends Controller
/**
* Shows the balances for a given set of dates and accounts.
*
* See reference nr. 55
* See reference nr. 55
*
* @param Carbon $start
* @param Carbon $end
@@ -537,7 +539,7 @@ class AccountController extends Controller
* This chart is multi-currency aware.
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function revenueAccounts(): JsonResponse
{
@@ -550,7 +552,7 @@ class AccountController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.account.revenue-accounts');
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
$start->subDay();

9
app/Http/Controllers/Chart/BillController.php
View File

@@ -31,6 +31,7 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Http\JsonResponse;
use JsonException;
/**
* Class BillController.
@@ -57,7 +58,7 @@ class BillController extends Controller
* @param BillRepositoryInterface $repository
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function frontpage(BillRepositoryInterface $repository): JsonResponse
{
@@ -68,7 +69,7 @@ class BillController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.bill.frontpage');
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
/** @var CurrencyRepositoryInterface $currencyRepository */
$currencyRepository = app(CurrencyRepositoryInterface::class);
@@ -103,7 +104,7 @@ class BillController extends Controller
* @param Bill $bill
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function single(Bill $bill): JsonResponse
{
@@ -111,7 +112,7 @@ class BillController extends Controller
$cache->addProperty('chart.bill.single');
$cache->addProperty($bill->id);
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
$locale = app('steam')->getLocale();

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

@@ -41,6 +41,7 @@ use FireflyIII\Support\Http\Controllers\AugumentData;
use FireflyIII\Support\Http\Controllers\DateCalculation;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Collection;
use JsonException;
/**
* Class BudgetController.
@@ -84,7 +85,7 @@ class BudgetController extends Controller
* @param Budget $budget
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function budget(Budget $budget): JsonResponse
{
@@ -153,7 +154,7 @@ class BudgetController extends Controller
* @return JsonResponse
*
* @throws FireflyException
* @throws \JsonException
* @throws JsonException
*/
public function budgetLimit(Budget $budget, BudgetLimit $budgetLimit): JsonResponse
{
@@ -171,7 +172,7 @@ class BudgetController extends Controller
$cache->addProperty($budget->id);
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
$locale = app('steam')->getLocale();
$entries = [];
@@ -204,7 +205,7 @@ class BudgetController extends Controller
* @param BudgetLimit|null $budgetLimit
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function expenseAsset(Budget $budget, ?BudgetLimit $budgetLimit = null): JsonResponse
{
@@ -227,7 +228,7 @@ class BudgetController extends Controller
$cache->addProperty($end);
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
$collector->setRange($start, $end);
$collector->setBudget($budget);
@@ -273,7 +274,7 @@ class BudgetController extends Controller
* @param BudgetLimit|null $budgetLimit
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function expenseCategory(Budget $budget, ?BudgetLimit $budgetLimit = null): JsonResponse
{
@@ -295,7 +296,7 @@ class BudgetController extends Controller
$cache->addProperty($end);
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
$collector->setRange($start, $end);
$collector->setBudget($budget)->withCategoryInformation();
@@ -338,7 +339,7 @@ class BudgetController extends Controller
* @param BudgetLimit|null $budgetLimit
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function expenseExpense(Budget $budget, ?BudgetLimit $budgetLimit = null): JsonResponse
{
@@ -360,7 +361,7 @@ class BudgetController extends Controller
$cache->addProperty($end);
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
$collector->setRange($start, $end);
$collector->setTypes([TransactionType::WITHDRAWAL])->setBudget($budget)->withAccountInformation();
@@ -402,7 +403,7 @@ class BudgetController extends Controller
* Shows a budget list with spent/left/overspent.
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function frontpage(): JsonResponse
{
@@ -415,7 +416,7 @@ class BudgetController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.budget.frontpage');
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
$chartGenerator = app(FrontpageChartGenerator::class);
@@ -440,7 +441,7 @@ class BudgetController extends Controller
* @param Carbon $end
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function period(Budget $budget, TransactionCurrency $currency, Collection $accounts, Carbon $start, Carbon $end): JsonResponse
{
@@ -453,7 +454,7 @@ class BudgetController extends Controller
$cache->addProperty($currency->id);
$cache->addProperty('chart.budget.period');
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
$titleFormat = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
$preferredRange = app('navigation')->preferredRangeFormat($start, $end);
@@ -516,7 +517,7 @@ class BudgetController extends Controller
* @param Carbon $end
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function periodNoBudget(TransactionCurrency $currency, Collection $accounts, Carbon $start, Carbon $end): JsonResponse
{
@@ -528,7 +529,7 @@ class BudgetController extends Controller
$cache->addProperty($currency->id);
$cache->addProperty('chart.budget.no-budget');
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
// the expenses:

16
app/Http/Controllers/Chart/CategoryController.php
View File

@@ -24,6 +24,7 @@ namespace FireflyIII\Http\Controllers\Chart;
use Carbon\Carbon;
use Exception;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Category;
@@ -38,6 +39,7 @@ use FireflyIII\Support\Http\Controllers\ChartGeneration;
use FireflyIII\Support\Http\Controllers\DateCalculation;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Collection;
use JsonException;
/**
* Class CategoryController.
@@ -68,8 +70,8 @@ class CategoryController extends Controller
* @param Category $category
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws \JsonException
* @throws FireflyException
* @throws JsonException
*/
public function all(Category $category): JsonResponse
{
@@ -116,7 +118,7 @@ class CategoryController extends Controller
* See reference nr. 60
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function frontPage(): JsonResponse
{
@@ -149,7 +151,7 @@ class CategoryController extends Controller
* @param Carbon $end
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function reportPeriod(Category $category, Collection $accounts, Carbon $start, Carbon $end): JsonResponse
{
@@ -265,7 +267,7 @@ class CategoryController extends Controller
* @param Carbon $end
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function reportPeriodNoCategory(Collection $accounts, Carbon $start, Carbon $end): JsonResponse
{
@@ -292,8 +294,8 @@ class CategoryController extends Controller
* @param Carbon $date
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws \JsonException
* @throws FireflyException
* @throws JsonException
*/
public function specificPeriod(Category $category, Carbon $date): JsonResponse
{

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

@@ -318,7 +318,7 @@ class CategoryReportController extends Controller
}
/**
* See reference nr. 57
* See reference nr. 57
*
* @param Carbon $start
* @param Carbon $end

4
app/Http/Controllers/Chart/DoubleReportController.php
View File

@@ -249,7 +249,7 @@ class DoubleReportController extends Controller
}
/**
* See reference nr. 51
* See reference nr. 51
*
* @param Collection $accounts
* @param int $id
@@ -274,7 +274,7 @@ class DoubleReportController extends Controller
}
/**
* See reference nr. 52
* See reference nr. 52
*
* @param Carbon $start
* @param Carbon $end

7
app/Http/Controllers/Chart/ExpenseReportController.php
View File

@@ -33,6 +33,7 @@ use FireflyIII\Support\Http\Controllers\AugumentData;
use FireflyIII\Support\Http\Controllers\TransactionCalculation;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Collection;
use JsonException;
/**
* Separate controller because many helper functions are shared.
@@ -77,7 +78,7 @@ class ExpenseReportController extends Controller
* @param Carbon $end
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function mainChart(Collection $accounts, Collection $expense, Carbon $start, Carbon $end): JsonResponse
{
@@ -88,7 +89,7 @@ class ExpenseReportController extends Controller
$cache->addProperty($start);
$cache->addProperty($end);
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
$format = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
@@ -188,7 +189,7 @@ class ExpenseReportController extends Controller
}
}
if (empty($newSet)) {
$newSet = $chartData;
$newSet = $chartData;
}
$data = $this->generator->multiSet($newSet);
$cache->store($data);

5
app/Http/Controllers/Chart/PiggyBankController.php
View File

@@ -31,6 +31,7 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use FireflyIII\Support\Http\Controllers\DateCalculation;
use Illuminate\Http\JsonResponse;
use JsonException;
/**
* Class PiggyBankController.
@@ -63,7 +64,7 @@ class PiggyBankController extends Controller
* @param PiggyBank $piggyBank
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function history(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank): JsonResponse
{
@@ -72,7 +73,7 @@ class PiggyBankController extends Controller
$cache->addProperty('chart.piggy-bank.history');
$cache->addProperty($piggyBank->id);
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
$set = $repository->getEvents($piggyBank);
$set = $set->reverse();

11
app/Http/Controllers/Chart/ReportController.php
View File

@@ -35,6 +35,7 @@ use FireflyIII\Support\Http\Controllers\BasicDataSupport;
use FireflyIII\Support\Http\Controllers\ChartGeneration;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Collection;
use JsonException;
use Log;
/**
@@ -68,7 +69,7 @@ class ReportController extends Controller
* @param Carbon $end
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function netWorth(Collection $accounts, Carbon $start, Carbon $end): JsonResponse
{
@@ -79,7 +80,7 @@ class ReportController extends Controller
$cache->addProperty(implode(',', $accounts->pluck('id')->toArray()));
$cache->addProperty($end);
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
$locale = app('steam')->getLocale();
$current = clone $start;
@@ -103,7 +104,7 @@ class ReportController extends Controller
}
);
// See reference nr. 56
// See reference nr. 56
while ($current < $end) {
// get balances by date, grouped by currency.
@@ -143,7 +144,7 @@ class ReportController extends Controller
* @param Carbon $end
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function operations(Collection $accounts, Carbon $start, Carbon $end): JsonResponse
{
@@ -154,7 +155,7 @@ class ReportController extends Controller
$cache->addProperty($accounts);
$cache->addProperty($end);
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
Log::debug('Going to do operations for accounts ', $accounts->pluck('id')->toArray());
$format = app('navigation')->preferredCarbonFormat($start, $end);

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

@@ -323,7 +323,7 @@ class TagReportController extends Controller
}
/**
* See reference nr. 54
* See reference nr. 54
*
* @param Carbon $start
* @param Carbon $end

17
app/Http/Controllers/Chart/TransactionController.php
View File

@@ -32,6 +32,7 @@ use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\TransactionType;
use FireflyIII\Support\CacheProperties;
use Illuminate\Http\JsonResponse;
use JsonException;
/**
* Class TransactionController
@@ -56,7 +57,7 @@ class TransactionController extends Controller
* @param Carbon $end
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function budgets(Carbon $start, Carbon $end)
{
@@ -65,7 +66,7 @@ class TransactionController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.transactions.budgets');
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
@@ -101,7 +102,7 @@ class TransactionController extends Controller
*
* @return JsonResponse
* @throws FireflyException
* @throws \JsonException
* @throws JsonException
*/
public function categories(string $objectType, Carbon $start, Carbon $end)
{
@@ -111,7 +112,7 @@ class TransactionController extends Controller
$cache->addProperty($objectType);
$cache->addProperty('chart.transactions.categories');
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
@@ -160,7 +161,7 @@ class TransactionController extends Controller
*
* @return JsonResponse
* @throws FireflyException
* @throws \JsonException
* @throws JsonException
*/
public function destinationAccounts(string $objectType, Carbon $start, Carbon $end)
{
@@ -170,7 +171,7 @@ class TransactionController extends Controller
$cache->addProperty($objectType);
$cache->addProperty('chart.transactions.destinations');
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
@@ -218,7 +219,7 @@ class TransactionController extends Controller
*
* @return JsonResponse
* @throws FireflyException
* @throws \JsonException
* @throws JsonException
*/
public function sourceAccounts(string $objectType, Carbon $start, Carbon $end)
{
@@ -228,7 +229,7 @@ class TransactionController extends Controller
$cache->addProperty($objectType);
$cache->addProperty('chart.transactions.sources');
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);

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

@@ -143,7 +143,7 @@ class DebugController extends Controller
$loginProvider = config('auth.providers.users.driver');
$bcscale = bcscale();
$layout = env('FIREFLY_III_LAYOUT');
$tz = env('TZ');
$tz = env('TZ');
// expected + found DB version:
$expectedDBversion = config('firefly.db_version');

4
app/Http/Controllers/Export/IndexController.php
View File

@@ -32,8 +32,6 @@ use FireflyIII\Support\Export\ExportDataGenerator;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\Response as LaravelResponse;
use Illuminate\View\View;
use League\Csv\CannotInsertRecord;
use League\Csv\Exception;
/**
* Class IndexController
@@ -87,7 +85,7 @@ class IndexController extends Controller
$generator->setStart($firstDate);
$result = $generator->export();
$name = sprintf('%s_transaction_export.csv', date('Y_m_d'));
$name = sprintf('%s_transaction_export.csv', date('Y_m_d'));
$quoted = sprintf('"%s"', addcslashes($name, '"\\'));
// headers for CSV file.
/** @var LaravelResponse $response */

3
app/Http/Controllers/HelpController.php
View File

@@ -22,6 +22,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers;
use FireflyIII\Exceptions\FireflyException;
use Illuminate\Http\JsonResponse;
/**
@@ -35,7 +36,7 @@ class HelpController extends Controller
* @param string $route
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
public function show(string $route): JsonResponse
{

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

@@ -23,6 +23,7 @@ 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;
@@ -46,7 +47,7 @@ class JavascriptController extends Controller
* @param CurrencyRepositoryInterface $currencyRepository
*
* @return Response
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
public function accounts(AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository): Response
{
@@ -55,14 +56,14 @@ class JavascriptController extends Controller
);
$preference = app('preferences')->get('currencyPreference', config('firefly.default_currency', 'EUR'));
/** @noinspection NullPointerExceptionInspection */
$default = $currencyRepository->findByCodeNull((string) $preference->data);
$default = $currencyRepository->findByCodeNull((string)$preference->data);
$data = ['accounts' => []];
/** @var Account $account */
foreach ($accounts as $account) {
$accountId = $account->id;
$currency = (int) $repository->getMetaValue($account, 'currency_id');
$currency = (int)$repository->getMetaValue($account, 'currency_id');
/** @noinspection NullPointerExceptionInspection */
$currency = 0 === $currency ? $default->id : $currency;
$entry = ['preferredCurrency' => $currency, 'name' => $account->name];
@@ -97,6 +98,49 @@ class JavascriptController extends Controller
->header('Content-Type', 'text/javascript');
}
/**
* Show some common variables to be used in scripts.
*
* @param Request $request
* @param AccountRepositoryInterface $repository
* @param CurrencyRepositoryInterface $currencyRepository
*
* @return Response
* @throws FireflyException
*/
public function variables(Request $request, AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository): Response
{
$account = $repository->find((int)$request->get('account'));
$currency = app('amount')->getDefaultCurrency();
if (null !== $account) {
$currency = $repository->getAccountCurrency($account) ?? $currency;
}
$locale = app('steam')->getLocale();
$accounting = app('amount')->getJsConfig();
$accounting['frac_digits'] = $currency->decimal_places;
$pref = app('preferences')->get('language', config('firefly.default_language', 'en_US'));
/** @noinspection NullPointerExceptionInspection */
$lang = $pref->data;
$dateRange = $this->getDateRangeConfig();
$uid = substr(hash('sha256', sprintf('%s-%s-%s', (string)config('app.key'), auth()->user()->id, auth()->user()->email)), 0, 12);
$data = [
'currencyCode' => $currency->code,
'currencySymbol' => $currency->symbol,
'accountingLocaleInfo' => $accounting,
'language' => $lang,
'dateRangeTitle' => $dateRange['title'],
'locale' => $locale,
'dateRangeConfig' => $dateRange['configuration'],
'uid' => $uid,
];
$request->session()->keep(['two-factor-secret']);
return response()
->view('v1.javascript.variables', $data)
->header('Content-Type', 'text/javascript');
}
/**
* Bit of a hack but OK.
*
@@ -121,47 +165,4 @@ class JavascriptController extends Controller
->header('Content-Type', 'text/javascript');
}
/**
* Show some common variables to be used in scripts.
*
* @param Request $request
* @param AccountRepositoryInterface $repository
* @param CurrencyRepositoryInterface $currencyRepository
*
* @return Response
* @throws \FireflyIII\Exceptions\FireflyException
*/
public function variables(Request $request, AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository): Response
{
$account = $repository->find((int) $request->get('account'));
$currency = app('amount')->getDefaultCurrency();
if(null !== $account) {
$currency = $repository->getAccountCurrency($account) ?? $currency;
}
$locale = app('steam')->getLocale();
$accounting = app('amount')->getJsConfig();
$accounting['frac_digits'] = $currency->decimal_places;
$pref = app('preferences')->get('language', config('firefly.default_language', 'en_US'));
/** @noinspection NullPointerExceptionInspection */
$lang = $pref->data;
$dateRange = $this->getDateRangeConfig();
$uid = substr(hash('sha256', sprintf('%s-%s-%s', (string) config('app.key'), auth()->user()->id, auth()->user()->email)), 0, 12);
$data = [
'currencyCode' => $currency->code,
'currencySymbol' => $currency->symbol,
'accountingLocaleInfo' => $accounting,
'language' => $lang,
'dateRangeTitle' => $dateRange['title'],
'locale' => $locale,
'dateRangeConfig' => $dateRange['configuration'],
'uid' => $uid,
];
$request->session()->keep(['two-factor-secret']);
return response()
->view('v1.javascript.variables', $data)
->header('Content-Type', 'text/javascript');
}
}

9
app/Http/Controllers/Json/BoxController.php
View File

@@ -37,6 +37,7 @@ use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Http\JsonResponse;
use JsonException;
use Log;
/**
@@ -51,7 +52,7 @@ class BoxController extends Controller
* 2) if the user has no available amount set this period: spent per day
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function available(): JsonResponse
{
@@ -73,7 +74,7 @@ class BoxController extends Controller
$cache->addProperty($today);
$cache->addProperty('box-available');
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
$leftPerDayAmount = '0';
$leftToSpendAmount = '0';
@@ -130,7 +131,7 @@ class BoxController extends Controller
* @param CurrencyRepositoryInterface $repository
*
* @return JsonResponse
* @throws \JsonException
* @throws JsonException
*/
public function balance(CurrencyRepositoryInterface $repository): JsonResponse
{
@@ -144,7 +145,7 @@ class BoxController extends Controller
$cache->addProperty($end);
$cache->addProperty('box-balance');
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
// prep some arrays:
$incomes = [];

5
app/Http/Controllers/Json/IntroController.php
View File

@@ -22,6 +22,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Json;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Support\Http\Controllers\GetConfigurationData;
use Illuminate\Http\JsonResponse;
@@ -103,7 +104,7 @@ class IntroController extends Controller
* @param string|null $specialPage
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
public function postEnable(string $route, string $specialPage = null): JsonResponse
{
@@ -127,7 +128,7 @@ class IntroController extends Controller
* @param string|null $specialPage
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
public function postFinished(string $route, string $specialPage = null): JsonResponse
{

7
app/Http/Controllers/Json/ReconcileController.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Json;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Account;
@@ -35,6 +36,7 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use JsonException;
use Log;
use Throwable;
@@ -215,8 +217,8 @@ class ReconcileController extends Controller
* @param Carbon $end
*
* @return JsonResponse
* @throws \FireflyIII\Exceptions\FireflyException
* @throws \JsonException
* @throws FireflyException
* @throws JsonException
*/
public function transactions(Account $account, Carbon $start, Carbon $end)
{
@@ -256,6 +258,7 @@ class ReconcileController extends Controller
Log::debug(sprintf('Could not render: %s', $e->getMessage()));
$html = sprintf('Could not render accounts.reconcile.transactions: %s', $e->getMessage());
}
return response()->json(['html' => $html, 'startBalance' => $startBalance, 'endBalance' => $endBalance]);
}

1
app/Http/Controllers/Json/RuleController.php
View File

@@ -56,6 +56,7 @@ class RuleController extends Controller
Log::error(sprintf('Cannot render rules.partials.action: %s', $e->getMessage()));
$view = 'Could not render view.';
}
return response()->json(['html' => $view]);
}

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

@@ -22,6 +22,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Requests\NewUserFormRequest;
use FireflyIII\Models\AccountType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -38,6 +39,7 @@ use Illuminate\View\View;
class NewUserController extends Controller
{
use CreateStuff;
/** @var AccountRepositoryInterface The account repository */
private $repository;
@@ -64,7 +66,7 @@ class NewUserController extends Controller
*/
public function index()
{
app('view')->share('title', (string) trans('firefly.welcome'));
app('view')->share('title', (string)trans('firefly.welcome'));
app('view')->share('mainTitleIcon', 'fa-fire');
$types = config('firefly.accountTypesByIdentifier.asset');
@@ -82,11 +84,11 @@ class NewUserController extends Controller
/**
* Store his new settings.
*
* @param NewUserFormRequest $request
* @param NewUserFormRequest $request
* @param CurrencyRepositoryInterface $currencyRepository
*
* @return RedirectResponse|Redirector
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
public function submit(NewUserFormRequest $request, CurrencyRepositoryInterface $currencyRepository)
{
@@ -99,7 +101,7 @@ class NewUserController extends Controller
// set language preference:
app('preferences')->set('language', $language);
// Store currency preference from input:
$currency = $currencyRepository->find((int) $request->input('amount_currency_id_bank_balance'));
$currency = $currencyRepository->find((int)$request->input('amount_currency_id_bank_balance'));
// if is null, set to EUR:
if (null === $currency) {
@@ -126,7 +128,7 @@ class NewUserController extends Controller
'invoice_date' => false, 'internal_reference' => false, 'notes' => true, 'attachments' => true,];
app('preferences')->set('transaction_journal_optional_fields', $visibleFields);
session()->flash('success', (string) trans('firefly.stored_new_accounts_new_user'));
session()->flash('success', (string)trans('firefly.stored_new_accounts_new_user'));
app('preferences')->mark();
return redirect(route('index'));

3
app/Http/Controllers/ObjectGroup/DeleteController.php
View File

@@ -68,7 +68,7 @@ class DeleteController extends Controller
*/
public function delete(ObjectGroup $objectGroup)
{
$subTitle = (string)trans('firefly.delete_object_group', ['title' => $objectGroup->title]);
$subTitle = (string)trans('firefly.delete_object_group', ['title' => $objectGroup->title]);
$piggyBanks = $objectGroup->piggyBanks()->count();
// put previous url in session
@@ -81,6 +81,7 @@ class DeleteController extends Controller
* Destroy the piggy bank.
*
* @param ObjectGroup $objectGroup
*
* @return RedirectResponse
*/
public function destroy(ObjectGroup $objectGroup): RedirectResponse

3
app/Http/Controllers/ObjectGroup/IndexController.php
View File

@@ -28,6 +28,7 @@ use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\ObjectGroup;
use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Log;
@@ -61,7 +62,7 @@ class IndexController extends Controller
}
/**
* @return Factory|\Illuminate\Contracts\View\View
* @return Factory|View
*/
public function index()
{

2
app/Http/Controllers/PiggyBank/CreateController.php
View File

@@ -113,7 +113,7 @@ class CreateController extends Controller
}
if (count($this->attachments->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
}
$redirect = redirect($this->getPreviousUri('piggy-banks.create.uri'));

2
app/Http/Controllers/PiggyBank/EditController.php
View File

@@ -128,7 +128,7 @@ class EditController extends Controller
}
if (count($this->attachments->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
}
$redirect = redirect($this->getPreviousUri('piggy-banks.edit.uri'));

2
app/Http/Controllers/PiggyBank/IndexController.php
View File

@@ -69,7 +69,7 @@ class IndexController extends Controller
/**
* Show overview of all piggy banks.
* See reference nr. 66
* See reference nr. 66
*
* @param Request $request
*

11
app/Http/Controllers/PreferencesController.php
View File

@@ -22,6 +22,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\Preference;
@@ -64,7 +65,7 @@ class PreferencesController extends Controller
* @param AccountRepositoryInterface $repository
*
* @return Factory|View
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
public function index(AccountRepositoryInterface $repository)
{
@@ -145,7 +146,7 @@ class PreferencesController extends Controller
* @param Request $request
*
* @return RedirectResponse|Redirector
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
public function postIndex(Request $request)
{
@@ -167,9 +168,9 @@ class PreferencesController extends Controller
// custom fiscal year
$customFiscalYear = 1 === (int)$request->get('customFiscalYear');
$string = strtotime((string)$request->get('fiscalYearStart'));
if(false !== $string) {
$fiscalYearStart = date('m-d', $string);
$string = strtotime((string)$request->get('fiscalYearStart'));
if (false !== $string) {
$fiscalYearStart = date('m-d', $string);
app('preferences')->set('customFiscalYear', $customFiscalYear);
app('preferences')->set('fiscalYearStart', $fiscalYearStart);
}

171
app/Http/Controllers/ProfileController.php
View File

@@ -93,49 +93,6 @@ class ProfileController extends Controller
$this->middleware(IsDemoUser::class)->except(['index']);
}
/**
*
*/
public function logoutOtherSessions()
{
if (!$this->internalAuth) {
session()->flash('info', (string)trans('firefly.external_auth_disabled'));
return redirect(route('profile.index'));
}
return prefixView('profile.logout-other-sessions');
}
/**
* @param Request $request
*
* @return Application|RedirectResponse|Redirector
* @throws AuthenticationException
*/
public function postLogoutOtherSessions(Request $request)
{
if (!$this->internalAuth) {
session()->flash('info', (string)trans('firefly.external_auth_disabled'));
return redirect(route('profile.index'));
}
$creds = [
'email' => auth()->user()->email,
'password' => $request->get('password'),
];
if (Auth::once($creds)) {
Auth::logoutOtherDevices($request->get('password'));
session()->flash('info', (string)trans('firefly.other_sessions_logged_out'));
return redirect(route('profile.index'));
}
session()->flash('error', (string)trans('auth.failed'));
return redirect(route('profile.index'));
}
/**
* Change your email address.
*
@@ -388,6 +345,20 @@ class ProfileController extends Controller
);
}
/**
*
*/
public function logoutOtherSessions()
{
if (!$this->internalAuth) {
session()->flash('info', (string)trans('firefly.external_auth_disabled'));
return redirect(route('profile.index'));
}
return prefixView('profile.logout-other-sessions');
}
/**
* @param Request $request
*
@@ -548,6 +519,49 @@ class ProfileController extends Controller
return redirect(route('profile.index'));
}
/**
* See reference nr. 64
*
* @param string $mfaCode
*
* @throws FireflyException
*/
private function addToMFAHistory(string $mfaCode): void
{
/** @var array $mfaHistory */
$mfaHistory = app('preferences')->get('mfa_history', [])->data;
$entry = [
'time' => time(),
'code' => $mfaCode,
];
$mfaHistory[] = $entry;
app('preferences')->set('mfa_history', $mfaHistory);
$this->filterMFAHistory();
}
/**
* Remove old entries from the preferences array.
*/
private function filterMFAHistory(): void
{
/** @var array $mfaHistory */
$mfaHistory = app('preferences')->get('mfa_history', [])->data;
$newHistory = [];
$now = time();
foreach ($mfaHistory as $entry) {
$time = $entry['time'];
$code = $entry['code'];
if ($now - $time <= 300) {
$newHistory[] = [
'time' => $time,
'code' => $code,
];
}
}
app('preferences')->set('mfa_history', $newHistory);
}
/**
* Submit delete account.
*
@@ -580,6 +594,35 @@ class ProfileController extends Controller
return redirect(route('index'));
}
/**
* @param Request $request
*
* @return Application|RedirectResponse|Redirector
* @throws AuthenticationException
*/
public function postLogoutOtherSessions(Request $request)
{
if (!$this->internalAuth) {
session()->flash('info', (string)trans('firefly.external_auth_disabled'));
return redirect(route('profile.index'));
}
$creds = [
'email' => auth()->user()->email,
'password' => $request->get('password'),
];
if (Auth::once($creds)) {
Auth::logoutOtherDevices($request->get('password'));
session()->flash('info', (string)trans('firefly.other_sessions_logged_out'));
return redirect(route('profile.index'));
}
session()->flash('error', (string)trans('auth.failed'));
return redirect(route('profile.index'));
}
/**
* Regenerate access token.
*
@@ -659,46 +702,4 @@ class ProfileController extends Controller
return redirect(route('login'));
}
/**
* See reference nr. 64
*
* @param string $mfaCode
* @throws FireflyException
*/
private function addToMFAHistory(string $mfaCode): void
{
/** @var array $mfaHistory */
$mfaHistory = app('preferences')->get('mfa_history', [])->data;
$entry = [
'time' => time(),
'code' => $mfaCode,
];
$mfaHistory[] = $entry;
app('preferences')->set('mfa_history', $mfaHistory);
$this->filterMFAHistory();
}
/**
* Remove old entries from the preferences array.
*/
private function filterMFAHistory(): void
{
/** @var array $mfaHistory */
$mfaHistory = app('preferences')->get('mfa_history', [])->data;
$newHistory = [];
$now = time();
foreach ($mfaHistory as $entry) {
$time = $entry['time'];
$code = $entry['code'];
if ($now - $time <= 300) {
$newHistory[] = [
'time' => $time,
'code' => $code,
];
}
}
app('preferences')->set('mfa_history', $newHistory);
}
}

2
app/Http/Controllers/Recurring/CreateController.php
View File

@@ -46,9 +46,9 @@ use Illuminate\View\View;
class CreateController extends Controller
{
private AttachmentHelperInterface $attachments;
private BillRepositoryInterface $billRepository;
private BudgetRepositoryInterface $budgetRepos;
private RecurringRepositoryInterface $recurring;
private BillRepositoryInterface $billRepository;
/**
* CreateController constructor.

2
app/Http/Controllers/Recurring/EditController.php
View File

@@ -47,9 +47,9 @@ use Symfony\Component\HttpFoundation\ParameterBag;
class EditController extends Controller
{
private AttachmentHelperInterface $attachments;
private BillRepositoryInterface $billRepository;
private BudgetRepositoryInterface $budgetRepos;
private RecurringRepositoryInterface $recurring;
private BillRepositoryInterface $billRepository;
/**
* EditController constructor.

4
app/Http/Controllers/Recurring/IndexController.php
View File

@@ -68,7 +68,7 @@ class IndexController extends Controller
}
/**
* See reference nr. 70
* See reference nr. 70
* Show all recurring transactions.
*
* @param Request $request
@@ -121,7 +121,7 @@ class IndexController extends Controller
}
$paginator = new LengthAwarePaginator($recurring, $total, $pageSize, $page);
$paginator->setPath(route('recurring.index'));
$today = today(config('app.timezone'));
$today = today(config('app.timezone'));
$this->verifyRecurringCronJob();

5
app/Http/Controllers/Report/AccountController.php
View File

@@ -27,6 +27,7 @@ use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Repositories\Account\AccountTaskerInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use JsonException;
use Log;
use Throwable;
@@ -44,7 +45,7 @@ class AccountController extends Controller
* @param Carbon $end
*
* @return mixed|string
* @throws \JsonException
* @throws JsonException
*/
public function general(Collection $accounts, Carbon $start, Carbon $end)
{
@@ -55,7 +56,7 @@ class AccountController extends Controller
$cache->addProperty('account-report');
$cache->addProperty($accounts->pluck('id')->toArray());
if ($cache->has()) {
return $cache->get();
return $cache->get();
}
/** @var AccountTaskerInterface $accountTasker */

2
app/Http/Controllers/Report/BillController.php
View File

@@ -53,7 +53,7 @@ class BillController extends Controller
$cache->addProperty('bill-report');
$cache->addProperty($accounts->pluck('id')->toArray());
if ($cache->has()) {
return $cache->get();
return $cache->get();
}
/** @var ReportHelperInterface $helper */
$helper = app(ReportHelperInterface::class);

5
app/Http/Controllers/Report/BudgetController.php
View File

@@ -36,6 +36,7 @@ use FireflyIII\Support\Report\Budget\BudgetReportGenerator;
use Illuminate\Contracts\View\Factory;
use Illuminate\Support\Collection;
use Illuminate\View\View;
use JsonException;
use Log;
use Throwable;
@@ -307,7 +308,7 @@ class BudgetController extends Controller
* @param Carbon $end
*
* @return mixed|string
* @throws \JsonException
* @throws JsonException
*/
public function period(Collection $accounts, Carbon $start, Carbon $end)
{
@@ -317,7 +318,7 @@ class BudgetController extends Controller
$cache->addProperty('budget-period-report');
$cache->addProperty($accounts->pluck('id')->toArray());
if ($cache->has()) {
return $cache->get();
return $cache->get();
}
$periods = app('navigation')->listOfPeriods($start, $end);

14
app/Http/Controllers/Report/CategoryController.php
View File

@@ -34,6 +34,7 @@ use FireflyIII\Support\Report\Category\CategoryReportGenerator;
use Illuminate\Contracts\View\Factory;
use Illuminate\Support\Collection;
use Illuminate\View\View;
use JsonException;
use Log;
use Throwable;
@@ -488,7 +489,7 @@ class CategoryController extends Controller
* @param Carbon $end
*
* @return mixed|string
* @throws \JsonException
* @throws JsonException
*/
public function expenses(Collection $accounts, Carbon $start, Carbon $end)
{
@@ -498,7 +499,7 @@ class CategoryController extends Controller
$cache->addProperty('category-period-expenses-report');
$cache->addProperty($accounts->pluck('id')->toArray());
if ($cache->has()) {
return $cache->get();
return $cache->get();
}
// depending on the carbon format (a reliable way to determine the general date difference)
@@ -569,7 +570,7 @@ class CategoryController extends Controller
* @param Carbon $end
*
* @return string
* @throws \JsonException
* @throws JsonException
*/
public function income(Collection $accounts, Carbon $start, Carbon $end): string
{
@@ -579,7 +580,7 @@ class CategoryController extends Controller
$cache->addProperty('category-period-income-report');
$cache->addProperty($accounts->pluck('id')->toArray());
if ($cache->has()) {
return $cache->get();
return $cache->get();
}
// depending on the carbon format (a reliable way to determine the general date difference)
@@ -648,7 +649,7 @@ class CategoryController extends Controller
* @param Carbon $end
*
* @return mixed|string
* @throws \JsonException
* @throws JsonException
*/
public function operations(Collection $accounts, Carbon $start, Carbon $end)
{
@@ -659,7 +660,7 @@ class CategoryController extends Controller
$cache->addProperty('category-report');
$cache->addProperty($accounts->pluck('id')->toArray());
if ($cache->has()) {
return $cache->get();
return $cache->get();
}
/** @var CategoryReportGenerator $generator */
@@ -678,6 +679,7 @@ class CategoryController extends Controller
Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage()));
$result = sprintf('An error prevented Firefly III from rendering: %s. Apologies.', $e->getMessage());
}
return $result;
}

2
app/Http/Controllers/Report/DoubleController.php
View File

@@ -292,7 +292,7 @@ class DoubleController extends Controller
}
/**
* See reference nr. 67
* See reference nr. 67
*
* @param Collection $accounts
* @param int $id

13
app/Http/Controllers/Report/OperationsController.php
View File

@@ -27,6 +27,7 @@ use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Repositories\Account\AccountTaskerInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use JsonException;
use Log;
use Throwable;
@@ -66,7 +67,7 @@ class OperationsController extends Controller
* @param Carbon $end
*
* @return mixed|string
* @throws \JsonException
* @throws JsonException
*/
public function expenses(Collection $accounts, Carbon $start, Carbon $end)
{
@@ -77,7 +78,7 @@ class OperationsController extends Controller
$cache->addProperty('expense-report');
$cache->addProperty($accounts->pluck('id')->toArray());
if ($cache->has()) {
return $cache->get();
return $cache->get();
}
$report = $this->tasker->getExpenseReport($start, $end, $accounts);
$type = 'expense-entry';
@@ -102,7 +103,7 @@ class OperationsController extends Controller
* @param Carbon $end
*
* @return string
* @throws \JsonException
* @throws JsonException
*/
public function income(Collection $accounts, Carbon $start, Carbon $end): string
{
@@ -113,7 +114,7 @@ class OperationsController extends Controller
$cache->addProperty('income-report');
$cache->addProperty($accounts->pluck('id')->toArray());
if ($cache->has()) {
return $cache->get();
return $cache->get();
}
$report = $this->tasker->getIncomeReport($start, $end, $accounts);
$type = 'income-entry';
@@ -138,7 +139,7 @@ class OperationsController extends Controller
* @param Carbon $end
*
* @return mixed|string
* @throws \JsonException
* @throws JsonException
*/
public function operations(Collection $accounts, Carbon $start, Carbon $end)
{
@@ -149,7 +150,7 @@ class OperationsController extends Controller
$cache->addProperty('inc-exp-report');
$cache->addProperty($accounts->pluck('id')->toArray());
if ($cache->has()) {
return $cache->get();
return $cache->get();
}
$incomes = $this->tasker->getIncomeReport($start, $end, $accounts);

8
app/Http/Controllers/ReportController.php
View File

@@ -89,7 +89,7 @@ class ReportController extends Controller
public function auditReport(Collection $accounts, Carbon $start, Carbon $end)
{
if ($end < $start) {
return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
}
$this->repository->cleanupBudgets();
@@ -125,7 +125,7 @@ class ReportController extends Controller
public function budgetReport(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end)
{
if ($end < $start) {
return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
}
$this->repository->cleanupBudgets();
@@ -162,7 +162,7 @@ class ReportController extends Controller
public function categoryReport(Collection $accounts, Collection $categories, Carbon $start, Carbon $end)
{
if ($end < $start) {
return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
}
$this->repository->cleanupBudgets();
@@ -400,7 +400,7 @@ class ReportController extends Controller
public function tagReport(Collection $accounts, Collection $tags, Carbon $start, Carbon $end)
{
if ($end < $start) {
return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
}
$this->repository->cleanupBudgets();

4
app/Http/Controllers/Rule/CreateController.php
View File

@@ -265,12 +265,12 @@ class CreateController extends Controller
// redirect to show bill.
if ('true' === $request->get('return_to_bill') && (int)$request->get('bill_id') > 0) {
return redirect(route('bills.show', [(int)$request->get('bill_id')]));
return redirect(route('bills.show', [(int)$request->get('bill_id')]));
}
// redirect to new bill creation.
if ((int)$request->get('bill_id') > 0) {
return redirect($this->getPreviousUri('bills.create.uri'));
return redirect($this->getPreviousUri('bills.create.uri'));
}
$redirect = redirect($this->getPreviousUri('rules.create.uri'));

2
app/Http/Controllers/Rule/EditController.php
View File

@@ -143,7 +143,7 @@ class EditController extends Controller
*/
private function parseFromOperators(array $submittedOperators): array
{
// See reference nr. 65
// See reference nr. 65
$operators = config('firefly.search.operators');
$renderedEntries = [];
$triggers = [];

4
app/Http/Controllers/Rule/IndexController.php
View File

@@ -79,8 +79,8 @@ class IndexController extends Controller
}
/**
* @param Request $request
* @param Rule $rule
* @param Request $request
* @param Rule $rule
* @param RuleGroup $ruleGroup
*
* @return JsonResponse

10
app/Http/Controllers/Rule/SelectController.php
View File

@@ -145,7 +145,7 @@ class SelectController extends Controller
// warn if nothing.
if (empty($textTriggers)) {
return response()->json(['html' => '', 'warning' => (string)trans('firefly.warning_no_valid_triggers')]);
return response()->json(['html' => '', 'warning' => (string)trans('firefly.warning_no_valid_triggers')]);
}
foreach ($textTriggers as $textTrigger) {
@@ -169,7 +169,7 @@ class SelectController extends Controller
// Warn the user if only a subset of transactions is returned
$warning = '';
if (empty($collection)) {
$warning = (string)trans('firefly.warning_no_matching_transactions');
$warning = (string)trans('firefly.warning_no_matching_transactions');
}
// Return json response
@@ -182,6 +182,7 @@ class SelectController extends Controller
Log::error($exception->getTraceAsString());
$view = sprintf('Could not render list.journals-tiny: %s', $exception->getMessage());
}
return response()->json(['html' => $view, 'warning' => $warning]);
}
@@ -199,7 +200,7 @@ class SelectController extends Controller
$triggers = $rule->ruleTriggers;
if (empty($triggers)) {
return response()->json(['html' => '', 'warning' => (string)trans('firefly.warning_no_valid_triggers')]);
return response()->json(['html' => '', 'warning' => (string)trans('firefly.warning_no_valid_triggers')]);
}
// create new rule engine:
$newRuleEngine = app(RuleEngineInterface::class);
@@ -211,7 +212,7 @@ class SelectController extends Controller
$warning = '';
if (empty($collection)) {
$warning = (string)trans('firefly.warning_no_matching_transactions');
$warning = (string)trans('firefly.warning_no_matching_transactions');
}
// Return json response
@@ -223,6 +224,7 @@ class SelectController extends Controller
Log::error(sprintf('Could not render view in testTriggersByRule(): %s', $exception->getMessage()));
Log::error($exception->getTraceAsString());
}
return response()->json(['html' => $view, 'warning' => $warning]);
}
}

2
app/Http/Controllers/RuleGroup/CreateController.php
View File

@@ -88,7 +88,7 @@ class CreateController extends Controller
*/
public function store(RuleGroupFormRequest $request)
{
$data = $request->getRuleGroupData();
$data = $request->getRuleGroupData();
$ruleGroup = $this->repository->store($data);
session()->flash('success', (string)trans('firefly.created_new_rule_group', ['title' => $ruleGroup->title]));

2
app/Http/Controllers/RuleGroup/DeleteController.php
View File

@@ -81,7 +81,7 @@ class DeleteController extends Controller
/**
* Actually destroy the rule group.
*
* @param Request $request
* @param Request $request
* @param RuleGroup $ruleGroup
*
* @return RedirectResponse|Redirector

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

@@ -327,7 +327,7 @@ class TagController extends Controller
}
if (count($this->attachmentsHelper->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachmentsHelper->getMessages()->get('attachments'));
$request->session()->flash('info', $this->attachmentsHelper->getMessages()->get('attachments'));
}
$redirect = redirect($this->getPreviousUri('tags.create.uri'));
if (1 === (int)$request->get('create_another')) {
@@ -368,7 +368,7 @@ class TagController extends Controller
}
if (count($this->attachmentsHelper->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachmentsHelper->getMessages()->get('attachments'));
$request->session()->flash('info', $this->attachmentsHelper->getMessages()->get('attachments'));
}
$redirect = redirect($this->getPreviousUri('tags.edit.uri'));
if (1 === (int)$request->get('return_to_edit')) {

10
app/Http/Controllers/Transaction/BulkController.php
View File

@@ -66,7 +66,7 @@ class BulkController extends Controller
/**
* Edit a set of journals in bulk.
*
* See reference nr. 47
* See reference nr. 47
*
* @param array $journals
*
@@ -97,11 +97,11 @@ class BulkController extends Controller
*/
public function update(BulkEditJournalRequest $request)
{
$journalIds = $request->get('journals');
$journalIds = is_array($journalIds) ? $journalIds : [];
$journalIds = $request->get('journals');
$journalIds = is_array($journalIds) ? $journalIds : [];
$ignoreCategory = 1 === (int)$request->get('ignore_category');
$ignoreBudget = 1 === (int)$request->get('ignore_budget');
$tagsAction = $request->get('tags_action');
$ignoreBudget = 1 === (int)$request->get('ignore_budget');
$tagsAction = $request->get('tags_action');
$count = 0;

22
app/Http/Controllers/Transaction/ConvertController.php
View File

@@ -47,7 +47,7 @@ use Log;
/**
* Class ConvertController.
*
* See reference nr. 49
* See reference nr. 49
*/
class ConvertController extends Controller
{
@@ -91,7 +91,7 @@ class ConvertController extends Controller
public function index(TransactionType $destinationType, TransactionGroup $group)
{
if (!$this->isEditableGroup($group)) {
return $this->redirectGroupToAccount($group);
return $this->redirectGroupToAccount($group);
}
/** @var TransactionGroupTransformer $transformer */
@@ -159,12 +159,12 @@ class ConvertController extends Controller
$role = (string)$this->accountRepository->getMetaValue($account, 'account_role');
$name = $account->name;
if ('' === $role) {
$role = 'no_account_type';
$role = 'no_account_type';
}
// maybe it's a liability thing:
if (in_array($account->accountType->type, $liabilityTypes, true)) {
$role = 'l_' . $account->accountType->type;
$role = 'l_' . $account->accountType->type;
}
if (AccountType::CASH === $account->accountType->type) {
@@ -173,7 +173,7 @@ class ConvertController extends Controller
}
if (AccountType::REVENUE === $account->accountType->type) {
$role = 'revenue_account';
$role = 'revenue_account';
}
$key = (string)trans('firefly.opt_group_' . $role);
@@ -200,12 +200,12 @@ class ConvertController extends Controller
$role = (string)$this->accountRepository->getMetaValue($account, 'account_role');
$name = $account->name;
if ('' === $role) {
$role = 'no_account_type';
$role = 'no_account_type';
}
// maybe it's a liability thing:
if (in_array($account->accountType->type, $liabilityTypes, true)) {
$role = 'l_' . $account->accountType->type;
$role = 'l_' . $account->accountType->type;
}
if (AccountType::CASH === $account->accountType->type) {
@@ -214,7 +214,7 @@ class ConvertController extends Controller
}
if (AccountType::EXPENSE === $account->accountType->type) {
$role = 'expense_account';
$role = 'expense_account';
}
$key = (string)trans('firefly.opt_group_' . $role);
@@ -264,7 +264,7 @@ class ConvertController extends Controller
$currency = $this->accountRepository->getAccountCurrency($account) ?? $defaultCurrency;
$role = (string)$this->accountRepository->getMetaValue($account, 'account_role');
if ('' === $role) {
$role = 'no_account_type';
$role = 'no_account_type';
}
$key = (string)trans('firefly.opt_group_' . $role);
@@ -287,7 +287,7 @@ class ConvertController extends Controller
public function postIndex(Request $request, TransactionType $destinationType, TransactionGroup $group)
{
if (!$this->isEditableGroup($group)) {
return $this->redirectGroupToAccount($group);
return $this->redirectGroupToAccount($group);
}
/** @var TransactionJournal $journal */
@@ -346,7 +346,7 @@ class ConvertController extends Controller
throw new FireflyException(sprintf(trans('firefly.convert_invalid_destination'), $journal->id));
}
// See reference nr. 50
// See reference nr. 50
$update = [
'source_id' => $sourceId,

6
app/Http/Controllers/Transaction/CreateController.php
View File

@@ -24,11 +24,13 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use FireflyIII\Events\StoredTransactionGroup;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\TransactionGroup;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Services\Internal\Update\GroupCloneService;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse;
use Illuminate\Routing\Redirector;
@@ -86,8 +88,8 @@ class CreateController extends Controller
*
* @param string|null $objectType
*
* @return Factory|\Illuminate\Contracts\View\View
* @throws \FireflyIII\Exceptions\FireflyException
* @return Factory|View
* @throws FireflyException
*/
public function create(?string $objectType)
{

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

@@ -73,7 +73,7 @@ class DeleteController extends Controller
public function delete(TransactionGroup $group)
{
if (!$this->isEditableGroup($group)) {
return $this->redirectGroupToAccount($group);
return $this->redirectGroupToAccount($group);
}
Log::debug(sprintf('Start of delete view for group #%d', $group->id));
@@ -102,7 +102,7 @@ class DeleteController extends Controller
public function destroy(TransactionGroup $group): RedirectResponse
{
if (!$this->isEditableGroup($group)) {
return $this->redirectGroupToAccount($group);
return $this->redirectGroupToAccount($group);
}
$journal = $group->transactionJournals->first();

10
app/Http/Controllers/Transaction/EditController.php
View File

@@ -67,15 +67,15 @@ class EditController extends Controller
app('preferences')->mark();
if (!$this->isEditableGroup($transactionGroup)) {
return $this->redirectGroupToAccount($transactionGroup);
return $this->redirectGroupToAccount($transactionGroup);
}
/** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class);
$repository = app(AccountRepositoryInterface::class);
$allowedOpposingTypes = config('firefly.allowed_opposing_types');
$accountToTypes = config('firefly.account_to_transaction');
$expectedSourceTypes = config('firefly.expected_source_types');
$allowedSourceDests = config('firefly.source_dests');
$accountToTypes = config('firefly.account_to_transaction');
$expectedSourceTypes = config('firefly.expected_source_types');
$allowedSourceDests = config('firefly.source_dests');
//
$defaultCurrency = app('amount')->getDefaultCurrency();

2
app/Http/Controllers/Transaction/IndexController.php
View File

@@ -77,7 +77,7 @@ class IndexController extends Controller
*/
public function index(Request $request, string $objectType, Carbon $start = null, Carbon $end = null)
{
if('transfers' === $objectType) {
if ('transfers' === $objectType) {
$objectType = 'transfer';
}

2
app/Http/Controllers/Transaction/LinkController.php
View File

@@ -40,7 +40,7 @@ use URL;
*/
class LinkController extends Controller
{
private JournalRepositoryInterface $journalRepository;
private JournalRepositoryInterface $journalRepository;
private LinkTypeRepositoryInterface $repository;
/**

8
app/Http/Controllers/Transaction/MassController.php
View File

@@ -168,8 +168,8 @@ class MassController extends Controller
{
$journalIds = $request->get('journals');
if (!is_array($journalIds)) {
// See reference nr. 48
throw new FireflyException('This is not an array.');
// See reference nr. 48
throw new FireflyException('This is not an array.');
}
$count = 0;
/** @var string $journalId */
@@ -178,7 +178,7 @@ class MassController extends Controller
try {
$this->updateJournal($integer, $request);
$count++;
} catch (FireflyException $e) {
} catch (FireflyException $e) {
// @ignoreException
}
}
@@ -200,7 +200,7 @@ class MassController extends Controller
{
$journal = $this->repository->find($journalId);
if (null === $journal) {
throw new FireflyException(sprintf('Trying to edit non-existent or deleted journal #%d', $journalId));
throw new FireflyException(sprintf('Trying to edit non-existent or deleted journal #%d', $journalId));
}
$service = app(JournalUpdateService::class);
// for each field, call the update service.