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

Should fix tests.

Browse Source
This commit is contained in:
James Cole
2015-06-03 21:15:52 +02:00
parent a7f6848e53
commit 409ec2e086
21 changed files with 151 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,6 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use Log;
use Response;
use Session;
use Steam;
@@ -44,12 +43,10 @@ class JsonController extends Controller
$prop->addProperty($start);
$prop->addProperty($end);
$prop->addProperty('box-bills-paid');
$md5 = $prop->md5();
if (Cache::has($md5)) {
Log::debug('Successfully returned cached box bills-paid [' . $md5 . ']');
return Response::json(Cache::get($md5));
if ($prop->has()) {
return Response::json($prop->get());
}
$md5 = $prop->getMd5();
$amount = 0;
@@ -100,12 +97,10 @@ class JsonController extends Controller
$prop->addProperty($start);
$prop->addProperty($end);
$prop->addProperty('box-bills-unpaid');
$md5 = $prop->md5();
if (Cache::has($md5)) {
Log::debug('Successfully returned cached box bills-unpaid [' . $md5 . ']');
return Response::json(Cache::get($md5));
if ($prop->has()) {
return Response::json($prop->get());
}
$md5 = $prop->getMd5();
$bills = $repository->getActiveBills();
$unpaid = new Collection; // bills
@@ -162,13 +157,10 @@ class JsonController extends Controller
$prop->addProperty($start);
$prop->addProperty($end);
$prop->addProperty('box-in');
$md5 = $prop->md5();
if (Cache::has($md5)) {
Log::debug('Successfully returned cached box in [' . $md5 . ']');
return Response::json(Cache::get($md5));
if ($prop->has()) {
return Response::json($prop->get());
}
$md5 = $prop->getMd5();
$amount = $reportQuery->incomeInPeriodCorrected($start, $end, true)->sum('amount');
@@ -194,12 +186,10 @@ class JsonController extends Controller
$prop->addProperty($start);
$prop->addProperty($end);
$prop->addProperty('box-out');
$md5 = $prop->md5();
if (Cache::has($md5)) {
Log::debug('Successfully returned cached box out [' . $md5 . ']');
return Response::json(Cache::get($md5));
if ($prop->has()) {
return Response::json($prop->get());
}
$md5 = $prop->getMd5();
$amount = $reportQuery->expenseInPeriodCorrected($start, $end, true)->sum('amount');