kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix various code.

Browse Source
This commit is contained in:
James Cole
2025-05-27 17:06:15 +02:00
parent d8f512ca3a
commit 2cb14f6b72
123 changed files with 581 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Repositories/Account/OperationsRepository.php
View File

@@ -150,51 +150,51 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
// depends on transaction type:
if (TransactionTypeEnum::WITHDRAWAL->value === $type) {
if (null !== $accounts) {
if ($accounts instanceof Collection) {
$collector->setSourceAccounts($accounts);
}
if (null !== $opposing) {
if ($opposing instanceof Collection) {
$collector->setDestinationAccounts($opposing);
}
}
if (TransactionTypeEnum::DEPOSIT->value === $type) {
if (null !== $accounts) {
if ($accounts instanceof Collection) {
$collector->setDestinationAccounts($accounts);
}
if (null !== $opposing) {
if ($opposing instanceof Collection) {
$collector->setSourceAccounts($opposing);
}
}
// supports only accounts, not opposing.
if (TransactionTypeEnum::TRANSFER->value === $type && null !== $accounts) {
if (TransactionTypeEnum::TRANSFER->value === $type && $accounts instanceof Collection) {
$collector->setAccounts($accounts);
}
if (null !== $currency) {
if ($currency instanceof TransactionCurrency) {
$collector->setCurrency($currency);
}
$journals = $collector->getExtractedJournals();
// same but for foreign currencies:
if (null !== $currency) {
if ($currency instanceof TransactionCurrency) {
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
$collector->setUser($this->user)->setRange($start, $end)->setTypes([$type])->withAccountInformation()
->setForeignCurrency($currency)
;
if (TransactionTypeEnum::WITHDRAWAL->value === $type) {
if (null !== $accounts) {
if ($accounts instanceof Collection) {
$collector->setSourceAccounts($accounts);
}
if (null !== $opposing) {
if ($opposing instanceof Collection) {
$collector->setDestinationAccounts($opposing);
}
}
if (TransactionTypeEnum::DEPOSIT->value === $type) {
if (null !== $accounts) {
if ($accounts instanceof Collection) {
$collector->setDestinationAccounts($accounts);
}
if (null !== $opposing) {
if ($opposing instanceof Collection) {
$collector->setSourceAccounts($opposing);
}
}