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

Method no longer used.

Browse Source
This commit is contained in:
James Cole
2016-01-01 19:57:23 +01:00
parent d16fb30a62
commit 7a4a78628d
3 changed files with 8 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/Http/Controllers/BudgetController.php
View File

@@ -233,20 +233,15 @@ class BudgetController extends Controller
$journals = $repository->getJournals($budget, $repetition);
if (is_null($repetition->id)) {
$start = $repository->firstActivity($budget);
$end = new Carbon;
$set = $budget->limitrepetitions()->orderBy('startdate', 'DESC')->get();
//$set = $repository->getBudgetLimits($budget);
//$subTitle = e($budget->name);
$start = $repository->firstActivity($budget);
$end = new Carbon;
$set = $budget->limitrepetitions()->orderBy('startdate', 'DESC')->get();
$subTitle = e($budget->name);
} else {
$start = $repetition->startdate;
$end = $repetition->enddate;
$set = new Collection([$repetition]);
// $spentArray = $repository->spentPerDay($budget, $start, $end);
// $budgetLimit = $repetition->budgetLimit;
// $budgetLimit->spent = $this->getSumOfRange($start, $end, $spentArray); // bit weird but it works.
// $limits = new Collection([$budgetLimit]);
//$subTitle = trans('firefly.budget_in_month', ['name' => $budget->name, 'month' => $repetition->startdate->formatLocalized($this->monthFormat)]);
$start = $repetition->startdate;
$end = $repetition->enddate;
$set = new Collection([$repetition]);
$subTitle = trans('firefly.budget_in_month', ['name' => $budget->name, 'month' => $repetition->startdate->formatLocalized($this->monthFormat)]);
}
$spentArray = $repository->spentPerDay($budget, $start, $end);
@@ -258,13 +253,6 @@ class BudgetController extends Controller
$limits->push($entry);
}
// loop limits and set the amount spent for each limit.
// /** @var BudgetLimit $budgetLimit */
// foreach ($set as $budgetLimit) {
// $start = $budgetLimit->startdate;
// $end = $budgetLimit->lim
// }
$journals->setPath('/budgets/show/' . $budget->id);
return view('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle'));

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

@@ -203,17 +203,6 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
->get(['limit_repetitions.*', 'budget_limits.budget_id']);
}
/**
* @param Budget $budget
*
* @return Collection
*/
public function getBudgetLimits(Budget $budget)
{
return $budget->budgetLimits()->orderBy('startdate', 'DESC')->get();
}
/**
* Returns an array with the following key:value pairs:
*

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

@@ -160,13 +160,6 @@ interface BudgetRepositoryInterface
*/
public function getAllBudgetLimitRepetitions(Carbon $start, Carbon $end);
/**
* @param Budget $budget
*
* @return Collection
*/
public function getBudgetLimits(Budget $budget);
/**
* @return Collection
*/