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

Moved some stuff around.

Browse Source
This commit is contained in:
James Cole
2015-05-16 09:09:52 +02:00
parent 3270d3bf96
commit 69143399d1
7 changed files with 169 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -257,26 +257,22 @@ class BudgetRepository implements BudgetRepositoryInterface
}
/**
* @param Budget $budget
* @param Carbon $date
* @param boolean $shared
* @param Budget $budget
* @param Carbon $date
* @param bool $shared
*
* @return float
*/
public function spentInMonth(Budget $budget, Carbon $date, $shared = true)
public function spentInPeriod(Budget $budget, Carbon $start, Carbon $end, $shared = true)
{
$end = clone $date;
$date->startOfMonth();
$end->endOfMonth();
if ($shared === true) {
// get everything:
$sum = floatval($budget->transactionjournals()->before($end)->after($date)->lessThan(0)->sum('amount')) * -1;
$sum = floatval($budget->transactionjournals()->before($end)->after($start)->lessThan(0)->sum('amount')) * -1;
} else {
// get all journals in this month where the asset account is NOT shared.
$sum = $budget->transactionjournals()
->before($end)
->after($date)
->after($start)
->lessThan(0)
->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
->leftJoin(

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

@@ -124,12 +124,13 @@ interface BudgetRepositoryInterface
/**
* @param Budget $budget
* @param Carbon $date
* @param Carbon $start
* @param Carbon $end
* @param boolean $shared
*
* @return float
*/
public function spentInMonth(Budget $budget, Carbon $date, $shared = true);
public function spentInPeriod(Budget $budget, Carbon $start, Carbon $end, $shared = true);
/**
* @param array $data