kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-09 06:07:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11021 from firefly-iii/develop

Browse Source 
🤖 Automatically merge the PR into the main branch.
This commit is contained in:
github-actions[bot]
2025-10-07 10:11:49 +02:00
committed by GitHub
parent 2ddc012549 f21a5b3000
commit b254074867
5 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Api/V1/Controllers/Models/Account/ShowController.php
View File

@@ -88,7 +88,9 @@ class ShowController extends Controller
$accounts = $collection->slice(($this->parameters->get('page') - 1) * $params['limit'], $params['limit']); $accounts = $collection->slice(($this->parameters->get('page') - 1) * $params['limit'], $params['limit']);
// #11007 go to the end of the previous day. // #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());
// #11018 also end of the day.
$this->parameters->set('end', $this->parameters->get('end')?->endOfDay());
// enrich // enrich
/** @var User $admin */ /** @var User $admin */
@@ -129,7 +131,9 @@ class ShowController extends Controller
$manager = $this->getManager(); $manager = $this->getManager();
// #11007 go to the end of the previous day. // #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());
// #11018 also end of the day.
$this->parameters->set('end', $this->parameters->get('end')?->endOfDay());
// enrich // enrich
/** @var User $admin */ /** @var User $admin */

4
app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php
View File

@@ -101,7 +101,9 @@ class ListController extends Controller
$accounts = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); $accounts = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
// #11007 go to the end of the previous day. // #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());
// #11018 also end of the day.
$this->parameters->set('end', $this->parameters->get('end')?->endOfDay());
// enrich // enrich
/** @var User $admin */ /** @var User $admin */

11
app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php
View File

@@ -82,10 +82,9 @@ class SubscriptionEnrichment implements EnrichmentInterface
// TODO clean me up. // TODO clean me up.
$notes = $this->notes; $notes = $this->notes;
$objectGroups = $this->objectGroups;
$paidDates = $this->paidDates; $paidDates = $this->paidDates;
$payDates = $this->payDates; $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; $id = (int)$item->id;
$currency = $item->transactionCurrency; $currency = $item->transactionCurrency;
$nem = $this->getNextExpectedMatch($payDates[$id] ?? []); $nem = $this->getNextExpectedMatch($payDates[$id] ?? []);
@@ -123,9 +122,11 @@ class SubscriptionEnrichment implements EnrichmentInterface
// add object group if available // add object group if available
if (array_key_exists($id, $this->mappedObjects)) { if (array_key_exists($id, $this->mappedObjects)) {
$key = $this->mappedObjects[$id]; $key = $this->mappedObjects[$id];
$meta['object_group_id'] = (string)$objectGroups[$key]['id']; if (array_key_exists($key, $this->objectGroups)) {
$meta['object_group_title'] = $objectGroups[$key]['title']; $meta['object_group_id'] = (string)$this->objectGroups[$key]['id'];
$meta['object_group_order'] = $objectGroups[$key]['order']; $meta['object_group_title'] = $this->objectGroups[$key]['title'];
$meta['object_group_order'] = $this->objectGroups[$key]['order'];
}
} }
// Add notes if available. // Add notes if available.

13
changelog.md
View File

@@ -3,7 +3,18 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/). 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
- [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
- [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
### Added ### Added

4
config/firefly.php
View File

@@ -78,8 +78,8 @@ return [
'running_balance_column' => env('USE_RUNNING_BALANCE', false), 'running_balance_column' => env('USE_RUNNING_BALANCE', false),
// see cer.php for exchange rates feature flag. // see cer.php for exchange rates feature flag.
], ],
'version' => '6.4.1', 'version' => '6.4.2',
'build_time' => 1759814318, 'build_time' => 1759824590,
'api_version' => '2.1.0', // field is no longer used. 'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, // field is no longer used. 'db_version' => 28, // field is no longer used.