kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix tests.

Browse Source
This commit is contained in:
James Cole
2018-07-01 09:27:22 +02:00
parent 0502f2a4a5
commit db149ca6e1
50 changed files with 551 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@ use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Repositories\Account\AccountTaskerInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Collection;
use Log;
use Steam;
@@ -57,9 +58,9 @@ class ReportController extends Controller
* @param Carbon $start
* @param Carbon $end
*
* @return \Illuminate\Http\JsonResponse
* @return JsonResponse
*/
public function netWorth(Collection $accounts, Carbon $start, Carbon $end)
public function netWorth(Collection $accounts, Carbon $start, Carbon $end): JsonResponse
{
// chart properties for cache:
$cache = new CacheProperties;

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

@@ -30,6 +30,7 @@ use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Illuminate\Http\Request;
use Log;
use View;
/**
@@ -70,6 +71,8 @@ class ConvertController extends Controller
{
// @codeCoverageIgnoreStart
if ($this->isOpeningBalance($journal)) {
Log::debug('This is an opening balance.');
return $this->redirectToAccount($journal);
}
// @codeCoverageIgnoreEnd
@@ -80,6 +83,7 @@ class ConvertController extends Controller
// cannot convert to its own type.
if ($sourceType->type === $destinationType->type) {
Log::debug('This is already a transaction of the expected type..');
session()->flash('info', trans('firefly.convert_is_already_type_' . $destinationType->type));
return redirect(route('transactions.show', [$journal->id]));
@@ -87,6 +91,7 @@ class ConvertController extends Controller
// cannot convert split.
if ($journal->transactions()->count() > 2) {
Log::info('This journal has more than two transactions.');
session()->flash('error', trans('firefly.cannot_convert_split_journal'));
return redirect(route('transactions.show', [$journal->id]));
@@ -118,6 +123,7 @@ class ConvertController extends Controller
{
// @codeCoverageIgnoreStart
if ($this->isOpeningBalance($journal)) {
Log::debug('Journal is opening balance, return to account.');
return $this->redirectToAccount($journal);
}
// @codeCoverageIgnoreEnd
@@ -125,12 +131,14 @@ class ConvertController extends Controller
$data = $request->all();
if ($journal->transactionType->type === $destinationType->type) {
Log::info('Journal is already of the desired type.');
session()->flash('error', trans('firefly.convert_is_already_type_' . $destinationType->type));
return redirect(route('transactions.show', [$journal->id]));
}
if ($journal->transactions()->count() > 2) {
Log::info('Journal has more than two transactions.');
session()->flash('error', trans('firefly.cannot_convert_split_journal'));
return redirect(route('transactions.show', [$journal->id]));