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

Small fixes and updates. [skip ci]

Browse Source
This commit is contained in:
James Cole
2014-07-23 16:44:20 +02:00
parent 1a9c44f7f9
commit 30553ed7a3
6 changed files with 84 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/lib/Firefly/Storage/Budget/EloquentBudgetRepository.php
View File

@@ -18,6 +18,35 @@ class EloquentBudgetRepository implements BudgetRepositoryInterface
return $return;
}
public function getWithRepetitionsInPeriod(\Carbon\Carbon $date, $range)
{
/** @var \Firefly\Helper\Toolkit\ToolkitInterface $toolkit */
$toolkit = \App::make('Firefly\Helper\Toolkit\ToolkitInterface');
$dates = $toolkit->getDateRange();
$start = $dates[0];
$result = [];
$set = \Auth::user()->budgets()->with(
['limits' => function ($q) use ($date) {
$q->orderBy('limits.startdate', 'ASC');
// $q->where('startdate',$date->format('Y-m-d'));
}, 'limits.limitrepetitions' => function ($q) use ($date) {
$q->orderBy('limit_repetitions.startdate', 'ASC');
$q->where('startdate',$date->format('Y-m-d'));
}]
)->orderBy('name', 'ASC')->get();
foreach ($set as $budget) {
$budget->count = 0;
foreach($budget->limits as $limit) {
$budget->count += count($limit->limitrepetitions);
}
}
return $set;
}
public function store($data)
{
$budget = new \Budget;
@@ -67,10 +96,10 @@ class EloquentBudgetRepository implements BudgetRepositoryInterface
public function get()
{
return \Auth::user()->budgets()->with(
['limits' => function ($q) {
$q->orderBy('limits.startdate','ASC');
['limits' => function ($q) {
$q->orderBy('limits.startdate', 'ASC');
}, 'limits.limitrepetitions' => function ($q) {
$q->orderBy('limit_repetitions.startdate','ASC');
$q->orderBy('limit_repetitions.startdate', 'ASC');
}]
)->orderBy('name', 'ASC')->get();
}