Skip to content

Firefly III: a personal finances manager

Update views and changelog.

James Colec3582d18143e
diff --git a/app/Support/Models/AvailableBudgetCalculator.php b/app/Support/Models/AvailableBudgetCalculator.php
index d44a6b5ddc..1ec0de5a2a 100644
--- a/app/Support/Models/AvailableBudgetCalculator.php
+++ b/app/Support/Models/AvailableBudgetCalculator.php
@@ -124,17 +124,26 @@ class AvailableBudgetCalculator
private function correctViewRange(string $viewRange): string
{
- if ('MTD' === $viewRange) {
+ $week = []; // 'last7'
+ if(in_array($viewRange, $week, true)) {
+ Log::debug(sprintf('Overrule %s to 1W', $viewRange));
+
+ return '1W';
+ }
+ $month = ['MTD','custom','last30'];
+ if(in_array($viewRange, $month, true)) {
Log::debug(sprintf('Overrule %s to 1M', $viewRange));
return '1M';
}
- if ('QTD' === $viewRange) {
+ $quarter = ['QTD','last90'];
+ if(in_array($viewRange, $quarter, true)) {
Log::debug(sprintf('Overrule %s to 3M', $viewRange));
return '3M';
}
- if ('YTD' === $viewRange) {
+ $year = ['YTD','last365'];
+ if(in_array($viewRange, $year, true)) {
Log::debug(sprintf('Overrule %s to 1Y', $viewRange));
return '1Y';
diff --git a/changelog.md b/changelog.md
index 274d0574ea..7814b92222 100644
--- a/changelog.md
+++ b/changelog.md
@@ -13,6 +13,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- [Issue 12768](https://github.com/firefly-iii/firefly-iii/issues/12768) (redundant shadow for session logo) reported by @zhiiwg
- [Issue 12765](https://github.com/firefly-iii/firefly-iii/issues/12765) (Transaction Group Title not Showing on `/transactions/show/<id>` (& some tagged-along questions)) reported by @gthbusrr
- [Issue 12766](https://github.com/firefly-iii/firefly-iii/issues/12766) (Transaction Journals in the same Transaction Group have different `dates`) reported by @gthbusrr
+- #12740
+- #12764
## v6.7.1 - 2026-09-15
diff --git a/resources/views/accounts/show.blade.php b/resources/views/accounts/show.blade.php
index c3c376456f..98ed535a41 100644
--- a/resources/views/accounts/show.blade.php
+++ b/resources/views/accounts/show.blade.php
@@ -173,7 +173,7 @@
@endphp
@endif
- <x-lists.groups-large :groups="$groups" :account="$account" />
+ <x-lists.groups-large :groups="$groups" :account="$account" :show-category="true" :show-budget="true" />
<p>
<span class="bi bi-calendar"></span>
diff --git a/resources/views/bills/show.blade.php b/resources/views/bills/show.blade.php
index a61b2ae8de..43df788d08 100644
--- a/resources/views/bills/show.blade.php
+++ b/resources/views/bills/show.blade.php
@@ -172,7 +172,7 @@
<h3 class="card-title">{{ __('firefly.connected_journals') }}</h3>
</div>
<div class="card-body">
- <x-lists.groups-large :groups="$groups" />
+ <x-lists.groups-large :groups="$groups" :show-category="true" :show-budget="true" />
</div>
</div>
</div>
diff --git a/resources/views/budgets/no-budget.blade.php b/resources/views/budgets/no-budget.blade.php
index b2e41e0b61..0b46b5c921 100644
--- a/resources/views/budgets/no-budget.blade.php
+++ b/resources/views/budgets/no-budget.blade.php
@@ -19,13 +19,13 @@
<div class="card-body">
@if(null !== ($periods ?? null) && count($periods) > 0)
- <x-lists.groups-large :groups="$groups" />
+ <x-lists.groups-large :groups="$groups" :show-category="true" :show-budget="false" />
<p>
<span class="bi bi-calendar"></span>
<a href="{{ route('budgets.no-budget-all') }}">{{ __('firefly.show_all_no_filter') }}</a>
</p>
@else
- <x-lists.groups-large :groups="$groups" />
+ <x-lists.groups-large :groups="$groups" :show-category="true" :show-budget="false" />
<p>
<span class="bi bi-calendar"></span>
<a href="{{ route('budgets.no-budget') }}">{{ __('firefly.show_the_current_period_and_overview') }}</a>
diff --git a/resources/views/budgets/show.blade.php b/resources/views/budgets/show.blade.php
index b0adeea5cf..c75dd22986 100644
--- a/resources/views/budgets/show.blade.php
+++ b/resources/views/budgets/show.blade.php
@@ -127,7 +127,7 @@
<h3 class="card-title">{{ __('firefly.transactions') }}</h3>
</div>
<div class="card-body">
- <x-lists.groups-large :groups="$groups" />
+ <x-lists.groups-large :groups="$groups" :show-category="true" :show-budget="false"/>
@if(null !== ($budgetLimit ?? null))
<p>
<span class="bi bi-calendar"></span>
diff --git a/resources/views/components/lists/groups-large.blade.php b/resources/views/components/lists/groups-large.blade.php
index a01597bace..5828c88be9 100644
--- a/resources/views/components/lists/groups-large.blade.php
+++ b/resources/views/components/lists/groups-large.blade.php
@@ -1,7 +1,7 @@
<table class="table table-sm">
<thead>
<tr>
- @if(($showCategory ?? false) || ($showBudget ?? false))
+ @if($showCategory || $showBudget)
<td colspan="8">
@if(method_exists($groups, 'links'))
{{ $groups->links('pagination.bootstrap-4') }}
@@ -41,10 +41,10 @@
<th>{{ trans('list.date') }}</th>
<th>{{ trans('list.source_account') }}</th>
<th>{{ trans('list.destination_account') }}</th>
- @if(($showCategory ?? false))
+ @if($showCategory)
<th class="d-xs-none">{{ trans('list.category') }}</th>
@endif
- @if($showBudget ?? false)
+ @if($showBudget)
<th class="d-xs-none">{{ trans('list.budget') }}</th>
@endif
<th class="d-xs-none">&nbsp;</th><!-- actions -->
@@ -79,7 +79,7 @@
@endforeach
</td>
<!-- column to span accounts + extra fields -->
- @if(($showCategory ?? false) || $showBudget ?? false)
+ @if($showCategory || $showBudget)
<td colspan="5" class="top-light-border">&nbsp;</td>
@else
<td colspan="4" class="top-light-border">&nbsp;</td>
@@ -166,14 +166,14 @@
<a href="{{ route('accounts.show', [$transaction['destination_account_id'] ?? 1]) }}" title="{{ $transaction['destination_account_iban'] ?? $transaction['destination_account_name'] }}">{{ $transaction['destination_account_name'] }}</a>
@endif
</td>
- @if($showCategory ?? false)
+ @if($showCategory)
<td class="d-xs-none {{ $className }}">
@if(null !== $transaction['category_id'])
<a href="{{ route('categories.show', [$transaction['category_id']]) }}" title="{{ $transaction['category_name'] }}">{{ $transaction['category_name'] }}</a>
@endif
</td>
@endif
- @if($showBudget ?? false)
+ @if($showBudget)
<td class="d-xs-none {{ $className }}">
@if(null !== $transaction['budget_id'])
<a href="{{ route('budgets.show', [$transaction['budget_id']]) }}"
@@ -237,7 +237,7 @@
</tr>
<tr>
- @if(($showCategory ?? false) || ($showBudget ?? false))
+ @if($showCategory || $showBudget)
<td colspan="8">
@if(method_exists($groups, 'links'))
{{ $groups->links('pagination.bootstrap-4') }}
diff --git a/resources/views/recurring/show.blade.php b/resources/views/recurring/show.blade.php
index 84ba0a5ed2..27de371648 100644
--- a/resources/views/recurring/show.blade.php
+++ b/resources/views/recurring/show.blade.php
@@ -202,7 +202,7 @@
</h3>
</div>
<div class="card-body">
- <x-lists.groups-large :groups="$groups" />
+ <x-lists.groups-large :groups="$groups" :show-category="true" :show-budget="true" />
</div>
</div>
</div>
diff --git a/resources/views/search/search.blade.php b/resources/views/search/search.blade.php
index 2729fedd8c..625682c9da 100644
--- a/resources/views/search/search.blade.php
+++ b/resources/views/search/search.blade.php
@@ -8,4 +8,4 @@
@endif
</p>
-<x-lists.groups-large :groups="$groups" />
+<x-lists.groups-large :groups="$groups" :show-category="true" :show-budget="true" />
diff --git a/resources/views/transactions/index.blade.php b/resources/views/transactions/index.blade.php
index c7bc3817ec..2bbe8b8194 100644
--- a/resources/views/transactions/index.blade.php
+++ b/resources/views/transactions/index.blade.php
@@ -66,7 +66,7 @@
<div class="card mb-2">
<x-elements.card-header-with-menu :cardTitle="$subTitle" :route="route('transactions.create', [$objectType])" :linkTitle="__('firefly.create_new_transaction')" />
<div class="card-body p-0">
- <x-lists.groups-large :groups="$groups" :account="null" />
+ <x-lists.groups-large :groups="$groups" :account="null" :show-category="true" :show-budget="true" />
</div>
<div class="card-footer">
{{-- links for other views --}}