mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-16 09:22:33 +00:00
Compare commits
9 Commits
develop-20
...
develop-20
Author | SHA1 | Date | |
---|---|---|---|
|
cbd50634a4 | ||
|
f475393bc1 | ||
|
abcddb09bf | ||
|
cf71a0fc55 | ||
|
78253f9e1e | ||
|
ebd0848c7f | ||
|
c8461eb0b5 | ||
|
a4cbdeaeac | ||
|
3e1ce69d52 |
@@ -103,7 +103,8 @@ class PopupReport implements PopupReportInterface
|
|||||||
|
|
||||||
/** @var GroupCollectorInterface $collector */
|
/** @var GroupCollectorInterface $collector */
|
||||||
$collector = app(GroupCollectorInterface::class);
|
$collector = app(GroupCollectorInterface::class);
|
||||||
$collector->setAccounts($attributes['accounts'])
|
$collector
|
||||||
|
->setAccounts($attributes['accounts'])
|
||||||
->withAccountInformation()
|
->withAccountInformation()
|
||||||
->withBudgetInformation()
|
->withBudgetInformation()
|
||||||
->withCategoryInformation()
|
->withCategoryInformation()
|
||||||
@@ -113,11 +114,10 @@ class PopupReport implements PopupReportInterface
|
|||||||
if (null !== $currency) {
|
if (null !== $currency) {
|
||||||
$collector->setCurrency($currency);
|
$collector->setCurrency($currency);
|
||||||
}
|
}
|
||||||
|
if (null === $budget->id || 0 === $budget->id) {
|
||||||
if (null === $budget->id) {
|
|
||||||
$collector->setTypes([TransactionType::WITHDRAWAL])->withoutBudget();
|
$collector->setTypes([TransactionType::WITHDRAWAL])->withoutBudget();
|
||||||
}
|
}
|
||||||
if (null !== $budget->id) {
|
if (null !== $budget->id && 0 !== $budget->id) {
|
||||||
$collector->setBudget($budget);
|
$collector->setBudget($budget);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -115,6 +115,7 @@ trait RenderPartialViews
|
|||||||
|
|
||||||
$budget = $budgetRepository->find((int)$attributes['budgetId']);
|
$budget = $budgetRepository->find((int)$attributes['budgetId']);
|
||||||
if (null === $budget) {
|
if (null === $budget) {
|
||||||
|
// transactions without a budget.
|
||||||
$budget = new Budget();
|
$budget = new Budget();
|
||||||
}
|
}
|
||||||
$journals = $popupHelper->byBudget($budget, $attributes);
|
$journals = $popupHelper->byBudget($budget, $attributes);
|
||||||
|
@@ -81,8 +81,6 @@ class AccountBalanceCalculator
|
|||||||
private function getLatestBalance(int $accountId, int $currencyId, ?Carbon $notBefore): string
|
private function getLatestBalance(int $accountId, int $currencyId, ?Carbon $notBefore): string
|
||||||
{
|
{
|
||||||
if (null === $notBefore) {
|
if (null === $notBefore) {
|
||||||
Log::debug('getLatestBalance: no notBefore date, returning 0');
|
|
||||||
|
|
||||||
return '0';
|
return '0';
|
||||||
}
|
}
|
||||||
Log::debug(sprintf('getLatestBalance: notBefore date is "%s", calculating', $notBefore->format('Y-m-d')));
|
Log::debug(sprintf('getLatestBalance: notBefore date is "%s", calculating', $notBefore->format('Y-m-d')));
|
||||||
|
@@ -74,6 +74,7 @@ class General extends AbstractExtension
|
|||||||
|
|
||||||
$strings = [];
|
$strings = [];
|
||||||
foreach ($info as $currencyId => $balance) {
|
foreach ($info as $currencyId => $balance) {
|
||||||
|
$balance = (string) $balance;
|
||||||
if (0 === $currencyId) {
|
if (0 === $currencyId) {
|
||||||
// not good code but OK
|
// not good code but OK
|
||||||
/** @var AccountRepositoryInterface $accountRepos */
|
/** @var AccountRepositoryInterface $accountRepos */
|
||||||
|
26
changelog.md
26
changelog.md
@@ -5,10 +5,36 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
|||||||
|
|
||||||
## 6.1.21 - 2024-09-30
|
## 6.1.21 - 2024-09-30
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Enabled the expression engine built by @michaelhthomas. Read more about it in [the documentation](https://docs.firefly-iii.org/references/firefly-iii/rule-expressions/).
|
||||||
|
- Add running balance data, see if it can be used in the layout in the future.
|
||||||
|
- [PR 9160](https://github.com/firefly-iii/firefly-iii/pull/9160) (add test cases for api/v1/autocomplete/CategoryController) reported by @tasnim0tantawi
|
||||||
|
- [PR 9178](https://github.com/firefly-iii/firefly-iii/pull/9178) (Add test cases for Api\V1\Controllers\Autocomplete\BillController & BudgetController) reported by @tasnim0tantawi
|
||||||
|
- [PR 9171](https://github.com/firefly-iii/firefly-iii/pull/9171) (Add about test) reported by @mzhubail
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- [PR 9096](https://github.com/firefly-iii/firefly-iii/pull/9096) (chore: fix some comments) reported by @withbest
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
|
- [Issue 9078](https://github.com/firefly-iii/firefly-iii/issues/9078) (bcadd exception while using POST transactions) reported by @dbtdsilva
|
||||||
|
- [Discussion 9080](https://github.com/orgs/firefly-iii/discussions/9080) (Incorrect sorting on expense accounts) started by @pc-zookeeper
|
||||||
|
- [Issue 9084](https://github.com/firefly-iii/firefly-iii/issues/9084) (API Call for bills/nextExpectedMatch does not update) reported by @marcelweikum
|
||||||
|
- [Issue 9103](https://github.com/firefly-iii/firefly-iii/issues/9103) (Default Currency does not apply to Accounts.) reported by @chrisgriff1512
|
||||||
|
- [Issue 9140](https://github.com/firefly-iii/firefly-iii/issues/9140) (Dashboard 'Today' option chooses 1st of month (not current date)) reported by @PAS-BC
|
||||||
|
- [PR 9179](https://github.com/firefly-iii/firefly-iii/pull/9179) (fix Navigation.php MTD logic to make tests pass.) reported by @tasnim0tantawi
|
||||||
|
- [PR 9239](https://github.com/firefly-iii/firefly-iii/pull/9239) (Fix webhook index page when Firefly is not served at root) reported by @jfpedroza
|
||||||
|
- [Issue 9168](https://github.com/firefly-iii/firefly-iii/issues/9168) (Custom logout URL doesn't work.) reported by @JC5
|
||||||
|
- [Issue 9155](https://github.com/firefly-iii/firefly-iii/issues/9155) (internal_reference_is does not correctly match numeric internal references) reported by @Lrns123
|
||||||
- [Issue 9275](https://github.com/firefly-iii/firefly-iii/issues/9275) (Long wait when editing a transaction) reported by @JC5
|
- [Issue 9275](https://github.com/firefly-iii/firefly-iii/issues/9275) (Long wait when editing a transaction) reported by @JC5
|
||||||
- [Issue 9278](https://github.com/firefly-iii/firefly-iii/issues/9278) (Update to v6.1.20 changed Balance of Account) reported by @JeuJeus
|
- [Issue 9278](https://github.com/firefly-iii/firefly-iii/issues/9278) (Update to v6.1.20 changed Balance of Account) reported by @JeuJeus
|
||||||
|
- [Issue 9281](https://github.com/firefly-iii/firefly-iii/issues/9281) (Update to v6.1.20 leads to a type error) reported by @krakonos1602
|
||||||
|
|
||||||
|
### API
|
||||||
|
|
||||||
|
- Expand v2 API
|
||||||
|
|
||||||
## 6.1.20 - 2024-09-29
|
## 6.1.20 - 2024-09-29
|
||||||
|
|
||||||
|
36
composer.lock
generated
36
composer.lock
generated
@@ -3473,16 +3473,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "league/flysystem",
|
"name": "league/flysystem",
|
||||||
"version": "3.28.0",
|
"version": "3.29.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/thephpleague/flysystem.git",
|
"url": "https://github.com/thephpleague/flysystem.git",
|
||||||
"reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c"
|
"reference": "0adc0d9a51852e170e0028a60bd271726626d3f0"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c",
|
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0adc0d9a51852e170e0028a60bd271726626d3f0",
|
||||||
"reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c",
|
"reference": "0adc0d9a51852e170e0028a60bd271726626d3f0",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -3550,22 +3550,22 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/thephpleague/flysystem/issues",
|
"issues": "https://github.com/thephpleague/flysystem/issues",
|
||||||
"source": "https://github.com/thephpleague/flysystem/tree/3.28.0"
|
"source": "https://github.com/thephpleague/flysystem/tree/3.29.0"
|
||||||
},
|
},
|
||||||
"time": "2024-05-22T10:09:12+00:00"
|
"time": "2024-09-29T11:59:11+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "league/flysystem-local",
|
"name": "league/flysystem-local",
|
||||||
"version": "3.28.0",
|
"version": "3.29.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/thephpleague/flysystem-local.git",
|
"url": "https://github.com/thephpleague/flysystem-local.git",
|
||||||
"reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40"
|
"reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/13f22ea8be526ea58c2ddff9e158ef7c296e4f40",
|
"url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/e0e8d52ce4b2ed154148453d321e97c8e931bd27",
|
||||||
"reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40",
|
"reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -3599,9 +3599,9 @@
|
|||||||
"local"
|
"local"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/thephpleague/flysystem-local/tree/3.28.0"
|
"source": "https://github.com/thephpleague/flysystem-local/tree/3.29.0"
|
||||||
},
|
},
|
||||||
"time": "2024-05-06T20:05:52+00:00"
|
"time": "2024-08-09T21:24:39+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "league/fractal",
|
"name": "league/fractal",
|
||||||
@@ -10765,16 +10765,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "nikic/php-parser",
|
"name": "nikic/php-parser",
|
||||||
"version": "v5.2.0",
|
"version": "v5.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/nikic/PHP-Parser.git",
|
"url": "https://github.com/nikic/PHP-Parser.git",
|
||||||
"reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb"
|
"reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb",
|
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3abf7425cd284141dc5d8d14a9ee444de3345d1a",
|
||||||
"reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb",
|
"reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -10817,9 +10817,9 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/nikic/PHP-Parser/issues",
|
"issues": "https://github.com/nikic/PHP-Parser/issues",
|
||||||
"source": "https://github.com/nikic/PHP-Parser/tree/v5.2.0"
|
"source": "https://github.com/nikic/PHP-Parser/tree/v5.3.0"
|
||||||
},
|
},
|
||||||
"time": "2024-09-15T16:40:33+00:00"
|
"time": "2024-09-29T13:56:26+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phar-io/manifest",
|
"name": "phar-io/manifest",
|
||||||
|
@@ -110,7 +110,7 @@ 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' => 'develop/2024-09-28',
|
'version' => 'develop/2024-09-30',
|
||||||
'api_version' => '2.1.0',
|
'api_version' => '2.1.0',
|
||||||
'db_version' => 24,
|
'db_version' => 24,
|
||||||
|
|
||||||
|
@@ -61,7 +61,7 @@
|
|||||||
<td class="hidden-xs">
|
<td class="hidden-xs">
|
||||||
{% if budget_limit.spent != 0 %}
|
{% if budget_limit.spent != 0 %}
|
||||||
<span class="fa fa-fw text-muted fa-info-circle firefly-info-button"
|
<span class="fa fa-fw text-muted fa-info-circle firefly-info-button"
|
||||||
data-location="budget-spent-amount" data-currency-id="{{ budget_limit.currency_id }}" data-budget-id="{{ budget.budget_id }}"></span>
|
data-location="budget-spent-amount" data-currency-id="{{ budget_limit.currency_id }}" data-budget-id="{% if '' == budget.budget_id %}0{% else %}{{ budget.budget_id }}{% endif %}"></span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user