Skip to content

Firefly III: a personal finances manager

Try to fix missing index error.

James Cole10cd29562ebd
diff --git a/app/Events/Model/TransactionGroup/TransactionGroupEventObjects.php b/app/Events/Model/TransactionGroup/TransactionGroupEventObjects.php
index 47331fdbe9..2739d94809 100644
--- a/app/Events/Model/TransactionGroup/TransactionGroupEventObjects.php
+++ b/app/Events/Model/TransactionGroup/TransactionGroupEventObjects.php
@@ -48,13 +48,13 @@ class TransactionGroupEventObjects
public function appendFromTransactionGroup(TransactionGroup $transactionGroup): void
{
- Log::debug(sprintf('Appended transaction group #%d', $transactionGroup->id));
+ //Log::debug(sprintf('Appended transaction group #%d', $transactionGroup->id));
$this->transactionGroups->push($transactionGroup);
/** @var TransactionJournal $journal */
foreach ($transactionGroup->transactionJournals as $journal) {
$journal->refresh();
- Log::debug(sprintf('Appended transaction journal #%d (%s)', $journal->id, $journal->date->format('Y-m-d H:i:s')));
+ //Log::debug(sprintf('Appended transaction journal #%d (%s)', $journal->id, $journal->date->format('Y-m-d H:i:s')));
$this->transactionJournals->put($journal->id, $journal);
$this->budgets = $this->budgets->merge($journal->budgets);
$this->categories = $this->categories->merge($journal->categories);
@@ -62,7 +62,7 @@ class TransactionGroupEventObjects
/** @var Transaction $transaction */
foreach ($journal->transactions as $transaction) {
- Log::debug(sprintf('Appended account #%d', $transaction->account->id));
+ // Log::debug(sprintf('Appended account #%d', $transaction->account->id));
$this->accounts->push($transaction->account);
}
}
diff --git a/app/Support/Models/AccountBalanceCalculator.php b/app/Support/Models/AccountBalanceCalculator.php
index 9aafad0e99..2bde5063f5 100644
--- a/app/Support/Models/AccountBalanceCalculator.php
+++ b/app/Support/Models/AccountBalanceCalculator.php
@@ -139,14 +139,14 @@ class AccountBalanceCalculator
/** @var Transaction $entry */
foreach ($set as $entry) {
- Log::debug(sprintf(
- '[%s] Processing transaction #%d on acount #%d with currency #%d and amount %s',
- $entry->date,
- $entry->id,
- $entry->account_id,
- $entry->transaction_currency_id,
- Steam::bcround($entry->amount, 2)
- ));
+// Log::debug(sprintf(
+// '[%s] Processing transaction #%d on acount #%d with currency #%d and amount %s',
+// $entry->date,
+// $entry->id,
+// $entry->account_id,
+// $entry->transaction_currency_id,
+// Steam::bcround($entry->amount, 2)
+// ));
// start with empty array:
$entry->account_id = (int) $entry->account_id;
$entry->transaction_currency_id = (int) $entry->transaction_currency_id;
diff --git a/resources/views/components/lists/subscriptions.blade.php b/resources/views/components/lists/subscriptions.blade.php
index 95d56fab10..d2891fbc2e 100644
--- a/resources/views/components/lists/subscriptions.blade.php
+++ b/resources/views/components/lists/subscriptions.blade.php
@@ -2,211 +2,231 @@
<div class="row">
<div class="col-lg-12 col-sm-12 col-md-12">
<div class="card mb-2">
- <x-elements.card-header-with-menu :cardTitle="$objectGroup['object_group_title']" :route="route('subscriptions.create')" :linkTitle="__('firefly.create_new_bill')" />
+ <x-elements.card-header-with-menu :cardTitle="$objectGroup['object_group_title']"
+ :route="route('subscriptions.create')"
+ :linkTitle="__('firefly.create_new_bill')"/>
<div class="card-body p-0">
-<table class="table table-hover table-sm" id="bill-sortable">
- <thead>
- <tr>
- <th class="hidden-sm hidden-xs">&nbsp;</th>
- <th class="hidden-sm hidden-xs">&nbsp;</th>
- <th>{{ __('list.name') }}</th>
- <th class="hidden-sm hidden-md hidden-xs">{{ __('list.linked_to_rules') }}</th>
- <th class="text-end">{{ trans('list.matchingAmount') }}</th>
- <th class="hidden-sm hidden-xs">{{ trans('list.paid_current_period') }}</th>
- <th class="hidden-sm hidden-xs">{{ trans('list.next_expected_match') }}</th>
- <th class="hidden-sm hidden-xs">{{ trans('list.repeat_freq') }}</th>
- </tr>
- </thead>
- @if(count($objectGroup['bills']) > 0)
- <tbody class="bill-connected-list" data-title="{{ $objectGroup['object_group_title'] }}">
- @foreach($objectGroup['bills'] as $entry)
- <tr class="bill-sortable" data-id="{{ $entry['id'] }}" data-name="{{ $entry['name'] }}" data-order="{{ $entry['order'] }}" data-position="{{ $loop->index }}">
- <td class="hidden-sm hidden-xs">
- <span class="bi bi-list bill-handle"></span>
- </td>
- <td class="hidden-sm hidden-xs">
- <div class="btn-group btn-group-sm edit_tr_buttons"><a href="{{ route('subscriptions.edit',$entry['id']) }}"
- class="btn btn-secondary"><span
- class="bi bi-pencil"></span></a><a
- href="{{ route('subscriptions.delete',$entry['id']) }}" class="btn btn-danger"><span
- class="bi bi-trash"></span></a></div>
- </td>
- <td>
- @if(!$entry['active'])
- <span class="bi bi-ban"></span>
- @endif
- <a href="{{ route('subscriptions.show',$entry['id']) }}" title="{{ $entry['name'] }}">{{ $entry['name'] }}</a>
- {{-- count attachments --}}
- @if(count($entry['attachments']) > 0)
- <span class="bi bi-paperclip"></span>
- @endif
+ <table class="table table-hover table-sm" id="bill-sortable">
+ <thead>
+ <tr>
+ <th class="hidden-sm hidden-xs">&nbsp;</th>
+ <th class="hidden-sm hidden-xs">&nbsp;</th>
+ <th>{{ __('list.name') }}</th>
+ <th class="hidden-sm hidden-md hidden-xs">{{ __('list.linked_to_rules') }}</th>
+ <th class="text-end">{{ trans('list.matchingAmount') }}</th>
+ <th class="hidden-sm hidden-xs">{{ trans('list.paid_current_period') }}</th>
+ <th class="hidden-sm hidden-xs">{{ trans('list.next_expected_match') }}</th>
+ <th class="hidden-sm hidden-xs">{{ trans('list.repeat_freq') }}</th>
+ </tr>
+ </thead>
+ @if(count($objectGroup['bills']) > 0)
+ <tbody class="bill-connected-list" data-title="{{ $objectGroup['object_group_title'] }}">
+ @foreach($objectGroup['bills'] as $entry)
+ <tr class="bill-sortable" data-id="{{ $entry['id'] }}" data-name="{{ $entry['name'] }}"
+ data-order="{{ $entry['order'] }}" data-position="{{ $loop->index }}">
+ <td class="hidden-sm hidden-xs">
+ <span class="bi bi-list bill-handle"></span>
+ </td>
+ <td class="hidden-sm hidden-xs">
+ <div class="btn-group btn-group-sm edit_tr_buttons"><a
+ href="{{ route('subscriptions.edit',$entry['id']) }}"
+ class="btn btn-secondary"><span
+ class="bi bi-pencil"></span></a><a
+ href="{{ route('subscriptions.delete',$entry['id']) }}"
+ class="btn btn-danger"><span
+ class="bi bi-trash"></span></a></div>
+ </td>
+ <td>
+ @if(!$entry['active'])
+ <span class="bi bi-ban"></span>
+ @endif
+ <a href="{{ route('subscriptions.show',$entry['id']) }}"
+ title="{{ $entry['name'] }}">{{ $entry['name'] }}</a>
+ {{-- count attachments --}}
+ @if(count($entry['attachments']) > 0)
+ <span class="bi bi-paperclip"></span>
+ @endif
- </td>
- <td class="hidden-sm hidden-md hidden-xs rules">
- @if(count($entry['rules']) > 0)
- <ul class="list-unstyled">
- @foreach($entry['rules'] as $rule)
- <li>
- <a href="{{ route('rules.edit', [$rule['id']]) }}">
- {{ $rule['title'] }}
- </a>
- @if(!$rule['active'])({{ strtolower(__('firefly.list_inactive_rule')) }})@endif
- </li>
- @endforeach
- </ul>
- @endif
- </td>
- <td class="text-end">
- <span class="mr-2" title="{{ e(format_amount_by_symbol($entry['amount_min'], $entry['currency_symbol'], $entry['currency_decimal_places'], false)) }} -- {{ e(format_amount_by_symbol($entry['amount_max'], $entry['currency_symbol'], $entry['currency_decimal_places'], false)) }}">
+ </td>
+ <td class="hidden-sm hidden-md hidden-xs rules">
+ @if(count($entry['rules']) > 0)
+ <ul class="list-unstyled">
+ @foreach($entry['rules'] as $rule)
+ <li>
+ <a href="{{ route('rules.edit', [$rule['id']]) }}">
+ {{ $rule['title'] }}
+ </a>
+ @if(!$rule['active'])
+ ({{ strtolower(__('firefly.list_inactive_rule')) }})
+ @endif
+ </li>
+ @endforeach
+ </ul>
+ @endif
+ </td>
+ <td class="text-end">
+ <span class="mr-2"
+ title="{{ e(format_amount_by_symbol($entry['amount_min'], $entry['currency_symbol'], $entry['currency_decimal_places'], false)) }} -- {{ e(format_amount_by_symbol($entry['amount_max'], $entry['currency_symbol'], $entry['currency_decimal_places'], false)) }}">
~ {!! format_amount_by_symbol(($entry['amount_max'] + $entry['amount_min'])/2, $entry['currency_symbol'], $entry['currency_decimal_places']) !!}
@if('0' !== $entry['pc_amount_max'] && null !== $entry['pc_amount_max'])
- (~ {!! format_amount_by_symbol(($entry['pc_amount_max'] + $entry['pc_amount_min'])/2, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
+ (~ {!! format_amount_by_symbol(($entry['pc_amount_max'] + $entry['pc_amount_min'])/2, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!}
+ )
@endif
</span>
- </td>
+ </td>
- {{--
- paidDates = 0 (bill not paid in period)
- pay_dates = 0 (bill not expected to be paid in this period)
- bill is active.
- --}}
- @if(0 === count($entry['paid_dates']) && 0 === count($entry['pay_dates']) && $entry['active'])
- <td class="paid_in_period text-muted">
- {{ trans('firefly.not_expected_period') }}
- </td>
- <td class="expected_in_period hidden-sm hidden-xs">
- @if($entry['next_expected_match'])
- {{ new \Carbon\Carbon($entry['next_expected_match'])->isoFormat($monthAndDayFormat) }}
- @endif
- </td>
- @endif
+ {{--
+ paidDates = 0 (bill not paid in period)
+ pay_dates = 0 (bill not expected to be paid in this period)
+ bill is active.
+ --}}
+ @if(0 === count($entry['paid_dates']) && 0 === count($entry['pay_dates']) && $entry['active'])
+ <td class="paid_in_period text-muted">
+ {{ trans('firefly.not_expected_period') }}
+ </td>
+ <td class="expected_in_period hidden-sm hidden-xs">
+ @if($entry['next_expected_match'])
+ {{ new \Carbon\Carbon($entry['next_expected_match'])->isoFormat($monthAndDayFormat) }}
+ @endif
+ </td>
+ @endif
- {{--
- paid_dates = 0 (bill not paid in period)
- pay_dates > 0 (bill IS expected to be paid in this period)
- bill is active
- first pay date is in the past.
- --}}
- @if(0 === count($entry['paid_dates']) && count($entry['pay_dates']) > 0 && $entry['active'])
- @if($entry['next_expected_match_diff'] === __('firefly.not_expected_period')) {{-- terrible code, you should sue me for this. --}}
- <td class="paid_in_period text-muted">
- {{ $entry['next_expected_match_diff'] }}
- </td>
- @else
- <td class="paid_in_period text-warning">
- {{ $entry['next_expected_match_diff'] }}
- <!-- {{ __('firefly.bill_expected_date', ['date' => $entry['next_expected_match_diff']]) }} -->
- </td>
- @endif
- <td class="expected_in_period hidden-sm hidden-xs">
- @foreach($entry['pay_dates'] as $date)
- {{ new \Carbon\Carbon($date)->isoFormat($monthAndDayFormat) }}<br>
- @endforeach
+ {{--
+ paid_dates = 0 (bill not paid in period)
+ pay_dates > 0 (bill IS expected to be paid in this period)
+ bill is active
+ first pay date is in the past.
+ --}}
+ @if(0 === count($entry['paid_dates']) && count($entry['pay_dates']) > 0 && $entry['active'])
+ @if($entry['next_expected_match_diff'] === __('firefly.not_expected_period'))
+ {{-- terrible code, you should sue me for this. --}}
+ <td class="paid_in_period text-muted">
+ {{ $entry['next_expected_match_diff'] }}
+ </td>
+ @else
+ <td class="paid_in_period text-warning">
+ {{ $entry['next_expected_match_diff'] }}
+ <!-- {{ __('firefly.bill_expected_date', ['date' => $entry['next_expected_match_diff']]) }} -->
+ </td>
+ @endif
+ <td class="expected_in_period hidden-sm hidden-xs">
+ @foreach($entry['pay_dates'] as $date)
+ {{ new \Carbon\Carbon($date)->isoFormat($monthAndDayFormat) }}<br>
+ @endforeach
- </td>
- @endif
+ </td>
+ @endif
- {{--
- paid_dates >= 0 (bill is paid X times).
- Don't care about pay_dates.
- --}}
+ {{--
+ paid_dates >= 0 (bill is paid X times).
+ Don't care about pay_dates.
+ --}}
- @if(count($entry['paid_dates']) > 0 && $entry['active'])
- <td class="paid_in_period text-success">
- @foreach($entry['paid_dates'] as $currentPaid)
- <a href="{{ route('transactions.show', $currentPaid['transaction_group_id']) }}">{{ new \Carbon\Carbon($currentPaid['date'])->isoFormat($monthAndDayFormat) }}</a><br/>
- @endforeach
- </td>
- <td class="expected_in_period hidden-sm hidden-xs">
- <!-- not just show next expected match, loop all pay_dates. -->
- @if($entry['next_expected_match'] && 1 === count($entry['pay_dates']))
- {{ new \Carbon\Carbon($entry['next_expected_match'])->isoFormat($monthAndDayFormat) }}
- @elseif($entry['next_expected_match'] && count($entry['pay_dates']) > 0)
- @foreach($entry['pay_dates'] as $date)
- {{ new \Carbon\Carbon($date)->isoFormat($monthAndDayFormat) }}<br>
- @endforeach
- @else
- <span class="text-muted">{{ $entry['next_expected_match_diff'] }}</span>
- @endif
- </td>
- @endif
- {{-- bill is not active --}}
- @if(!$entry['active'])
- <td class="paid_in_period text-muted">
- ~
- </td>
- <td class="expected_in_period text-muted hidden-sm hidden-xs">~</td>
- @endif
- <td class="hidden-sm hidden-xs">
- {{ __('firefly.repeat_freq_' . $entry['repeat_freq']) }}
- @if($entry['skip'] > 0)
- {{ __('firefly.skips_over') }} {{ $entry['skip'] }}
- @endif
- @if(null !== $entry['end_date'])
- <br>
- @if(new \Carbon\Carbon($entry['end_date'])->lte($today))
- <span class="text-danger">{{ trans('firefly.bill_end_index_line', ['date' => new \Carbon\Carbon($entry['end_date'])->isoFormat($monthAndDayFormat)]) }}</span>
- @else
- {{ trans('firefly.bill_end_index_line', ['date' => new \Carbon\Carbon($entry['end_date'])->isoFormat($monthAndDayFormat)]) }}
- @endif
- @endif
- @if($entry['extension_date'])
- <br>
- @if(new \Carbon\Carbon($entry['extension_date'])->lte($today))
- <span class="text-danger">{{ trans('firefly.bill_extension_index_line', ['date' => new \Carbon\Carbon($entry['extension_date'])->isoFormat($monthAndDayFormat)]) }}</span>
- @else
- {{ trans('firefly.bill_extension_index_line', ['date' => new \Carbon\Carbon($entry['extension_date'])->isoFormat($monthAndDayFormat)]) }}
- @endif
- @endif
- </td>
- </tr>
- @endforeach
- @foreach(($sums[$objectGroupOrder] ?? []) as $sum)
- @if('0' !== $sum['avg'])
- <tr>
- <td class="hidden-sm hidden-xs" colspan="2">&nbsp;</td> <!-- handle -->
- <td colspan="2" class="text-end"> <!-- title -->
- <small>{{ __('firefly.sum') }} ({{ $sum['currency_name'] }}) ({{ __('firefly.active_exp_bills_only') }})</small>
- </td>
- <td class="text-end"> <!-- amount -->
- {!! format_amount_by_symbol($sum['avg'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
- </td>
- <td class="hidden-sm hidden-xs" colspan="3">&nbsp;</td> <!-- handle -->
- </tr>
- @endif
- @if('0' !== $sum['total_left_to_pay'])
- <tr>
- <td class="hidden-sm hidden-xs" colspan="2">&nbsp;</td> <!-- handle -->
- <td colspan="2" class="text-end"> <!-- title -->
- <small>{{ __('firefly.sum') }} ({{ $sum['currency_name'] }}) ({{ __('firefly.left_to_pay_active_bills') }})</small>
- </td>
- <td class="text-end"> <!-- amount -->
- {!! format_amount_by_symbol($sum['total_left_to_pay'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
- </td>
- <td class="hidden-sm hidden-xs" colspan="3">&nbsp;</td> <!-- handle -->
- </tr>
- @endif
- @if('0' !== $sum['per_period'])
- <tr>
- <td class="hidden-sm hidden-xs" colspan="2">&nbsp;</td> <!-- handle -->
- <td colspan="2" class="text-end"> <!-- title -->
- <small>{{ __('firefly.per_period_sum_' . $sum['period']) }} ({{ $sum['currency_name'] }})
- ({{ __('firefly.active_bills_only') }})</small>
- </td>
- <td class="text-end"> <!-- amount -->
- {!! format_amount_by_symbol($sum['per_period'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
- </td>
- <td class="hidden-sm hidden-xs" colspan="3">&nbsp;</td> <!-- handle -->
- </tr>
- @endif
- @endforeach
- </tbody>
- @endif
+ @if(count($entry['paid_dates']) > 0 && $entry['active'])
+ <td class="paid_in_period text-success">
+ @foreach($entry['paid_dates'] as $currentPaid)
+ <a href="{{ route('transactions.show', $currentPaid['transaction_group_id']) }}">{{ new \Carbon\Carbon($currentPaid['date'])->isoFormat($monthAndDayFormat) }}</a>
+ <br/>
+ @endforeach
+ </td>
+ <td class="expected_in_period hidden-sm hidden-xs">
+ <!-- not just show next expected match, loop all pay_dates. -->
+ @if($entry['next_expected_match'] && 1 === count($entry['pay_dates']))
+ {{ new \Carbon\Carbon($entry['next_expected_match'])->isoFormat($monthAndDayFormat) }}
+ @elseif($entry['next_expected_match'] && count($entry['pay_dates']) > 0)
+ @foreach($entry['pay_dates'] as $date)
+ {{ new \Carbon\Carbon($date)->isoFormat($monthAndDayFormat) }}<br>
+ @endforeach
+ @else
+ <span class="text-muted">{{ $entry['next_expected_match_diff'] }}</span>
+ @endif
+ </td>
+ @endif
+ {{-- bill is not active --}}
+ @if(!$entry['active'])
+ <td class="paid_in_period text-muted">
+ ~
+ </td>
+ <td class="expected_in_period text-muted hidden-sm hidden-xs">~</td>
+ @endif
+ <td class="hidden-sm hidden-xs">
+ {{ __('firefly.repeat_freq_' . $entry['repeat_freq']) }}
+ @if($entry['skip'] > 0)
+ {{ __('firefly.skips_over') }} {{ $entry['skip'] }}
+ @endif
+ @if(null !== $entry['end_date'])
+ <br>
+ @if(new \Carbon\Carbon($entry['end_date'])->lte($today))
+ <span
+ class="text-danger">{{ trans('firefly.bill_end_index_line', ['date' => new \Carbon\Carbon($entry['end_date'])->isoFormat($monthAndDayFormat)]) }}</span>
+ @else
+ {{ trans('firefly.bill_end_index_line', ['date' => new \Carbon\Carbon($entry['end_date'])->isoFormat($monthAndDayFormat)]) }}
+ @endif
+ @endif
+ @if($entry['extension_date'])
+ <br>
+ @if(new \Carbon\Carbon($entry['extension_date'])->lte($today))
+ <span
+ class="text-danger">{{ trans('firefly.bill_extension_index_line', ['date' => new \Carbon\Carbon($entry['extension_date'])->isoFormat($monthAndDayFormat)]) }}</span>
+ @else
+ {{ trans('firefly.bill_extension_index_line', ['date' => new \Carbon\Carbon($entry['extension_date'])->isoFormat($monthAndDayFormat)]) }}
+ @endif
+ @endif
+ </td>
+ </tr>
+ @endforeach
+ @if(array_key_exists($objectGroupOrder, $sums))
+ @foreach($sums[$objectGroupOrder] as $sum)
+ @if('0' !== $sum['avg'])
+ <tr>
+ <td class="hidden-sm hidden-xs" colspan="2">&nbsp;</td> <!-- handle -->
+ <td colspan="2" class="text-end"> <!-- title -->
+ <small>{{ __('firefly.sum') }} ({{ $sum['currency_name'] }})
+ ({{ __('firefly.active_exp_bills_only') }})</small>
+ </td>
+ <td class="text-end"> <!-- amount -->
+ {!! format_amount_by_symbol($sum['avg'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
+ </td>
+ <td class="hidden-sm hidden-xs" colspan="3">&nbsp;</td> <!-- handle -->
+ </tr>
+ @endif
+ @if('0' !== $sum['total_left_to_pay'])
+ <tr>
+ <td class="hidden-sm hidden-xs" colspan="2">&nbsp;</td> <!-- handle -->
+ <td colspan="2" class="text-end"> <!-- title -->
+ <small>{{ __('firefly.sum') }} ({{ $sum['currency_name'] }})
+ ({{ __('firefly.left_to_pay_active_bills') }})</small>
+ </td>
+ <td class="text-end"> <!-- amount -->
+ {!! format_amount_by_symbol($sum['total_left_to_pay'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
+ </td>
+ <td class="hidden-sm hidden-xs" colspan="3">&nbsp;</td> <!-- handle -->
+ </tr>
+ @endif
+ @if('0' !== $sum['per_period'])
+ <tr>
+ <td class="hidden-sm hidden-xs" colspan="2">&nbsp;</td> <!-- handle -->
+ <td colspan="2" class="text-end"> <!-- title -->
+ <small>{{ __('firefly.per_period_sum_' . $sum['period']) }}
+ ({{ $sum['currency_name'] }})
+ ({{ __('firefly.active_bills_only') }})</small>
+ </td>
+ <td class="text-end"> <!-- amount -->
+ {!! format_amount_by_symbol($sum['per_period'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
+ </td>
+ <td class="hidden-sm hidden-xs" colspan="3">&nbsp;</td> <!-- handle -->
+ </tr>
+ @endif
+ @endforeach
+ @endif
+ </tbody>
+ @endif
-</table>
+ </table>
</div>
- <x-elements.card-footer-with-menu :route="route('subscriptions.create')" :linkTitle="__('firefly.create_new_bill')" />
+ <x-elements.card-footer-with-menu :route="route('subscriptions.create')"
+ :linkTitle="__('firefly.create_new_bill')"/>
</div>
</div>
</div>
@@ -214,34 +234,35 @@
@if(count($totals) > 0)
-<h5 class="m-3">Totals</h5>
+ <h5 class="m-3">Totals</h5>
-<table class="table table-bordered table-hover mb-3">
- <tbody>
- @foreach($totals as $sum)
- @if('0' !== $sum['avg'])
- <tr>
- <td class="text-end"> <!-- title -->
- <small>{{ __('firefly.sum') }} ({{ $sum['currency_name'] }}) ({{ __('firefly.active_exp_bills_only_total') }})</small>
- </td>
- <td class="text-end"> <!-- amount -->
- {!! format_amount_by_symbol($sum['avg'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
- </td>
- </tr>
- @endif
- @if('0' !== $sum['per_period'])
- <tr>
- <td class="text-end"> <!-- title -->
- <small>{{ __('firefly.per_period_sum_' . $sum['period']) }} ({{ $sum['currency_name'] }})
- ({{ __('firefly.active_bills_only_total') }})</small>
- </td>
- <td class="text-end"> <!-- amount -->
- {!! format_amount_by_symbol($sum['per_period'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
- </td>
- </tr>
- @endif
- @endforeach
- </tbody>
+ <table class="table table-bordered table-hover mb-3">
+ <tbody>
+ @foreach($totals as $sum)
+ @if('0' !== $sum['avg'])
+ <tr>
+ <td class="text-end"> <!-- title -->
+ <small>{{ __('firefly.sum') }} ({{ $sum['currency_name'] }})
+ ({{ __('firefly.active_exp_bills_only_total') }})</small>
+ </td>
+ <td class="text-end"> <!-- amount -->
+ {!! format_amount_by_symbol($sum['avg'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
+ </td>
+ </tr>
+ @endif
+ @if('0' !== $sum['per_period'])
+ <tr>
+ <td class="text-end"> <!-- title -->
+ <small>{{ __('firefly.per_period_sum_' . $sum['period']) }} ({{ $sum['currency_name'] }})
+ ({{ __('firefly.active_bills_only_total') }})</small>
+ </td>
+ <td class="text-end"> <!-- amount -->
+ {!! format_amount_by_symbol($sum['per_period'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
+ </td>
+ </tr>
+ @endif
+ @endforeach
+ </tbody>
-</table>
+ </table>
@endif