IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-01-03 12:47:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed budget.

Browse Source
This commit is contained in:
James Cole 2015-05-16 07:56:15 +02:00
parent ae54497efa
commit bed1adc367
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Repositories/Budget/BudgetRepository.php
View File

@ -8,6 +8,7 @@ use FireflyIII\Models\Budget;
use FireflyIII\Models\BudgetLimit;
use FireflyIII\Models\LimitRepetition;
use Illuminate\Database\Query\Builder as QueryBuilder;
use Illuminate\Database\Query\JoinClause;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
use Input;
@ -262,10 +263,9 @@ class BudgetRepository implements BudgetRepositoryInterface
*
* @return float
*/
public function spentInMonth(Budget $budget, Carbon $date, $shared)
public function spentInMonth(Budget $budget, Carbon $date, $shared = true)
{
$end = clone $date;
$sum = 0;
$date->startOfMonth();
$end->endOfMonth();
@ -274,7 +274,19 @@ class BudgetRepository implements BudgetRepositoryInterface
$sum = floatval($budget->transactionjournals()->before($end)->after($date)->lessThan(0)->sum('amount')) * -1;
} else {
// get all journals in this month where the asset account is NOT shared.
$sum = rand(1, 100);
$sum = $budget->transactionjournals()
->before($end)
->after($date)
->lessThan(0)
->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
->leftJoin(
'account_meta', function (JoinClause $join) {
$join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
}
)
->where('account_meta.data', '!=', '"sharedAsset"')
->sum('amount');
$sum = floatval($sum) * -1;
}
return $sum;

2
app/Repositories/Budget/BudgetRepositoryInterface.php
View File

@ -129,7 +129,7 @@ interface BudgetRepositoryInterface
*
* @return float
*/
public function spentInMonth(Budget $budget, Carbon $date, $shared);
public function spentInMonth(Budget $budget, Carbon $date, $shared = true);
/**
* @param array $data