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

Some general cleaning up.

Browse Source
This commit is contained in:
James Cole
2015-04-07 18:25:21 +02:00
parent 1932bf277a
commit bf354275b3
10 changed files with 50 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/GoogleChartController.php
View File

@@ -2,8 +2,6 @@
use Carbon\Carbon;
use Crypt;
use DB;
use Exception;
use FireflyIII\Helpers\Report\ReportQueryInterface;
use FireflyIII\Models\Account;
use FireflyIII\Models\Bill;
@@ -480,11 +478,7 @@ class GoogleChartController extends Controller
*/
public function yearInExp($year, GChart $chart, ReportQueryInterface $query)
{
try {
$start = new Carbon('01-01-' . $year);
} catch (Exception $e) {
return view('error')->with('message', 'Invalid year.');
}
$start = new Carbon('01-01-' . $year);
$chart->addColumn('Month', 'date');
$chart->addColumn('Income', 'number');
$chart->addColumn('Expenses', 'number');
@@ -532,11 +526,7 @@ class GoogleChartController extends Controller
*/
public function yearInExpSum($year, GChart $chart, ReportQueryInterface $query)
{
try {
$start = new Carbon('01-01-' . $year);
} catch (Exception $e) {
return view('error')->with('message', 'Invalid year.');
}
$start = new Carbon('01-01-' . $year);
$chart->addColumn('Summary', 'string');
$chart->addColumn('Income', 'number');
$chart->addColumn('Expenses', 'number');

6
app/Http/Controllers/HelpController.php
View File

@@ -5,7 +5,7 @@ use ErrorException;
use League\CommonMark\CommonMarkConverter;
use Response;
use Route;
use Log;
/**
* Class HelpController
*
@@ -27,7 +27,7 @@ class HelpController extends Controller
];
if (!Route::has($route)) {
\Log::error('No such route: ' . $route);
Log::error('No such route: ' . $route);
return Response::json($content);
}
@@ -75,7 +75,7 @@ class HelpController extends Controller
try {
$content['text'] = file_get_contents($uri);
} catch (ErrorException $e) {
\Log::error(trim($e->getMessage()));
Log::error(trim($e->getMessage()));
}
if (strlen(trim($content['text'])) == 0) {
$content['text'] = '<p>There is no help for this route.</p>';

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

@@ -239,6 +239,11 @@ class JsonController extends Controller
return Response::json(['value' => $pref->data]);
}
/**
* @param $what
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function transactionJournals($what)
{
$descriptions = [];