Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Fix grouping.
James Coleba55e687eac7
diff --git a/resources/views/budgets/index.blade.php b/resources/views/budgets/index.blade.phpindex 752b1592c7..f4e1139a68 100644--- a/resources/views/budgets/index.blade.php+++ b/resources/views/budgets/index.blade.php@@ -119,8 +119,8 @@<span class="available_amount" data-id="{{ $budget['id'] }}" data-currency="{{ $budget['transaction_currency']['id'] }}"data-value="{{ $budget['amount'] }}">{!! format_amount_by_symbol($budget['amount'], $budget['transaction_currency']['symbol'], $budget['transaction_currency']['decimal_places'], true) !!}- @if($convertToPrimary && 0 !== $budget->pc_amount)- ({!! format_amount_by_symbol($budget->pc_amount, $primaryCurrency->symbol, $primaryCurrency->decimal_places, true) !!})+ @if($convertToPrimary && array_key_exists('pc_amount', $budget) && 0 !== $budget['pc_amount'])+ ({!! format_amount_by_symbol($budget['pc_amount'], $primaryCurrency->symbol, $primaryCurrency->decimal_places, true) !!})@endif</span></small>diff --git a/resources/views/components/lists/subscriptions.blade.php b/resources/views/components/lists/subscriptions.blade.phpindex d2891fbc2e..8f7de92150 100644--- a/resources/views/components/lists/subscriptions.blade.php+++ b/resources/views/components/lists/subscriptions.blade.php@@ -1,4 +1,5 @@@foreach($bills as $objectGroupOrder => $objectGroup)+ @if(count($objectGroup['bills']) > 0)<div class="row"><div class="col-lg-12 col-sm-12 col-md-12"><div class="card mb-2">@@ -230,7 +231,8 @@</div></div></div>-@endforeach+@endif+ @endforeach@if(count($totals) > 0)