kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-16 14:48:11 +00:00
Code Issues Projects Releases Wiki Activity

Various cod e clean up.

Browse Source
This commit is contained in:
James Cole
2016-12-28 13:02:56 +01:00
parent e64b778d13
commit 619500ca64
16 changed files with 143 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface as CRI;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Input;
use Illuminate\Http\Request;
use Preferences;
use Response;
@@ -43,11 +43,13 @@ class JsonController extends Controller
}
/**
* @param Request $request
*
* @return \Illuminate\Http\JsonResponse
*/
public function action()
public function action(Request $request)
{
$count = intval(Input::get('count')) > 0 ? intval(Input::get('count')) : 1;
$count = intval($request->get('count')) > 0 ? intval($request->get('count')) : 1;
$keys = array_keys(config('firefly.rule-actions'));
$actions = [];
foreach ($keys as $key) {
@@ -269,19 +271,18 @@ class JsonController extends Controller
}
/**
* @param $what
* @param JournalCollectorInterface $collector
* @param string $what
*
* @return \Illuminate\Http\JsonResponse
*/
public function transactionJournals($what)
public function transactionJournals(JournalCollectorInterface $collector, string $what)
{
$descriptions = [];
$type = config('firefly.transactionTypesByWhat.' . $what);
$types = [$type];
// use journal collector instead:
/** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class, [auth()->user()]);
$collector->setTypes($types)->setLimit(100)->setPage(1);
$journals = $collector->getJournals();
foreach ($journals as $j) {
@@ -297,11 +298,13 @@ class JsonController extends Controller
}
/**
* @param Request $request
*
* @return \Illuminate\Http\JsonResponse
*/
public function trigger()
public function trigger(Request $request)
{
$count = intval(Input::get('count')) > 0 ? intval(Input::get('count')) : 1;
$count = intval($request->get('count')) > 0 ? intval($request->get('count')) : 1;
$keys = array_keys(config('firefly.rule-triggers'));
$triggers = [];
foreach ($keys as $key) {