kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-24 22:48:18 +00:00
Code Issues Projects Releases Wiki Activity

Cleaned up reports and associated views.

Browse Source
This commit is contained in:
James Cole
2015-05-15 20:07:51 +02:00
parent b20f369aef
commit d5a154d2e6
15 changed files with 239 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/JsonController.php
View File

@@ -128,7 +128,7 @@ class JsonController extends Controller
{
$start = Session::get('start', Carbon::now()->startOfMonth());
$end = Session::get('end', Carbon::now()->endOfMonth());
$amount = $reportQuery->incomeByPeriod($start, $end, true)->sum('queryAmount');
$amount = $reportQuery->incomeInPeriod($start, $end, true)->sum('queryAmount');
return Response::json(['box' => 'in', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]);
}
@@ -208,9 +208,9 @@ class JsonController extends Controller
public function setSharedReports()
{
/** @var Preference $pref */
$pref = Preferences::get('showSharedReports', false);
$pref = Preferences::get('includeShared', false);
$new = !$pref->data;
Preferences::set('showSharedReports', $new);
Preferences::set('includeShared', $new);
return Response::json(['value' => $new]);
@@ -221,7 +221,7 @@ class JsonController extends Controller
*/
public function showSharedReports()
{
$pref = Preferences::get('showSharedReports', false);
$pref = Preferences::get('includeShared', false);
return Response::json(['value' => $pref->data]);
}