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

Fix #2536

Browse Source
This commit is contained in:
James Cole 2019-09-06 06:02:22 +02:00
parent 5d192ad4c2
commit a29e78ed44
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Budget/IndexController.php
View File

@ -164,13 +164,14 @@ class IndexController extends Controller
/** @var BudgetLimit $limit */ /** @var BudgetLimit $limit */
foreach ($budgetLimits as $limit) { foreach ($budgetLimits as $limit) {
$currency = $limit->transactionCurrency ?? $defaultCurrency;
$array['budgeted'][] = [ $array['budgeted'][] = [
'id' => $limit->id, 'id' => $limit->id,
'amount' => $limit->amount, 'amount' => $limit->amount,
'currency_id' => $limit->transactionCurrency->id, 'currency_id' => $currency->id,
'currency_symbol' => $limit->transactionCurrency->symbol, 'currency_symbol' => $currency->symbol,
'currency_name' => $limit->transactionCurrency->name, 'currency_name' => $currency->name,
'currency_decimal_places' => $limit->transactionCurrency->decimal_places, 'currency_decimal_places' => $currency->decimal_places,
]; ];
} }

2
resources/views/v1/budgets/index.twig
View File

@ -197,7 +197,7 @@
{% endif %} {% endif %}
</div> </div>
{% endif %} {% endif %}
{% if budgets.count == 0 and inactive.count == 0 %} {% if budgets|length == 0 and inactive.count == 0 %}
{% include 'partials.empty' with {objectType: 'default', type: 'budgets',route: route('budgets.create')} %} {% include 'partials.empty' with {objectType: 'default', type: 'budgets',route: route('budgets.create')} %}
{# make FF ignore demo for now. #} {# make FF ignore demo for now. #}
{% set shownDemo = true %} {% set shownDemo = true %}