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

Auto commit for release 'develop' on 2025-03-14

Browse Source
This commit is contained in:
github-actions
2025-03-14 19:28:44 +01:00
parent a369e61f18
commit c28005f649
19 changed files with 51 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Api/V1/Controllers/Controller.php
View File

@@ -263,7 +263,7 @@ abstract class Controller extends BaseController
// the transformer, at this point, needs to collect information that ALL items in the collection // the transformer, at this point, needs to collect information that ALL items in the collection
// require, like meta-data and stuff like that, and save it for later. // require, like meta-data and stuff like that, and save it for later.
//$objects = $transformer->collectMetaData($objects); // $objects = $transformer->collectMetaData($objects);
$paginator->setCollection($objects); $paginator->setCollection($objects);
$resource = new FractalCollection($objects, $transformer, $key); $resource = new FractalCollection($objects, $transformer, $key);
@@ -284,7 +284,7 @@ abstract class Controller extends BaseController
$baseUrl = sprintf('%s/api/v1', request()->getSchemeAndHttpHost()); $baseUrl = sprintf('%s/api/v1', request()->getSchemeAndHttpHost());
$manager->setSerializer(new JsonApiSerializer($baseUrl)); $manager->setSerializer(new JsonApiSerializer($baseUrl));
//$transformer->collectMetaData(new Collection([$object])); // $transformer->collectMetaData(new Collection([$object]));
$resource = new Item($object, $transformer, $key); $resource = new Item($object, $transformer, $key);

4
app/Api/V2/Controllers/Controller.php
View File

@@ -167,7 +167,7 @@ class Controller extends BaseController
// the transformer, at this point, needs to collect information that ALL items in the collection // the transformer, at this point, needs to collect information that ALL items in the collection
// require, like meta-data and stuff like that, and save it for later. // require, like meta-data and stuff like that, and save it for later.
//$objects = $transformer->collectMetaData($objects); // $objects = $transformer->collectMetaData($objects);
$paginator->setCollection($objects); $paginator->setCollection($objects);
$resource = new FractalCollection($objects, $transformer, $key); $resource = new FractalCollection($objects, $transformer, $key);
@@ -188,7 +188,7 @@ class Controller extends BaseController
$baseUrl = request()->getSchemeAndHttpHost().'/api/v2'; $baseUrl = request()->getSchemeAndHttpHost().'/api/v2';
$manager->setSerializer(new JsonApiSerializer($baseUrl)); $manager->setSerializer(new JsonApiSerializer($baseUrl));
//$transformer->collectMetaData(new Collection([$object])); // $transformer->collectMetaData(new Collection([$object]));
$resource = new Item($object, $transformer, $key); $resource = new Item($object, $transformer, $key);

3
app/Repositories/Account/AccountRepository.php
View File

@@ -680,7 +680,8 @@ class AccountRepository implements AccountRepositoryInterface, UserGroupInterfac
// fields // fields
'transaction_journals.date', 'transaction_types.type', 'transaction_journals.transaction_currency_id', 'transactions.amount']) 'transaction_journals.date', 'transaction_types.type', 'transaction_journals.transaction_currency_id', 'transactions.amount'])
->toArray(); ->toArray()
;
} }
} }

12
app/Repositories/Category/NoCategoryRepository.php
View File

@@ -77,9 +77,9 @@ class NoCategoryRepository implements NoCategoryRepositoryInterface, UserGroupIn
$journalId = (int) $journal['transaction_journal_id']; $journalId = (int) $journal['transaction_journal_id'];
$array[$currencyId]['categories'][0]['transaction_journals'][$journalId] $array[$currencyId]['categories'][0]['transaction_journals'][$journalId]
= [ = [
'amount' => app('steam')->negative($journal['amount']), 'amount' => app('steam')->negative($journal['amount']),
'date' => $journal['date'], 'date' => $journal['date'],
]; ];
} }
return $array; return $array;
@@ -123,9 +123,9 @@ class NoCategoryRepository implements NoCategoryRepositoryInterface, UserGroupIn
$journalId = (int) $journal['transaction_journal_id']; $journalId = (int) $journal['transaction_journal_id'];
$array[$currencyId]['categories'][0]['transaction_journals'][$journalId] $array[$currencyId]['categories'][0]['transaction_journals'][$journalId]
= [ = [
'amount' => app('steam')->positive($journal['amount']), 'amount' => app('steam')->positive($journal['amount']),
'date' => $journal['date'], 'date' => $journal['date'],
]; ];
} }
return $array; return $array;

30
app/Support/Http/Controllers/PeriodOverview.php
View File

@@ -109,14 +109,14 @@ trait PeriodOverview
[$transactions, $transferredIn] = $this->filterTransfers('in', $transactions, $currentDate['start'], $currentDate['end']); [$transactions, $transferredIn] = $this->filterTransfers('in', $transactions, $currentDate['start'], $currentDate['end']);
$entries[] $entries[]
= [ = [
'title' => $title, 'title' => $title,
'route' => route('accounts.show', [$account->id, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]), 'route' => route('accounts.show', [$account->id, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),
'total_transactions' => count($spent) + count($earned) + count($transferredAway) + count($transferredIn), 'total_transactions' => count($spent) + count($earned) + count($transferredAway) + count($transferredIn),
'spent' => $this->groupByCurrency($spent), 'spent' => $this->groupByCurrency($spent),
'earned' => $this->groupByCurrency($earned), 'earned' => $this->groupByCurrency($earned),
'transferred_away' => $this->groupByCurrency($transferredAway), 'transferred_away' => $this->groupByCurrency($transferredAway),
'transferred_in' => $this->groupByCurrency($transferredIn), 'transferred_in' => $this->groupByCurrency($transferredIn),
]; ];
} }
$cache->store($entries); $cache->store($entries);
Timer::stop('account-period-total'); Timer::stop('account-period-total');
@@ -603,13 +603,13 @@ trait PeriodOverview
} }
$entries[] $entries[]
= [ = [
'title' => $title, 'title' => $title,
'route' => route('transactions.index', [$transactionType, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]), 'route' => route('transactions.index', [$transactionType, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),
'total_transactions' => count($spent) + count($earned) + count($transferred), 'total_transactions' => count($spent) + count($earned) + count($transferred),
'spent' => $this->groupByCurrency($spent), 'spent' => $this->groupByCurrency($spent),
'earned' => $this->groupByCurrency($earned), 'earned' => $this->groupByCurrency($earned),
'transferred' => $this->groupByCurrency($transferred), 'transferred' => $this->groupByCurrency($transferred),
]; ];
} }
return $entries; return $entries;

1
app/Transformers/ExchangeRateTransformer.php
View File

@@ -1,4 +1,5 @@
<?php <?php
/* /*
* ExchangeRateTransformer.php * ExchangeRateTransformer.php
* Copyright (c) 2025 james@firefly-iii.org. * Copyright (c) 2025 james@firefly-iii.org.

1
app/Transformers/UserGroupTransformer.php
View File

@@ -28,7 +28,6 @@ use FireflyIII\Enums\UserRoleEnum;
use FireflyIII\Models\GroupMembership; use FireflyIII\Models\GroupMembership;
use FireflyIII\Models\UserGroup; use FireflyIII\Models\UserGroup;
use FireflyIII\Support\Facades\Amount; use FireflyIII\Support\Facades\Amount;
use FireflyIII\Transformers\AbstractTransformer;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;

1
app/Transformers/V2/AbstractTransformer.php
View File

@@ -30,6 +30,7 @@ use Symfony\Component\HttpFoundation\ParameterBag;
/** /**
* Class AbstractTransformer * Class AbstractTransformer
*
* @deprecated * @deprecated
*/ */
abstract class AbstractTransformer extends TransformerAbstract abstract class AbstractTransformer extends TransformerAbstract

1
app/Transformers/V2/AccountTransformer.php
View File

@@ -36,6 +36,7 @@ use Illuminate\Support\Facades\Log;
/** /**
* Class AccountTransformer * Class AccountTransformer
*
* @deprecated * @deprecated
*/ */
class AccountTransformer extends AbstractTransformer class AccountTransformer extends AbstractTransformer

1
app/Transformers/V2/BillTransformer.php
View File

@@ -40,6 +40,7 @@ use Illuminate\Support\Facades\Log;
/** /**
* Class BillTransformer * Class BillTransformer
*
* @deprecated * @deprecated
*/ */
class BillTransformer extends AbstractTransformer class BillTransformer extends AbstractTransformer

1
app/Transformers/V2/BudgetLimitTransformer.php
View File

@@ -30,6 +30,7 @@ use League\Fractal\Resource\Item;
/** /**
* Class BudgetLimitTransformer * Class BudgetLimitTransformer
*
* @deprecated * @deprecated
*/ */
class BudgetLimitTransformer extends AbstractTransformer class BudgetLimitTransformer extends AbstractTransformer

1
app/Transformers/V2/BudgetTransformer.php
View File

@@ -30,6 +30,7 @@ use Symfony\Component\HttpFoundation\ParameterBag;
/** /**
* Class BudgetTransformer * Class BudgetTransformer
*
* @deprecated * @deprecated
*/ */
class BudgetTransformer extends AbstractTransformer class BudgetTransformer extends AbstractTransformer

1
app/Transformers/V2/CurrencyTransformer.php
View File

@@ -29,6 +29,7 @@ use Illuminate\Support\Collection;
/** /**
* Class CurrencyTransformer * Class CurrencyTransformer
*
* @deprecated * @deprecated
*/ */
class CurrencyTransformer extends AbstractTransformer class CurrencyTransformer extends AbstractTransformer

1
app/Transformers/V2/ExchangeRateTransformer.php
View File

@@ -29,6 +29,7 @@ use Illuminate\Support\Collection;
/** /**
* Class AccountTransformer * Class AccountTransformer
*
* @deprecated * @deprecated
*/ */
class ExchangeRateTransformer extends AbstractTransformer class ExchangeRateTransformer extends AbstractTransformer

1
app/Transformers/V2/PiggyBankTransformer.php
View File

@@ -41,6 +41,7 @@ use Illuminate\Support\Facades\Log;
/** /**
* Class PiggyBankTransformer * Class PiggyBankTransformer
*
* @deprecated * @deprecated
*/ */
class PiggyBankTransformer extends AbstractTransformer class PiggyBankTransformer extends AbstractTransformer

1
app/Transformers/V2/PreferenceTransformer.php
View File

@@ -29,6 +29,7 @@ use Illuminate\Support\Collection;
/** /**
* Class PreferenceTransformer * Class PreferenceTransformer
*
* @deprecated * @deprecated
*/ */
class PreferenceTransformer extends AbstractTransformer class PreferenceTransformer extends AbstractTransformer

1
app/Transformers/V2/TransactionGroupTransformer.php
View File

@@ -43,6 +43,7 @@ use Illuminate\Support\Facades\DB;
/** /**
* Class TransactionGroupTransformer * Class TransactionGroupTransformer
*
* @deprecated * @deprecated
*/ */
class TransactionGroupTransformer extends AbstractTransformer class TransactionGroupTransformer extends AbstractTransformer

1
app/Transformers/V2/UserGroupTransformer.php
View File

@@ -32,6 +32,7 @@ use Illuminate\Support\Collection;
/** /**
* Class UserGroupTransformer * Class UserGroupTransformer
*
* @deprecated * @deprecated
*/ */
class UserGroupTransformer extends AbstractTransformer class UserGroupTransformer extends AbstractTransformer

24
changelog.md
View File

@@ -7,29 +7,29 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Added ### Added
- #9903 - [PR 9903](https://github.com/firefly-iii/firefly-iii/pull/9903) (Add support for PHP function `strpos` in expressions) reported by @lompi
### Changed ### Changed
- #9972 - [Issue 9972](https://github.com/firefly-iii/firefly-iii/issues/9972) (Important optimization improvement: enable opcache) reported by @jgoclawski
- Greatly improved speed of account overview - Greatly improved speed of account overview
- Better validation of environment variables - Better validation of environment variables
### Fixed ### Fixed
- #9895 - [Issue 9895](https://github.com/firefly-iii/firefly-iii/issues/9895) (Account Balance not updating in Transaction tab) reported by @StoicaRemus
- #9906 - [Issue 9906](https://github.com/firefly-iii/firefly-iii/issues/9906) (404 Not Found when deleting rule group) reported by @EnochPrime
- #9908 - [Issue 9908](https://github.com/firefly-iii/firefly-iii/issues/9908) (HTTP 500 on tags) reported by @wuvs
- #9914 - [Issue 9914](https://github.com/firefly-iii/firefly-iii/issues/9914) (adding money to piggy bank via API broken) reported by @4e868df3
- #9941 - [Issue 9941](https://github.com/firefly-iii/firefly-iii/issues/9941) (has_any_subscription search filter not valid) reported by @PhilWun
- #9948 - [Issue 9948](https://github.com/firefly-iii/firefly-iii/issues/9948) (typo in docker example env file) reported by @amenekowo
- #9954 - [Issue 9954](https://github.com/firefly-iii/firefly-iii/issues/9954) (Creating Bills via API is broken (optional fields are required)) reported by @jsegido
- #9970 - [Discussion 9970](https://github.com/orgs/firefly-iii/discussions/9970) (Category report with tags?) started by @luddeluddis
- #9876 - [Issue 9876](https://github.com/firefly-iii/firefly-iii/issues/9876) (data/bulkUpdateTransactions POST should not requires Content-Type header in request as request body must be empty) reported by @bouil
### API ### API
- #9902 - [Issue 9902](https://github.com/firefly-iii/firefly-iii/issues/9902) (BIC number no longer returned by the /accounts API endpoint) reported by @dawid-czarnecki
## 6.2.9 - 2025-02-22 ## 6.2.9 - 2025-02-22