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

Fixed budget charts.

Browse Source
This commit is contained in:
James Cole
2016-04-24 20:41:12 +02:00
parent ed863986a7
commit 53760766a0
3 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,19 +146,26 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
/**
* @param Carbon $start
* @param Carbon $end
* @param Budget $budget
*
* @return Collection
*/
public function getAllBudgetLimitRepetitions(Carbon $start, Carbon $end): Collection
public function getAllBudgetLimitRepetitions(Carbon $start, Carbon $end, Budget $budget = null): Collection
{
/** @var Collection $repetitions */
return LimitRepetition::
$query = LimitRepetition::
leftJoin('budget_limits', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id')
->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id')
->where('limit_repetitions.startdate', '<=', $end->format('Y-m-d 00:00:00'))
->where('limit_repetitions.startdate', '>=', $start->format('Y-m-d 00:00:00'))
->where('budgets.user_id', $this->user->id)
->get(['limit_repetitions.*', 'budget_limits.budget_id']);
->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id')
->where('limit_repetitions.startdate', '<=', $end->format('Y-m-d 00:00:00'))
->where('limit_repetitions.startdate', '>=', $start->format('Y-m-d 00:00:00'))
->where('budgets.user_id', $this->user->id);
if (!is_null($budget)) {
$query->where('budgets.id', $budget->id);
}
$set = $query->get(['limit_repetitions.*', 'budget_limits.budget_id']);
return $set;
}
/**