Compare commits

...

28 Commits

Author SHA1 Message Date
github-actions
6f02eff020 Auto commit for release 'develop' on 2024-11-29 2024-11-29 06:56:47 +01:00
James Cole
64aefe5848 Merge pull request #9495 from firefly-iii/dependabot/npm_and_yarn/develop/i18next-24.0.0
Bump i18next from 23.16.8 to 24.0.0
2024-11-25 07:22:13 +01:00
James Cole
73f2f71b03 Merge pull request #9496 from firefly-iii/dependabot/npm_and_yarn/develop/i18next-http-backend-3.0.1
Bump i18next-http-backend from 2.7.1 to 3.0.1
2024-11-25 07:22:04 +01:00
James Cole
12ee37d700 Switch API to transaction type enums 2024-11-25 07:14:14 +01:00
James Cole
9679c22a27 Fix https://github.com/firefly-iii/firefly-iii/issues/9497 2024-11-25 07:12:36 +01:00
dependabot[bot]
1395c95353 Bump i18next-http-backend from 2.7.1 to 3.0.1
Bumps [i18next-http-backend](https://github.com/i18next/i18next-http-backend) from 2.7.1 to 3.0.1.
- [Changelog](https://github.com/i18next/i18next-http-backend/blob/master/CHANGELOG.md)
- [Commits](https://github.com/i18next/i18next-http-backend/commits/v3.0.1)

---
updated-dependencies:
- dependency-name: i18next-http-backend
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-25 03:21:57 +00:00
dependabot[bot]
4d1fd43c8c Bump i18next from 23.16.8 to 24.0.0
Bumps [i18next](https://github.com/i18next/i18next) from 23.16.8 to 24.0.0.
- [Release notes](https://github.com/i18next/i18next/releases)
- [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/i18next/i18next/compare/v23.16.8...v24.0.0)

---
updated-dependencies:
- dependency-name: i18next
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-25 03:21:31 +00:00
github-actions
71c208c4fb Auto commit for release 'develop' on 2024-11-25 2024-11-25 04:18:55 +01:00
James Cole
91a2a1afc3 Fix https://github.com/firefly-iii/firefly-iii/issues/9492 2024-11-24 15:23:17 +01:00
github-actions
25c1ca2f5d Auto commit for release 'develop' on 2024-11-24 2024-11-24 04:56:25 +01:00
James Cole
6f0bb82f59 Fix missing import 2024-11-24 04:52:33 +01:00
github-actions
22a5184ebe Auto commit for release 'develop' on 2024-11-23 2024-11-23 21:16:06 +01:00
github-actions
17b0b1f43f Auto commit for release 'v6.1.24' on 2024-11-23 2024-11-23 21:07:01 +01:00
James Cole
b61df5ec19 Update changelog 2024-11-23 21:01:58 +01:00
James Cole
1ac7275f83 Fix https://github.com/firefly-iii/firefly-iii/issues/9491 2024-11-23 20:59:08 +01:00
github-actions
cd10d04907 Auto commit for release 'v6.1.23' on 2024-11-23 2024-11-23 19:19:46 +01:00
James Cole
f9b76fcb8b Update changelog for new release. 2024-11-23 19:14:15 +01:00
James Cole
093fa067e6 Merge branches 'develop' and 'develop' of github.com:firefly-iii/firefly-iii into develop 2024-11-23 16:15:00 +01:00
James Cole
fa655f065b Part of new API, cleanup code. 2024-11-23 16:14:47 +01:00
James Cole
c8f2244912 Merge pull request #9483 from antoniomrfranco/fix/report-sum-foreign-amount
fix: include foreign_amount in transaction sum calculation
2024-11-23 09:45:53 +01:00
James Cole
f3a20e14a6 Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2024-11-23 09:06:36 +01:00
James Cole
33ad47b115 Add import 2024-11-23 09:06:29 +01:00
James Cole
775424d3b7 Merge pull request #9488 from antoniomrfranco/fix/transfer-dest-foreign-info
fix: set dest foreign_amount and foreign_currency_id for foreign transfers
2024-11-23 09:06:07 +01:00
Antônio Franco
c9c86bbd1d fix: set dest foreign_amount and foreign_currency_id for foreign transfers 2024-11-22 13:52:33 -03:00
Antônio Franco
f76a6ad85c fix: include foreign_amount in transaction sum calculation 2024-11-22 09:52:35 -03:00
James Cole
2138b14d89 Add to update as well. 2024-11-22 06:04:32 +01:00
James Cole
1bf61f57f5 Add UTC support. 2024-11-22 06:03:29 +01:00
James Cole
07b55bd71f Fix https://github.com/firefly-iii/firefly-iii/issues/9477 2024-11-19 06:31:49 +01:00
545 changed files with 1233 additions and 596 deletions

View File

@@ -406,16 +406,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
"version": "v3.64.0",
"version": "v3.65.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
"reference": "58dd9c931c785a79739310aef5178928305ffa67"
"reference": "79d4f3e77b250a7d8043d76c6af8f0695e8a469f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/58dd9c931c785a79739310aef5178928305ffa67",
"reference": "58dd9c931c785a79739310aef5178928305ffa67",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/79d4f3e77b250a7d8043d76c6af8f0695e8a469f",
"reference": "79d4f3e77b250a7d8043d76c6af8f0695e8a469f",
"shasum": ""
},
"require": {
@@ -425,7 +425,7 @@
"ext-filter": "*",
"ext-json": "*",
"ext-tokenizer": "*",
"fidry/cpu-core-counter": "^1.0",
"fidry/cpu-core-counter": "^1.2",
"php": "^7.4 || ^8.0",
"react/child-process": "^0.6.5",
"react/event-loop": "^1.0",
@@ -445,18 +445,18 @@
"symfony/stopwatch": "^5.4 || ^6.0 || ^7.0"
},
"require-dev": {
"facile-it/paraunit": "^1.3 || ^2.3",
"infection/infection": "^0.29.5",
"justinrainbow/json-schema": "^5.2",
"facile-it/paraunit": "^1.3.1 || ^2.4",
"infection/infection": "^0.29.8",
"justinrainbow/json-schema": "^5.3 || ^6.0",
"keradus/cli-executor": "^2.1",
"mikey179/vfsstream": "^1.6.11",
"mikey179/vfsstream": "^1.6.12",
"php-coveralls/php-coveralls": "^2.7",
"php-cs-fixer/accessible-object": "^1.1",
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.5",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.5",
"phpunit/phpunit": "^9.6.19 || ^10.5.21 || ^11.2",
"symfony/var-dumper": "^5.4 || ^6.0 || ^7.0",
"symfony/yaml": "^5.4 || ^6.0 || ^7.0"
"phpunit/phpunit": "^9.6.21 || ^10.5.38 || ^11.4.3",
"symfony/var-dumper": "^5.4.47 || ^6.4.15 || ^7.1.8",
"symfony/yaml": "^5.4.45 || ^6.4.13 || ^7.1.6"
},
"suggest": {
"ext-dom": "For handling output formats in XML",
@@ -497,7 +497,7 @@
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.64.0"
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.65.0"
},
"funding": [
{
@@ -505,7 +505,7 @@
"type": "github"
}
],
"time": "2024-08-30T23:09:38+00:00"
"time": "2024-11-25T00:39:24+00:00"
},
{
"name": "psr/container",
@@ -1352,16 +1352,16 @@
},
{
"name": "symfony/deprecation-contracts",
"version": "v3.5.0",
"version": "v3.5.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
"reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
"reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
"reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
"reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
"shasum": ""
},
"require": {
@@ -1399,7 +1399,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0"
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1"
},
"funding": [
{
@@ -1415,7 +1415,7 @@
"type": "tidelift"
}
],
"time": "2024-04-18T09:32:20+00:00"
"time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/event-dispatcher",
@@ -1499,16 +1499,16 @@
},
{
"name": "symfony/event-dispatcher-contracts",
"version": "v3.5.0",
"version": "v3.5.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
"reference": "8f93aec25d41b72493c6ddff14e916177c9efc50"
"reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50",
"reference": "8f93aec25d41b72493c6ddff14e916177c9efc50",
"url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7642f5e970b672283b7823222ae8ef8bbc160b9f",
"reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f",
"shasum": ""
},
"require": {
@@ -1555,7 +1555,7 @@
"standards"
],
"support": {
"source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0"
"source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.1"
},
"funding": [
{
@@ -1571,7 +1571,7 @@
"type": "tidelift"
}
],
"time": "2024-04-18T09:32:20+00:00"
"time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/filesystem",
@@ -1705,16 +1705,16 @@
},
{
"name": "symfony/options-resolver",
"version": "v7.1.6",
"version": "v7.1.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
"reference": "85e95eeede2d41cd146146e98c9c81d9214cae85"
"reference": "0f4099f5306a92487d13b2a4589068c36a93c447"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/85e95eeede2d41cd146146e98c9c81d9214cae85",
"reference": "85e95eeede2d41cd146146e98c9c81d9214cae85",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/0f4099f5306a92487d13b2a4589068c36a93c447",
"reference": "0f4099f5306a92487d13b2a4589068c36a93c447",
"shasum": ""
},
"require": {
@@ -1752,7 +1752,7 @@
"options"
],
"support": {
"source": "https://github.com/symfony/options-resolver/tree/v7.1.6"
"source": "https://github.com/symfony/options-resolver/tree/v7.1.9"
},
"funding": [
{
@@ -1768,7 +1768,7 @@
"type": "tidelift"
}
],
"time": "2024-09-25T14:20:29+00:00"
"time": "2024-11-20T11:08:58+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -2307,16 +2307,16 @@
},
{
"name": "symfony/service-contracts",
"version": "v3.5.0",
"version": "v3.5.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
"reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f"
"reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
"reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
"reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
"shasum": ""
},
"require": {
@@ -2370,7 +2370,7 @@
"standards"
],
"support": {
"source": "https://github.com/symfony/service-contracts/tree/v3.5.0"
"source": "https://github.com/symfony/service-contracts/tree/v3.5.1"
},
"funding": [
{
@@ -2386,7 +2386,7 @@
"type": "tidelift"
}
],
"time": "2024-04-18T09:32:20+00:00"
"time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/stopwatch",

View File

@@ -4,6 +4,7 @@ Over time, many people have contributed to Firefly III. Their efforts are not al
Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution.
## 2024
- Antônio Franco
- yparitcher
- Jhon Pedroza
- mzhubail

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,4 +1,5 @@
<?php
/*
* DestroyController.php
* Copyright (c) 2021 james@firefly-iii.org
@@ -25,11 +26,11 @@ namespace FireflyIII\Api\V1\Controllers\Data;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Data\DestroyRequest;
use FireflyIII\Enums\TransactionTypeEnum;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
@@ -68,7 +69,7 @@ class DestroyController extends Controller
$allExceptAssets = [AccountType::BENEFICIARY, AccountType::CASH, AccountType::CREDITCARD, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::IMPORT, AccountType::INITIAL_BALANCE, AccountType::LIABILITY_CREDIT, AccountType::RECONCILIATION, AccountType::REVENUE];
$all = [AccountType::ASSET, AccountType::BENEFICIARY, AccountType::CASH, AccountType::CREDITCARD, AccountType::DEBT, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::IMPORT, AccountType::INITIAL_BALANCE, AccountType::LIABILITY_CREDIT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::RECONCILIATION];
$liabilities = [AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD];
$transactions = [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER, TransactionType::RECONCILIATION];
$transactions = [TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::TRANSFER->value, TransactionTypeEnum::RECONCILIATION->value];
match ($objects) {
'budgets' => $this->destroyBudgets(),
@@ -86,9 +87,9 @@ class DestroyController extends Controller
'revenue_accounts' => $this->destroyAccounts([AccountType::REVENUE]),
'liabilities' => $this->destroyAccounts($liabilities),
'transactions' => $this->destroyTransactions($transactions),
'withdrawals' => $this->destroyTransactions([TransactionType::WITHDRAWAL]),
'deposits' => $this->destroyTransactions([TransactionType::DEPOSIT]),
'transfers' => $this->destroyTransactions([TransactionType::TRANSFER]),
'withdrawals' => $this->destroyTransactions([TransactionTypeEnum::WITHDRAWAL->value]),
'deposits' => $this->destroyTransactions([TransactionTypeEnum::DEPOSIT->value]),
'transfers' => $this->destroyTransactions([TransactionTypeEnum::TRANSFER->value]),
default => throw new FireflyException(sprintf('200033: This endpoint can\'t handle object "%s"', $objects)),
};

View File

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

View File

@@ -26,8 +26,8 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
use FireflyIII\Enums\TransactionTypeEnum;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use Illuminate\Http\JsonResponse;
@@ -76,7 +76,7 @@ class BillController extends Controller
// collect all expenses in this period (regardless of type) by the given bills and accounts.
$collector = app(GroupCollectorInterface::class);
$collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
$collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts);
$collector->setBills($bills);
$genericSet = $collector->getExtractedJournals();
@@ -129,7 +129,7 @@ class BillController extends Controller
// collect all expenses in this period (regardless of type) by the given bills and accounts.
$collector = app(GroupCollectorInterface::class);
$collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
$collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts);
$collector->withoutBill();
$genericSet = $collector->getExtractedJournals();

View File

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

View File

@@ -1,4 +1,5 @@
<?php
/*
* PeriodController.php
* Copyright (c) 2021 james@firefly-iii.org
@@ -25,8 +26,8 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
use FireflyIII\Enums\TransactionTypeEnum;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\TransactionType;
use Illuminate\Http\JsonResponse;
/**
@@ -47,7 +48,7 @@ class PeriodController extends Controller
// collect all expenses in this period (regardless of type)
$collector = app(GroupCollectorInterface::class);
$collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
$collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts);
$genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) {
$currencyId = (int)$journal['currency_id'];

View File

@@ -26,8 +26,8 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
use FireflyIII\Enums\TransactionTypeEnum;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use Illuminate\Http\JsonResponse;
@@ -69,7 +69,7 @@ class TagController extends Controller
// collect all expenses in this period (regardless of type) by the given bills and accounts.
$collector = app(GroupCollectorInterface::class);
$collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
$collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts);
$collector->withoutTags();
$genericSet = $collector->getExtractedJournals();
@@ -124,7 +124,7 @@ class TagController extends Controller
// collect all expenses in this period (regardless of type) by the given bills and accounts.
$collector = app(GroupCollectorInterface::class);
$collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
$collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts);
$collector->setTags($tags);
$genericSet = $collector->getExtractedJournals();

View File

@@ -1,4 +1,5 @@
<?php
/*
* PeriodController.php
* Copyright (c) 2021 james@firefly-iii.org
@@ -25,8 +26,8 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Income;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
use FireflyIII\Enums\TransactionTypeEnum;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\TransactionType;
use Illuminate\Http\JsonResponse;
/**
@@ -47,7 +48,7 @@ class PeriodController extends Controller
// collect all expenses in this period (regardless of type)
$collector = app(GroupCollectorInterface::class);
$collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
$collector->setTypes([TransactionTypeEnum::DEPOSIT->value])->setRange($start, $end)->setDestinationAccounts($accounts);
$genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) {
$currencyId = (int)$journal['currency_id'];

View File

@@ -26,8 +26,8 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Income;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
use FireflyIII\Enums\TransactionTypeEnum;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use Illuminate\Http\JsonResponse;
@@ -70,7 +70,7 @@ class TagController extends Controller
// collect all expenses in this period (regardless of type) by the given bills and accounts.
$collector = app(GroupCollectorInterface::class);
$collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
$collector->setTypes([TransactionTypeEnum::DEPOSIT->value])->setRange($start, $end)->setDestinationAccounts($accounts);
$collector->withoutTags();
$genericSet = $collector->getExtractedJournals();
@@ -128,7 +128,7 @@ class TagController extends Controller
// collect all expenses in this period (regardless of type) by the given bills and accounts.
$collector = app(GroupCollectorInterface::class);
$collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
$collector->setTypes([TransactionTypeEnum::DEPOSIT->value])->setRange($start, $end)->setDestinationAccounts($accounts);
$collector->setTags($tags);
$genericSet = $collector->getExtractedJournals();

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,4 +1,5 @@
<?php
/*
* ExpressionController.php
* Copyright (c) 2024 Michael Thomas

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -27,11 +27,11 @@ namespace FireflyIII\Api\V1\Controllers\Summary;
use Carbon\Carbon;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Data\DateRequest;
use FireflyIII\Enums\TransactionTypeEnum;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Helpers\Report\NetWorthInterface;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
@@ -129,7 +129,7 @@ class BasicController extends Controller
// collect income of user using the new group collector.
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
$collector->setRange($start, $end)->setPage($this->parameters->get('page'))->setTypes([TransactionType::DEPOSIT]);
$collector->setRange($start, $end)->setPage($this->parameters->get('page'))->setTypes([TransactionTypeEnum::DEPOSIT->value]);
$set = $collector->getExtractedJournals();
@@ -148,7 +148,7 @@ class BasicController extends Controller
// collect expenses of user using the new group collector.
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
$collector->setRange($start, $end)->setPage($this->parameters->get('page'))->setTypes([TransactionType::WITHDRAWAL]);
$collector->setRange($start, $end)->setPage($this->parameters->get('page'))->setTypes([TransactionTypeEnum::WITHDRAWAL->value]);
$set = $collector->getExtractedJournals();
/** @var array $transactionJournal */

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

Some files were not shown because too many files have changed in this diff Show More