Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Fix missing variables.
James Cole0b4d0ede0250
diff --git a/app/Http/Controllers/Report/DoubleController.php b/app/Http/Controllers/Report/DoubleController.phpindex c92e8b33ff..d590343af4 100644--- a/app/Http/Controllers/Report/DoubleController.php+++ b/app/Http/Controllers/Report/DoubleController.php@@ -384,8 +384,10 @@ final class DoubleController extends Controller$accounts = $accounts->merge($expanded);$spent = $this->opsRepository->listExpenses($start, $end, $accounts);$result = [];+ $incomeTopLength = 0;foreach ($spent as $currency) {foreach ($currency['transaction_journals'] as $journal) {+ ++$incomeTopLength;$result[] = ['description' => $journal['description'],'transaction_group_id' => $journal['transaction_group_id'],@@ -410,7 +412,7 @@ final class DoubleController extends Controllerarray_multisort($amounts, SORT_ASC, $result);try {- $result = view('reports.double.partials.top-expenses', ['result' => $result])->render();+ $result = view('reports.double.partials.top-expenses', ['result' => $result, 'incomeTopLength' => $incomeTopLength])->render();} catch (Throwable $e) {Log::error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));$result = sprintf('Could not render view: %s', $e->getMessage());diff --git a/resources/views/reports/double/partials/accounts.blade.php b/resources/views/reports/double/partials/accounts.blade.phpindex 0b45258af2..d44d0109c8 100644--- a/resources/views/reports/double/partials/accounts.blade.php+++ b/resources/views/reports/double/partials/accounts.blade.php@@ -16,8 +16,8 @@@else{{ $account['source_name'] }} / {{ $account['dest_name'] }}@endif- @if($iban['source_iban'] !== '' && $account['dest_iban'] !== '')- @if($iban['source_iban'] === $iban['dest_iban'])+ @if($account['source_iban'] !== '' && $account['dest_iban'] !== '')+ @if($account['source_iban'] === $account['dest_iban'])({{ $account['source_iban'] }})@else({{ $account['source_iban'] }} / ({{ $account['dest_iban'] }}))