IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-15 01:43:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the income report.

Browse Source
This commit is contained in:
James Cole 2016-05-15 17:46:53 +02:00
parent 5cd1e7c100
commit eedf6a07f0
8 changed files with 63 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Export/Entry/EntryAccount.php
View File

@ -24,7 +24,7 @@ class EntryAccount
public $iban;
/** @var string */
public $name;
/** @var int */
/** @var string */
public $number;
/** @var string */
public $type;

2
app/Export/Entry/EntryBill.php
View File

@ -18,7 +18,7 @@ use FireflyIII\Models\Bill;
*/
class EntryBill
{
/** @var string */
/** @var int */
public $billId = '';
/** @var string */
public $name = '';

2
app/Export/Entry/EntryBudget.php
View File

@ -18,7 +18,7 @@ use FireflyIII\Models\Budget;
*/
class EntryBudget
{
/** @var string */
/** @var int */
public $budgetId = '';
/** @var string */
public $name = '';

2
app/Export/Entry/EntryCategory.php
View File

@ -18,7 +18,7 @@ use FireflyIII\Models\Category;
*/
class EntryCategory
{
/** @var string */
/** @var int */
public $categoryId = '';
/** @var string */
public $name = '';

3
app/Helpers/Report/ReportHelper.php
View File

@ -166,8 +166,7 @@ class ReportHelper implements ReportHelperInterface
$object = new Income;
/** @var AccountRepositoryInterface $repos */
$repos = app(AccountRepositoryInterface::class);
$types = [TransactionType::DEPOSIT, TransactionType::TRANSFER];
$journals = $repos->journalsInPeriod($accounts, $types, $start, $end);
$journals = $repos->incomesInPeriod($accounts, $start, $end);
foreach ($journals as $entry) {
$amount = TransactionJournal::amount($entry);

1
app/Models/LimitRepetition.php
View File

@ -18,6 +18,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
* @property float $amount
* @property-read BudgetLimit $budgetLimit
* @property int $budget_id
* @property string $spent
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereUpdatedAt($value)

43
app/Repositories/Account/AccountRepository.php
View File

@ -300,6 +300,44 @@ class AccountRepository implements AccountRepositoryInterface
return $accounts;
}
/**
* This method will call AccountRepositoryInterface::journalsInPeriod and get all deposits made by the given $accounts,
* as well as the transfers that move away from those $accounts. This is a slightly sharper selection
* than made by journalsInPeriod itself.
*
* @param Collection $accounts
* @param Carbon $start
* @param Carbon $end
*
* @see AccountRepositoryInterface::journalsInPeriod
*
* @return Collection
*/
public function incomesInPeriod(Collection $accounts, Carbon $start, Carbon $end): Collection
{
$types = [TransactionType::DEPOSIT, TransactionType::TRANSFER];
$journals = $this->journalsInPeriod($accounts, $types, $start, $end);
$accountIds = $accounts->pluck('id')->toArray();
// filter because some of these journals are
$journals = $journals->filter(
function (TransactionJournal $journal) use ($accountIds) {
if ($journal->transaction_type_type == TransactionType::DEPOSIT) {
return $journal;
}
/*
* The destination of a transfer must be one of the $accounts in order to
* be included. Otherwise, it would not be income.
*/
if (in_array($journal->destination_account_id, $accountIds)) {
return $journal;
}
}
);
return $journals;
}
/**
* @param Collection $accounts
* @param array $types
@ -337,7 +375,10 @@ class AccountRepository implements AccountRepositoryInterface
}
// that should do it:
$complete = $query->get(TransactionJournal::queryFields());
$fields = TransactionJournal::queryFields();
$fields[] = 'source.account_id as source_account_id';
$fields[] = 'destination.account_id as destination_account_id';
$complete = $query->get($fields);
return $complete;
}

16
app/Repositories/Account/AccountRepositoryInterface.php
View File

@ -8,7 +8,6 @@ use FireflyIII\Models\Account;
use FireflyIII\Models\AccountMeta;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
/**
@ -108,6 +107,21 @@ interface AccountRepositoryInterface
*/
public function getSavingsAccounts(Carbon $start, Carbon $end): Collection;
/**
* This method will call AccountRepositoryInterface::journalsInPeriod and get all deposits made by the given $accounts,
* as well as the transfers that move away from those $accounts. This is a slightly sharper selection
* than made by journalsInPeriod itself.
*
* @param Collection $accounts
* @param Carbon $start
* @param Carbon $end
*
* @see AccountRepositoryInterface::journalsInPeriod
*
* @return Collection
*/
public function incomesInPeriod(Collection $accounts, Carbon $start, Carbon $end): Collection;
/**
* @param Collection $accounts
* @param array $types