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

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2021-04-05 22:12:57 +02:00
parent d8ca39ffea
commit d32446b171
9 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/TransactionRules/Actions/ConvertToDeposit.php
View File

@@ -22,6 +22,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\TransactionRules\Actions; namespace FireflyIII\TransactionRules\Actions;
use DB; use DB;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Factory\AccountFactory; use FireflyIII\Factory\AccountFactory;

6
app/TransactionRules/Actions/ConvertToTransfer.php
View File

@@ -22,11 +22,11 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\TransactionRules\Actions; namespace FireflyIII\TransactionRules\Actions;
use DB; use DB;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType; use FireflyIII\Models\AccountType;
use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleAction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\User; use FireflyIII\User;
@@ -55,8 +55,8 @@ class ConvertToTransfer implements ActionInterface
*/ */
public function actOnArray(array $journal): bool public function actOnArray(array $journal): bool
{ {
$type = $journal['transaction_type_type']; $type = $journal['transaction_type_type'];
$user = User::find($journal['user_id']); $user = User::find($journal['user_id']);
if (TransactionType::TRANSFER === $type) { if (TransactionType::TRANSFER === $type) {
Log::error( Log::error(
sprintf('Journal #%d is already a transfer so cannot be converted (rule #%d).', $journal['transaction_journal_id'], $this->action->rule_id) sprintf('Journal #%d is already a transfer so cannot be converted (rule #%d).', $journal['transaction_journal_id'], $this->action->rule_id)

1
app/TransactionRules/Actions/ConvertToWithdrawal.php
View File

@@ -22,6 +22,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\TransactionRules\Actions; namespace FireflyIII\TransactionRules\Actions;
use DB; use DB;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Factory\AccountFactory; use FireflyIII\Factory\AccountFactory;

2
app/TransactionRules/Actions/DeleteTransaction.php
View File

@@ -58,7 +58,7 @@ class DeleteTransaction implements ActionInterface
$journal['transaction_journal_id'], $journal['description'] $journal['transaction_journal_id'], $journal['description']
) )
); );
$group = TransactionGroup::find($journal['transaction_group_id']); $group = TransactionGroup::find($journal['transaction_group_id']);
$service = app(TransactionGroupDestroyService::class); $service = app(TransactionGroupDestroyService::class);
$service->destroy($group); $service->destroy($group);

1
app/TransactionRules/Actions/LinkToBill.php
View File

@@ -78,6 +78,7 @@ class LinkToBill implements ActionInterface
$journal['transaction_journal_id'], $billName $journal['transaction_journal_id'], $billName
) )
); );
return false; return false;
} }
} }

1
app/TransactionRules/Actions/RemoveAllTags.php
View File

@@ -25,6 +25,7 @@ namespace FireflyIII\TransactionRules\Actions;
use DB; use DB;
use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleAction;
use Log; use Log;
/** /**
* Class RemoveAllTags. * Class RemoveAllTags.
*/ */

2
app/TransactionRules/Actions/SetBudget.php
View File

@@ -50,7 +50,7 @@ class SetBudget implements ActionInterface
*/ */
public function actOnArray(array $journal): bool public function actOnArray(array $journal): bool
{ {
$user = User::find($journal['user_id']); $user = User::find($journal['user_id']);
$search = $this->action->action_value; $search = $this->action->action_value;
$budget = $user->budgets()->where('name', $search)->first(); $budget = $user->budgets()->where('name', $search)->first();

2
app/TransactionRules/Actions/SetCategory.php
View File

@@ -50,7 +50,7 @@ class SetCategory implements ActionInterface
*/ */
public function actOnArray(array $journal): bool public function actOnArray(array $journal): bool
{ {
$user = User::find($journal['user_id']); $user = User::find($journal['user_id']);
$search = $this->action->action_value; $search = $this->action->action_value;
if (null === $user) { if (null === $user) {
Log::error(sprintf('Journal has no valid user ID so action SetCategory("%s") cannot be applied', $search), $journal); Log::error(sprintf('Journal has no valid user ID so action SetCategory("%s") cannot be applied', $search), $journal);

2
app/TransactionRules/Actions/UpdatePiggybank.php
View File

@@ -21,7 +21,9 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\TransactionRules\Actions; namespace FireflyIII\TransactionRules\Actions;
use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleAction;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;