diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.php index 603727df0e..d8af622c92 100644 --- a/app/Http/Controllers/Account/IndexController.php +++ b/app/Http/Controllers/Account/IndexController.php @@ -101,7 +101,7 @@ class IndexController extends Controller $accounts->each( function (Account $account) use ($activities, $startBalances, $endBalances) { - $account->lastActivityDate = $this->isInArray($activities, $account->id); + $account->lastActivityDate = $this->isInArrayDate($activities, $account->id); $account->startBalance = $this->isInArray($startBalances, $account->id); $account->endBalance = $this->isInArray($endBalances, $account->id); $account->difference = bcsub($account->endBalance, $account->startBalance); @@ -163,7 +163,7 @@ class IndexController extends Controller $accounts->each( function (Account $account) use ($activities, $startBalances, $endBalances) { // See reference nr. 68 - $account->lastActivityDate = $this->isInArray($activities, $account->id); + $account->lastActivityDate = $this->isInArrayDate($activities, $account->id); $account->startBalance = $this->isInArray($startBalances, $account->id); $account->endBalance = $this->isInArray($endBalances, $account->id); $account->difference = bcsub($account->endBalance, $account->startBalance); diff --git a/app/Support/Http/Controllers/BasicDataSupport.php b/app/Support/Http/Controllers/BasicDataSupport.php index 1072b79770..360634330b 100644 --- a/app/Support/Http/Controllers/BasicDataSupport.php +++ b/app/Support/Http/Controllers/BasicDataSupport.php @@ -23,6 +23,8 @@ declare(strict_types=1); namespace FireflyIII\Support\Http\Controllers; +use Carbon\Carbon; + /** * Trait BasicDataSupport * @@ -30,15 +32,28 @@ namespace FireflyIII\Support\Http\Controllers; trait BasicDataSupport { /** - * Find the ID in a given array. Return '0' of not there (amount). + * Find the ID in a given array. Return '0' if not there (amount). * * @param array $array * @param int $entryId * * @return null|mixed */ - protected function isInArray(array $array, int $entryId) // helper for data (math, calculations) + protected function isInArray(array $array, int $entryId) { return $array[$entryId] ?? '0'; } + + /** + * Find the ID in a given array. Return null if not there (amount). + * + * @param array $array + * @param int $entryId + * + * @return null|Carbon + */ + protected function isInArrayDate(array $array, int $entryId): ?Carbon + { + return $array[$entryId] ?? null; + } } diff --git a/resources/views/v1/list/accounts.twig b/resources/views/v1/list/accounts.twig index dc01af8b7b..eb8877bc6e 100644 --- a/resources/views/v1/list/accounts.twig +++ b/resources/views/v1/list/accounts.twig @@ -84,6 +84,7 @@ {% if objectType != 'liabilities' %} {% if account.lastActivityDate %}
{% else %}