kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 02:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Some more code cleanup.

Browse Source
This commit is contained in:
James Cole
2016-02-17 21:59:47 +01:00
parent a178fed0c6
commit f7d06b9759
7 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Helpers/Csv/Converter/AssetAccountName.php
View File

@@ -5,7 +5,6 @@ namespace FireflyIII\Helpers\Csv\Converter;
use Auth; use Auth;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
/** /**
* Class AssetAccountName * Class AssetAccountName
@@ -27,7 +26,7 @@ class AssetAccountName extends BasicConverter implements ConverterInterface
return $account; return $account;
} }
// find or create new account: // find or create new account:
$set = Auth::user()->accounts()->accountTypeIn(['Asset account', 'Default account'])->get(); $set = Auth::user()->accounts()->accountTypeIn(['Asset account', 'Default account'])->get();
/** @var Account $entry */ /** @var Account $entry */
foreach ($set as $entry) { foreach ($set as $entry) {
if ($entry->name == $this->value) { if ($entry->name == $this->value) {

3
app/Rules/Actions/ActionFactory.php
View File

@@ -12,7 +12,6 @@ namespace FireflyIII\Rules\Actions;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleAction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Support\Domain; use FireflyIII\Support\Domain;
/** /**
@@ -27,7 +26,7 @@ class ActionFactory
/** /**
* Returns the action for the given type and journal * Returns the action for the given type and journal
* *
* @param RuleAction $action * @param RuleAction $action
* *
* @return ActionInterface * @return ActionInterface
*/ */

10
app/Rules/Processor.php
View File

@@ -29,13 +29,13 @@ use Log;
final class Processor final class Processor
{ {
/** @var Collection */ /** @var Collection */
private $actions; public $actions;
/** @var TransactionJournal */ /** @var TransactionJournal */
private $journal; public $journal;
/** @var Rule */ /** @var Rule */
private $rule; public $rule;
/** @var Collection */ /** @var Collection */
private $triggers; public $triggers;
/** /**
* Processor constructor. * Processor constructor.
@@ -44,7 +44,7 @@ final class Processor
private function __construct() private function __construct()
{ {
$this->triggers = new Collection; $this->triggers = new Collection;
$this->actions = new Collection; $this->actions = new Collection;
} }
/** /**

2
app/Rules/Triggers/AbstractTrigger.php
View File

@@ -96,4 +96,4 @@ class AbstractTrigger
} }
} }

0
resources/lang/nl_NL/firefly.php Executable file → Normal file
View File

0
resources/lang/nl_NL/form.php Executable file → Normal file
View File

2
resources/views/rules/partials/test-trigger-modal.twig
View File

@@ -19,4 +19,4 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>