IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-11-25 10:20:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix https://github.com/firefly-iii/firefly-iii/issues/9282

Browse Source
This commit is contained in:
James Cole 2024-09-29 16:04:54 +02:00
parent abcddb09bf
commit f475393bc1
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Helpers/Report/PopupReport.php
View File

@ -100,10 +100,10 @@ class PopupReport implements PopupReportInterface
$repos = app(CurrencyRepositoryInterface::class); $repos = app(CurrencyRepositoryInterface::class);
$currency = $repos->find((int)$currencyId); $currency = $repos->find((int)$currencyId);
} }
/** @var GroupCollectorInterface $collector */ /** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class); $collector = app(GroupCollectorInterface::class);
$collector->setAccounts($attributes['accounts']) $collector
->setAccounts($attributes['accounts'])
->withAccountInformation() ->withAccountInformation()
->withBudgetInformation() ->withBudgetInformation()
->withCategoryInformation() ->withCategoryInformation()
@ -113,14 +113,12 @@ class PopupReport implements PopupReportInterface
if (null !== $currency) { if (null !== $currency) {
$collector->setCurrency($currency); $collector->setCurrency($currency);
} }
if (null === $budget->id || 0 === $budget->id) {
if (null === $budget->id) {
$collector->setTypes([TransactionType::WITHDRAWAL])->withoutBudget(); $collector->setTypes([TransactionType::WITHDRAWAL])->withoutBudget();
} }
if (null !== $budget->id) { if (null !== $budget->id && 0 !== $budget->id) {
$collector->setBudget($budget); $collector->setBudget($budget);
} }
return $collector->getExtractedJournals(); return $collector->getExtractedJournals();
} }

1
app/Support/Http/Controllers/RenderPartialViews.php
View File

@ -115,6 +115,7 @@ trait RenderPartialViews
$budget = $budgetRepository->find((int)$attributes['budgetId']); $budget = $budgetRepository->find((int)$attributes['budgetId']);
if (null === $budget) { if (null === $budget) {
// transactions without a budget.
$budget = new Budget(); $budget = new Budget();
} }
$journals = $popupHelper->byBudget($budget, $attributes); $journals = $popupHelper->byBudget($budget, $attributes);

2
resources/views/reports/partials/budgets.twig
View File

@ -61,7 +61,7 @@
<td class="hidden-xs"> <td class="hidden-xs">
{% if budget_limit.spent != 0 %} {% if budget_limit.spent != 0 %}
<span class="fa fa-fw text-muted fa-info-circle firefly-info-button" <span class="fa fa-fw text-muted fa-info-circle firefly-info-button"
data-location="budget-spent-amount" data-currency-id="{{ budget_limit.currency_id }}" data-budget-id="{{ budget.budget_id }}"></span> data-location="budget-spent-amount" data-currency-id="{{ budget_limit.currency_id }}" data-budget-id="{% if '' == budget.budget_id %}0{% else %}{{ budget.budget_id }}{% endif %}"></span>
{% endif %} {% endif %}
</td> </td>