From b29c35864cdee35af91735f4e6a4eb000a38b726 Mon Sep 17 00:00:00 2001 From: Sander Dorigo Date: Tue, 7 Oct 2025 09:49:35 +0200 Subject: [PATCH 1/7] Fix #11015 --- app/Api/V1/Controllers/Models/Account/ShowController.php | 4 ++-- .../Controllers/Models/TransactionCurrency/ListController.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Api/V1/Controllers/Models/Account/ShowController.php b/app/Api/V1/Controllers/Models/Account/ShowController.php index 33c2e100d1..586bdbedd7 100644 --- a/app/Api/V1/Controllers/Models/Account/ShowController.php +++ b/app/Api/V1/Controllers/Models/Account/ShowController.php @@ -88,7 +88,7 @@ class ShowController extends Controller $accounts = $collection->slice(($this->parameters->get('page') - 1) * $params['limit'], $params['limit']); // #11007 go to the end of the previous day. - $this->parameters->set('start', $this->parameters->get('start')->subSecond()); + $this->parameters->set('start', $this->parameters->get('start')?->subSecond()); // enrich /** @var User $admin */ @@ -129,7 +129,7 @@ class ShowController extends Controller $manager = $this->getManager(); // #11007 go to the end of the previous day. - $this->parameters->set('start', $this->parameters->get('start')->subSecond()); + $this->parameters->set('start', $this->parameters->get('start')?->subSecond()); // enrich /** @var User $admin */ diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php index a80200038d..295eb13d08 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php @@ -101,7 +101,7 @@ class ListController extends Controller $accounts = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // #11007 go to the end of the previous day. - $this->parameters->set('start', $this->parameters->get('start')->subSecond()); + $this->parameters->set('start', $this->parameters->get('start')?->subSecond()); // enrich /** @var User $admin */ From 435ca994cf39d1414d33a92bb6a0a4844a853953 Mon Sep 17 00:00:00 2001 From: Sander Dorigo Date: Tue, 7 Oct 2025 09:52:29 +0200 Subject: [PATCH 2/7] Fix #11016 --- .../JsonApi/Enrichments/SubscriptionEnrichment.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php index 68c3dc0f12..196885b0e0 100644 --- a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php +++ b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php @@ -82,10 +82,9 @@ class SubscriptionEnrichment implements EnrichmentInterface // TODO clean me up. $notes = $this->notes; - $objectGroups = $this->objectGroups; $paidDates = $this->paidDates; $payDates = $this->payDates; - $this->collection = $this->collection->map(function (Bill $item) use ($notes, $objectGroups, $paidDates, $payDates) { + $this->collection = $this->collection->map(function (Bill $item) use ($notes, $paidDates, $payDates) { $id = (int)$item->id; $currency = $item->transactionCurrency; $nem = $this->getNextExpectedMatch($payDates[$id] ?? []); @@ -123,9 +122,11 @@ class SubscriptionEnrichment implements EnrichmentInterface // add object group if available if (array_key_exists($id, $this->mappedObjects)) { $key = $this->mappedObjects[$id]; - $meta['object_group_id'] = (string)$objectGroups[$key]['id']; - $meta['object_group_title'] = $objectGroups[$key]['title']; - $meta['object_group_order'] = $objectGroups[$key]['order']; + if(array_key_exists($key, $this->objectGroups)) { + $meta['object_group_id'] = (string)$this->objectGroups[$key]['id']; + $meta['object_group_title'] = $this->objectGroups[$key]['title']; + $meta['object_group_order'] = $this->objectGroups[$key]['order']; + } } // Add notes if available. From 52e08bb9eb146c7fce9c64e42383f5755e76b9f9 Mon Sep 17 00:00:00 2001 From: Sander Dorigo Date: Tue, 7 Oct 2025 09:52:39 +0200 Subject: [PATCH 3/7] Update changelog --- changelog.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index cb35c5e344..16e6703e7e 100644 --- a/changelog.md +++ b/changelog.md @@ -3,7 +3,17 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## 6.4.1 - 2025-09-15 + +## 6.4.2 - 2055-10-07 + +Everything from v6.4.1, plus: + +### Fixed + +- #11015 +- #11016 + +## 6.4.1 - 2025-10-07 ### Added From 66393099352397159ea8fe99a95621f063de0778 Mon Sep 17 00:00:00 2001 From: JC5 Date: Tue, 7 Oct 2025 09:58:06 +0200 Subject: [PATCH 4/7] =?UTF-8?q?=F0=9F=A4=96=20Auto=20commit=20for=20releas?= =?UTF-8?q?e=20'develop'=20on=202025-10-07?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php | 4 ++-- changelog.md | 4 ++-- config/firefly.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php index 196885b0e0..3068c45d88 100644 --- a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php +++ b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php @@ -121,8 +121,8 @@ class SubscriptionEnrichment implements EnrichmentInterface // add object group if available if (array_key_exists($id, $this->mappedObjects)) { - $key = $this->mappedObjects[$id]; - if(array_key_exists($key, $this->objectGroups)) { + $key = $this->mappedObjects[$id]; + if (array_key_exists($key, $this->objectGroups)) { $meta['object_group_id'] = (string)$this->objectGroups[$key]['id']; $meta['object_group_title'] = $this->objectGroups[$key]['title']; $meta['object_group_order'] = $this->objectGroups[$key]['order']; diff --git a/changelog.md b/changelog.md index 16e6703e7e..d7cc07996a 100644 --- a/changelog.md +++ b/changelog.md @@ -10,8 +10,8 @@ Everything from v6.4.1, plus: ### Fixed -- #11015 -- #11016 +- [Issue 11015](https://github.com/firefly-iii/firefly-iii/issues/11015) (Call to a member function subSecond() on null when viewing accounts) reported by @sirgio145 +- [Issue 11016](https://github.com/firefly-iii/firefly-iii/issues/11016) (Undefined array key 1 when viewing subscriptions) reported by @anuneo ## 6.4.1 - 2025-10-07 diff --git a/config/firefly.php b/config/firefly.php index 35f9953702..23b376a208 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -78,8 +78,8 @@ return [ 'running_balance_column' => env('USE_RUNNING_BALANCE', false), // see cer.php for exchange rates feature flag. ], - 'version' => '6.4.1', - 'build_time' => 1759814318, + 'version' => 'develop/2025-10-07', + 'build_time' => 1759823774, 'api_version' => '2.1.0', // field is no longer used. 'db_version' => 28, // field is no longer used. From 11e721c6c9d871ca0c2d95fac1c46b3fae7c7b88 Mon Sep 17 00:00:00 2001 From: Nicky De Maeyer Date: Tue, 7 Oct 2025 10:03:26 +0200 Subject: [PATCH 5/7] fix #11018, set end date to endOfDay --- .../V1/Controllers/Models/TransactionCurrency/ListController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php index 295eb13d08..159a030472 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php @@ -102,6 +102,7 @@ class ListController extends Controller // #11007 go to the end of the previous day. $this->parameters->set('start', $this->parameters->get('start')?->subSecond()); + $this->parameters->set('end', $this->parameters->get('end')?->endOfDay()); // enrich /** @var User $admin */ From 651e11ed1c87c189411767b3b20ad8b578fee544 Mon Sep 17 00:00:00 2001 From: Sander Dorigo Date: Tue, 7 Oct 2025 10:06:54 +0200 Subject: [PATCH 6/7] Fix #11018 --- app/Api/V1/Controllers/Models/Account/ShowController.php | 4 ++++ .../Controllers/Models/TransactionCurrency/ListController.php | 1 + changelog.md | 1 + 3 files changed, 6 insertions(+) diff --git a/app/Api/V1/Controllers/Models/Account/ShowController.php b/app/Api/V1/Controllers/Models/Account/ShowController.php index 586bdbedd7..587076d0db 100644 --- a/app/Api/V1/Controllers/Models/Account/ShowController.php +++ b/app/Api/V1/Controllers/Models/Account/ShowController.php @@ -89,6 +89,8 @@ class ShowController extends Controller // #11007 go to the end of the previous day. $this->parameters->set('start', $this->parameters->get('start')?->subSecond()); + // #11018 also end of the day. + $this->parameters->set('end', $this->parameters->get('end')?->endOfDay()); // enrich /** @var User $admin */ @@ -130,6 +132,8 @@ class ShowController extends Controller // #11007 go to the end of the previous day. $this->parameters->set('start', $this->parameters->get('start')?->subSecond()); + // #11018 also end of the day. + $this->parameters->set('end', $this->parameters->get('end')?->endOfDay()); // enrich /** @var User $admin */ diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php index 159a030472..3864806bb5 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php @@ -102,6 +102,7 @@ class ListController extends Controller // #11007 go to the end of the previous day. $this->parameters->set('start', $this->parameters->get('start')?->subSecond()); + // #11018 also end of the day. $this->parameters->set('end', $this->parameters->get('end')?->endOfDay()); // enrich diff --git a/changelog.md b/changelog.md index d7cc07996a..979ef9747e 100644 --- a/changelog.md +++ b/changelog.md @@ -12,6 +12,7 @@ Everything from v6.4.1, plus: - [Issue 11015](https://github.com/firefly-iii/firefly-iii/issues/11015) (Call to a member function subSecond() on null when viewing accounts) reported by @sirgio145 - [Issue 11016](https://github.com/firefly-iii/firefly-iii/issues/11016) (Undefined array key 1 when viewing subscriptions) reported by @anuneo +- #11018 ## 6.4.1 - 2025-10-07 From 6029fe2e8496b020c6824f176e74997cebb5cd75 Mon Sep 17 00:00:00 2001 From: JC5 Date: Tue, 7 Oct 2025 10:11:37 +0200 Subject: [PATCH 7/7] =?UTF-8?q?=F0=9F=A4=96=20Auto=20commit=20for=20releas?= =?UTF-8?q?e=20'v6.4.2'=20on=202025-10-07?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- changelog.md | 2 +- config/firefly.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changelog.md b/changelog.md index 979ef9747e..e04c8b79a9 100644 --- a/changelog.md +++ b/changelog.md @@ -12,7 +12,7 @@ Everything from v6.4.1, plus: - [Issue 11015](https://github.com/firefly-iii/firefly-iii/issues/11015) (Call to a member function subSecond() on null when viewing accounts) reported by @sirgio145 - [Issue 11016](https://github.com/firefly-iii/firefly-iii/issues/11016) (Undefined array key 1 when viewing subscriptions) reported by @anuneo -- #11018 +- [Issue 11018](https://github.com/firefly-iii/firefly-iii/issues/11018) (/v1/accounts balance_difference last day is not accounted for) reported by @ctrl-f5 ## 6.4.1 - 2025-10-07 diff --git a/config/firefly.php b/config/firefly.php index 23b376a208..8bdd78ce6e 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -78,8 +78,8 @@ return [ 'running_balance_column' => env('USE_RUNNING_BALANCE', false), // see cer.php for exchange rates feature flag. ], - 'version' => 'develop/2025-10-07', - 'build_time' => 1759823774, + 'version' => '6.4.2', + 'build_time' => 1759824590, 'api_version' => '2.1.0', // field is no longer used. 'db_version' => 28, // field is no longer used.