kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Replace enum

Browse Source
This commit is contained in:
James Cole
2025-01-03 09:09:15 +01:00
parent d009ce31ca
commit 36351a5dd9
36 changed files with 68 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Category/NoCategoryController.php
View File

@@ -95,7 +95,7 @@ class NoCategoryController extends Controller
$collector->setRange($start, $end)
->setLimit($pageSize)->setPage($page)->withoutCategory()
->withAccountInformation()->withBudgetInformation()
->setTypes([TransactionTypeEnum::WITHDRAWAL->value, TransactionType::DEPOSIT, TransactionTypeEnum::TRANSFER->value])
->setTypes([TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::TRANSFER->value])
;
$groups = $collector->getPaginatedGroups();
$groups->setPath(route('categories.no-category', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
@@ -128,7 +128,7 @@ class NoCategoryController extends Controller
$collector = app(GroupCollectorInterface::class);
$collector->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutCategory()
->withAccountInformation()->withBudgetInformation()
->setTypes([TransactionTypeEnum::WITHDRAWAL->value, TransactionType::DEPOSIT, TransactionTypeEnum::TRANSFER->value])
->setTypes([TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::TRANSFER->value])
;
$groups = $collector->getPaginatedGroups();
$groups->setPath(route('categories.no-category.all'));

2
app/Http/Controllers/Chart/AccountController.php
View File

@@ -377,7 +377,7 @@ class AccountController extends Controller
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
$collector->setAccounts(new Collection([$account]))->setRange($start, $end)->withCategoryInformation()->setTypes([TransactionType::DEPOSIT]);
$collector->setAccounts(new Collection([$account]))->setRange($start, $end)->withCategoryInformation()->setTypes([TransactionTypeEnum::DEPOSIT->value]);
$journals = $collector->getExtractedJournals();
$result = [];
$chartData = [];

6
app/Http/Controllers/Chart/TransactionController.php
View File

@@ -113,7 +113,7 @@ class TransactionController extends Controller
$collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value]);
}
if ('deposit' === $objectType) {
$collector->setTypes([TransactionType::DEPOSIT]);
$collector->setTypes([TransactionTypeEnum::DEPOSIT->value]);
}
if ('transfer' === $objectType || 'transfers' === $objectType) {
$collector->setTypes([TransactionTypeEnum::TRANSFER->value]);
@@ -163,7 +163,7 @@ class TransactionController extends Controller
$collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value]);
}
if ('deposit' === $objectType) {
$collector->setTypes([TransactionType::DEPOSIT]);
$collector->setTypes([TransactionTypeEnum::DEPOSIT->value]);
}
if ('transfer' === $objectType || 'transfers' === $objectType) {
$collector->setTypes([TransactionTypeEnum::TRANSFER->value]);
@@ -213,7 +213,7 @@ class TransactionController extends Controller
$collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value]);
}
if ('deposit' === $objectType) {
$collector->setTypes([TransactionType::DEPOSIT]);
$collector->setTypes([TransactionTypeEnum::DEPOSIT->value]);
}
if ('transfer' === $objectType || 'transfers' === $objectType) {
$collector->setTypes([TransactionTypeEnum::TRANSFER->value]);

2
app/Http/Controllers/Json/BoxController.php
View File

@@ -84,7 +84,7 @@ class BoxController extends Controller
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
$collector->setRange($start, $end)
->setTypes([TransactionType::DEPOSIT])
->setTypes([TransactionTypeEnum::DEPOSIT->value])
;
$set = $collector->getExtractedJournals();

4
app/Http/Controllers/Json/ReconcileController.php
View File

@@ -242,7 +242,7 @@ class ReconcileController extends Controller
foreach ($array as $journal) {
$inverse = false;
if (TransactionType::DEPOSIT === $journal['transaction_type_type']) {
if (TransactionTypeEnum::DEPOSIT->value === $journal['transaction_type_type']) {
$inverse = true;
}
// transfer to this account? then positive amount:
@@ -251,7 +251,7 @@ class ReconcileController extends Controller
}
// opening balance into account? then positive amount:
if (TransactionType::OPENING_BALANCE === $journal['transaction_type_type']
if (TransactionTypeEnum::OPENING_BALANCE->value === $journal['transaction_type_type']
&& $account->id === $journal['destination_account_id']) {
$inverse = true;
}

2
app/Http/Controllers/Transaction/ConvertController.php
View File

@@ -332,7 +332,7 @@ class ConvertController extends Controller
];
// also set the currency to the currency of the source account, in case you're converting a deposit into a transfer.
if (TransactionTypeEnum::TRANSFER->value === $transactionType->type && TransactionType::DEPOSIT === $journal->transactionType->type) {
if (TransactionTypeEnum::TRANSFER->value === $transactionType->type && TransactionTypeEnum::DEPOSIT->value === $journal->transactionType->type) {
$source = $this->accountRepository->find((int) $sourceId);
$sourceCurrency = $this->accountRepository->getAccountCurrency($source);
$dest = $this->accountRepository->find((int) $destinationId);

2
app/Http/Controllers/Transaction/MassController.php
View File

@@ -132,7 +132,7 @@ class MassController extends Controller
$withdrawalSources = $accountRepository->getAccountsByType($array);
// valid deposit destinations:
$array = config(sprintf('firefly.source_dests.%s.%s', TransactionType::DEPOSIT, AccountType::REVENUE));
$array = config(sprintf('firefly.source_dests.%s.%s', TransactionTypeEnum::DEPOSIT->value, AccountType::REVENUE));
$depositDestinations = $accountRepository->getAccountsByType($array);
/** @var BudgetRepositoryInterface $budgetRepository */