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

Various code reshuffelling.

Browse Source
This commit is contained in:
James Cole
2021-03-12 06:20:01 +01:00
parent 97561ab9c9
commit 748d61fb8f
51 changed files with 1874 additions and 1873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,13 +24,11 @@ declare(strict_types=1);
namespace FireflyIII\Repositories\Account;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionType;
use FireflyIII\User;
use Illuminate\Support\Collection;
use Log;
/**
*
@@ -163,8 +161,8 @@ class OperationsRepository implements OperationsRepositoryInterface
/**
* @inheritDoc
*/
public function sumExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $expense = null, ?TransactionCurrency $currency = null): array
{
public function sumExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $expense = null, ?TransactionCurrency $currency = null
): array {
$start->startOfDay();
$end->endOfDay();
@@ -178,7 +176,7 @@ class OperationsRepository implements OperationsRepositoryInterface
if (null !== $accounts) {
$collector->setSourceAccounts($accounts);
}
if(null !== $expense) {
if (null !== $expense) {
$collector->setDestinationAccounts($expense);
}
if (null !== $currency) {
@@ -233,15 +231,17 @@ class OperationsRepository implements OperationsRepositoryInterface
$array[$foreignId]['sum'] = bcadd($array[$foreignId]['sum'], app('steam')->negative($journal['foreign_amount']));
}
}
return $array;
}
/**
* // TODO same as income but copied.
*
* @inheritDoc
*/
public function sumIncome(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $revenue = null, ?TransactionCurrency $currency = null): array
{
public function sumIncome(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $revenue = null, ?TransactionCurrency $currency = null
): array {
$start->startOfDay();
$end->endOfDay();
@@ -255,7 +255,7 @@ class OperationsRepository implements OperationsRepositoryInterface
if (null !== $accounts) {
$collector->setDestinationAccounts($accounts);
}
if(null !== $revenue) {
if (null !== $revenue) {
$collector->setSourceAccounts($revenue);
}
if (null !== $currency) {
@@ -273,7 +273,7 @@ class OperationsRepository implements OperationsRepositoryInterface
if (null !== $accounts) {
$collector->setDestinationAccounts($accounts);
}
if(null !== $revenue) {
if (null !== $revenue) {
$collector->setSourceAccounts($revenue);
}
$result = $collector->getExtractedJournals();
@@ -309,6 +309,7 @@ class OperationsRepository implements OperationsRepositoryInterface
$array[$foreignId]['sum'] = bcadd($array[$foreignId]['sum'], app('steam')->positive($journal['foreign_amount']));
}
}
return $array;
}
@@ -375,6 +376,7 @@ class OperationsRepository implements OperationsRepositoryInterface
$array[$foreignId]['sum'] = bcadd($array[$foreignId]['sum'], app('steam')->positive($journal['foreign_amount']));
}
}
return $array;
}
}