IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add bill / category and budget info

Browse Source
This commit is contained in:
James Cole 2019-09-05 19:04:58 +02:00
parent 3fb13b870f
commit 5d192ad4c2
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Generator/Report/Audit/MonthReportGenerator.php
View File

@ -116,7 +116,8 @@ class MonthReportGenerator implements ReportGeneratorInterface
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
$collector->setAccounts(new Collection([$account]))->setRange($this->start, $this->end)->withAccountInformation();
$collector->setAccounts(new Collection([$account]))->setRange($this->start, $this->end)->withAccountInformation()
->withBudgetInformation()->withCategoryInformation()->withBillInformation();
$journals = $collector->getExtractedJournals();
$journals = array_reverse($journals, true);

12
resources/views/v1/reports/partials/journals-audit.twig
View File

@ -104,13 +104,19 @@
<a href="{{ route('accounts.show', [journal.destination_account_id]) }}" title="{{ journal.destination_account_iban|default(journal.destination_account_name) }}">{{ journal.destination_account_name }}</a>
</td>
<td class="hide-budget">
{# TODO BUDGET #}
{% if journal.budget_id %}
<a href="{{ route('budgets.show', [journal.budget_id]) }}" title="{{ journal.budget_name }}">{{ journal.budget_name }}</a>
{% endif %}
</td>
<td class="hide-category">
{# TODO CATEGORY#}
{% if journal.category_id %}
<a href="{{ route('categories.show', [journal.category_id]) }}" title="{{ journal.category_name }}">{{ journal.category_name }}</a>
{% endif %}
</td>
<td class="hide-bill">
{#TODO BILL#}
{% if journal.bill_id %}
<a href="{{ route('bills.show', [journal.bill_id]) }}" title="{{ journal.bill_name }}">{{ journal.bill_name }}</a>
{% endif %}
</td>
<!-- new optional fields (2x) -->