kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-18 15:39:50 +00:00
Code Issues Projects Releases Wiki Activity

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2016-12-15 17:16:46 +01:00
parent 975a6c34bf
commit e247aace8d
15 changed files with 65 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Chart/AccountController.php
View File

@@ -129,7 +129,7 @@ class AccountController extends Controller
}
}
arsort($chartData);
$data = $this->generator->singleSet(trans('firefly.spent'), $chartData);
$data = $this->generator->singleSet(strval(trans('firefly.spent')), $chartData);
$cache->store($data);
return Response::json($data);
@@ -393,7 +393,7 @@ class AccountController extends Controller
}
arsort($chartData);
$data = $this->generator->singleSet(trans('firefly.spent'), $chartData);
$data = $this->generator->singleSet(strval(trans('firefly.spent')), $chartData);
$cache->store($data);
return Response::json($data);

3
app/Http/Controllers/Chart/BudgetController.php
View File

@@ -154,7 +154,7 @@ class BudgetController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.budget.frontpage');
if ($cache->has()) {
//return Response::json($cache->get());
return Response::json($cache->get());
}
$budgets = $repository->getActiveBudgets();
$repetitions = $repository->getAllBudgetLimitRepetitions($start, $end);
@@ -394,7 +394,6 @@ class BudgetController extends Controller
'repetition_overspent' => $overspent,
'spent' => $spent,
];
//$array = [$name, $left, $spent, $overspent, $amount, $spent];
}
return $return;