Skip to content

Firefly III: a personal finances manager

Fix account thing overview.

James Cole4196ce31f0cc
diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php
index 70c4035df2..afd301bf22 100644
--- a/app/Repositories/Account/AccountRepository.php
+++ b/app/Repositories/Account/AccountRepository.php
@@ -566,7 +566,7 @@ class AccountRepository implements AccountRepositoryInterface, UserGroupInterfac
'transaction_types.type',
'transaction_journals.transaction_currency_id',
'transactions.amount',
- 'transactions.native_amount',
+ 'transactions.native_amount as pc_amount',
'transactions.foreign_amount',
])
->toArray()
diff --git a/app/Support/Http/Controllers/PeriodOverview.php b/app/Support/Http/Controllers/PeriodOverview.php
index 71202faf95..19c8b61814 100644
--- a/app/Support/Http/Controllers/PeriodOverview.php
+++ b/app/Support/Http/Controllers/PeriodOverview.php
@@ -98,10 +98,10 @@ trait PeriodOverview
/** @var array $dates */
$dates = Navigation::blockPeriods($start, $end, $range);
$entries = [];
- $spent = [];
- $earned = [];
- $transferredAway = [];
- $transferredIn = [];
+// $spent = [];
+// $earned = [];
+// $transferredAway = [];
+// $transferredIn = [];
// run a custom query because doing this with the collector is MEGA slow.
$transactions = $this->accountRepository->periodCollection($account, $start, $end);
@@ -180,8 +180,8 @@ trait PeriodOverview
continue;
}
- $filtered[] = $item;
}
+ $filtered[] = $item;
}
return [$filtered, $result];
diff --git a/resources/views/list/periods.twig b/resources/views/list/periods.twig
index 489ba2abe1..0f19ef7525 100644
--- a/resources/views/list/periods.twig
+++ b/resources/views/list/periods.twig
@@ -12,7 +12,6 @@
<td style="text-align: right;">{{ period.total_transactions }}</td>
</tr>
{% endif %}
-
{% for entry in period.spent %}
{% if entry.amount != 0 %}
<tr>