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

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2014-12-14 20:40:02 +01:00
parent 8e6ca0dd05
commit 900dea2c66
36 changed files with 384 additions and 1094 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
app/lib/FireflyIII/Report/Report.php
View File

@@ -202,167 +202,4 @@ class Report implements ReportInterface
return $report;
}
/**
* @param \Account $account
* @param Carbon $month
*
* @return float
*/
public function getExpenseByMonth(\Account $account, Carbon $month)
{
if (isset($account->sharedExpense) && $account->sharedExpense === true) {
$shared = true;
} else {
if (isset($account->sharedExpense) && $account->sharedExpense === false) {
$shared = false;
} else {
$shared = ($account->getMeta('accountRole') == 'sharedExpense');
}
}
$start = clone $month;
$end = clone $month;
$start->startOfMonth();
$end->endOfMonth();
$sum = 0;
// get all journals.
$journals = \TransactionJournal::with(['transactionType', 'transactions'])->whereIn(
'id', function ($query) use ($account, $start, $end) {
$query->select('transaction_journal_id')
->from('transactions')
->where('account_id', $account->id);
}
)->before($end)->after($start)->get();
if ($shared) {
$expenses = $journals->filter(
function (\TransactionJournal $journal) use ($account) {
// any withdrawal is an expense:
if ($journal->transactionType->type == 'Withdrawal') {
return $journal;
}
// any transfer away from this account is an expense.
if ($journal->transactionType->type == 'Transfer') {
/** @var \Transaction $t */
foreach ($journal->transactions as $t) {
if ($t->account_id == $account->id && floatval($t->amount) < 0) {
return $journal;
}
}
}
return null;
}
);
} else {
$expenses = $journals->filter(
function (\TransactionJournal $journal) use ($account) {
// only withdrawals are expenses:
if ($journal->transactionType->type == 'Withdrawal') {
return $journal;
}
// transfers TO a shared account are also expenses.
if ($journal->transactionType->type == 'Transfer') {
/** @var \Transaction $t */
foreach ($journal->transactions() as $t) {
if ($t->account->getMeta('accountRole') == 'sharedExpense') {
echo '#' . $journal->id . ' is a shared expense!<br>';
return $journal;
}
}
}
return null;
}
);
}
/** @var \TransactionJournal $expense */
foreach ($expenses as $expense) {
$sum += $expense->getAmount();
}
return $sum;
}
/**
* @param \Account $account
* @param Carbon $month
*
* @return float
*/
public function getIncomeByMonth(\Account $account, Carbon $month)
{
if (isset($account->sharedExpense) && $account->sharedExpense === true) {
$shared = true;
} else {
if (isset($account->sharedExpense) && $account->sharedExpense === false) {
$shared = false;
} else {
$shared = ($account->getMeta('accountRole') == 'sharedExpense');
}
}
$start = clone $month;
$end = clone $month;
$start->startOfMonth();
$end->endOfMonth();
$sum = 0;
// get all journals.
$journals = \TransactionJournal::with(['transactionType', 'transactions'])->whereIn(
'id', function ($query) use ($account, $start, $end) {
$query->select('transaction_journal_id')
->from('transactions')
->where('account_id', $account->id);
}
)->before($end)->after($start)->get();
if ($shared) {
$incomes = $journals->filter(
function (\TransactionJournal $journal) use ($account) {
// any deposit is an income:
if ($journal->transactionType->type == 'Deposit') {
return $journal;
}
// any transfer TO this account is an income.
if ($journal->transactionType->type == 'Transfer') {
/** @var \Transaction $t */
foreach ($journal->transactions as $t) {
if ($t->account_id == $account->id && floatval($t->amount) > 0) {
return $journal;
}
}
}
return null;
}
);
} else {
$incomes = $journals->filter(
function (\TransactionJournal $journal) use ($account) {
// only deposits are incomes:
if ($journal->transactionType->type == 'Deposit') {
return $journal;
}
return null;
}
);
}
/** @var \TransactionJournal $expense */
foreach ($incomes as $income) {
$sum += $income->getAmount();
}
return $sum;
}
}