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

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2018-07-08 12:08:53 +02:00
parent 2f2f907ffe
commit b315882f58
56 changed files with 465 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,8 +32,6 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Illuminate\Support\Collection;
use Log;
use Preferences;
use View;
/**
* Class BulkController
@@ -45,7 +43,7 @@ class BulkController extends Controller
/**
*
* BulkController constructor.
*/
public function __construct()
{
@@ -65,7 +63,7 @@ class BulkController extends Controller
/**
* @param Collection $journals
*
* @return View
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function edit(Collection $journals)
{
@@ -129,7 +127,7 @@ class BulkController extends Controller
}
}
Preferences::mark();
app('preferences')->mark();
$request->session()->flash('success', trans('firefly.mass_edited_transactions_success', ['amount' => $count]));
// redirect to previous URL:

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

@@ -61,6 +61,7 @@ class ConvertController extends Controller
);
}
/**
* @param TransactionType $destinationType
* @param TransactionJournal $journal
@@ -109,6 +110,7 @@ class ConvertController extends Controller
);
}
/**
* @param Request $request
* @param TransactionType $destinationType
@@ -124,6 +126,7 @@ class ConvertController extends Controller
// @codeCoverageIgnoreStart
if ($this->isOpeningBalance($journal)) {
Log::debug('Journal is opening balance, return to account.');
return $this->redirectToAccount($journal);
}
// @codeCoverageIgnoreEnd
@@ -160,6 +163,7 @@ class ConvertController extends Controller
return redirect(route('transactions.show', [$journal->id]));
}
/**
* @param TransactionJournal $journal
* @param TransactionType $destinationType
@@ -215,6 +219,7 @@ class ConvertController extends Controller
return $destination;
}
/**
* @param TransactionJournal $journal
* @param TransactionType $destinationType

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

@@ -29,7 +29,6 @@ use FireflyIII\Models\TransactionJournalLink;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
use Log;
use Preferences;
use URL;
/**
@@ -86,7 +85,7 @@ class LinkController extends Controller
$this->repository->destroyLink($link);
session()->flash('success', (string)trans('firefly.deleted_link'));
Preferences::mark();
app('preferences')->mark();
return redirect((string)session('journal_links.delete.uri'));
}

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

@@ -37,7 +37,6 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Transformers\TransactionTransformer;
use Illuminate\Support\Collection;
use Illuminate\View\View as IlluminateView;
use Preferences;
use Symfony\Component\HttpFoundation\ParameterBag;
/**
@@ -109,7 +108,7 @@ class MassController extends Controller
++$count;
}
Preferences::mark();
app('preferences')->mark();
session()->flash('success', trans('firefly.mass_deleted_transactions_success', ['amount' => $count]));
// redirect to previous URL:
@@ -241,7 +240,7 @@ class MassController extends Controller
}
}
}
Preferences::mark();
app('preferences')->mark();
session()->flash('success', trans('firefly.mass_edited_transactions_success', ['amount' => $count]));
// redirect to previous URL:

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

@@ -135,14 +135,14 @@ class SingleController extends Controller
}
/**
* @param Request $request
* @param string $what
* @param Request $request
* @param string|null $what
*
* @return View
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function create(Request $request, string $what = TransactionType::DEPOSIT)
public function create(Request $request, string $what = null)
{
$what = strtolower($what);
$what = strtolower($what ?? TransactionType::DEPOSIT);
$what = (string)($request->old('what') ?? $what);
$budgets = ExpandedForm::makeSelectListWithEmpty($this->budgets->getActiveBudgets());
$preFilled = session()->has('preFilled') ? session('preFilled') : [];
@@ -220,7 +220,7 @@ class SingleController extends Controller
$this->repository->destroy($transactionJournal);
Preferences::mark();
app('preferences')->mark();
return redirect($this->getPreviousUri('transactions.delete.uri'));
}
@@ -296,7 +296,7 @@ class SingleController extends Controller
// amounts for withdrawals and deposits:
// amount, native_amount, source_amount, destination_amount
if (($journal->isWithdrawal() || $journal->isDeposit()) && null !== $pTransaction->foreign_amount) {
if (null !== $pTransaction->foreign_amount && ($journal->isWithdrawal() || $journal->isDeposit())) {
$preFilled['amount'] = $pTransaction->foreign_amount;
$preFilled['currency'] = $pTransaction->foreignCurrency;
}
@@ -355,7 +355,7 @@ class SingleController extends Controller
event(new StoredTransactionJournal($journal, $data['piggy_bank_id']));
session()->flash('success', (string)trans('firefly.stored_journal', ['description' => $journal->description]));
Preferences::mark();
app('preferences')->mark();
// @codeCoverageIgnoreStart
if (true === $createAnother) {
@@ -412,7 +412,7 @@ class SingleController extends Controller
$type = strtolower($this->repository->getTransactionType($journal));
session()->flash('success', (string)trans('firefly.updated_' . $type, ['description' => $data['description']]));
Preferences::mark();
app('preferences')->mark();
// @codeCoverageIgnoreStart
if (1 === (int)$request->get('return_to_edit')) {