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

Expand search.

Browse Source
This commit is contained in:
James Cole
2020-08-24 07:03:17 +02:00
parent 4bf86500bd
commit 3141ec0406
10 changed files with 256 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/TransactionRules/Actions/AddTag.php
View File

@@ -57,6 +57,10 @@ class AddTag implements ActionInterface
/** @var TagFactory $factory */
$factory = app(TagFactory::class);
$factory->setUser($journal->user);
// TODO explode value on comma?
$tag = $factory->findOrCreate($this->action->action_value);
if (null === $tag) {

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

@@ -84,7 +84,10 @@ class SetCategory implements ActionInterface
$user = User::find($journal['user_id']);
$search = $this->action->action_value;
$category = $user->categories()->where('name', $search)->first();
/** @var CategoryFactory $factory */
$factory = app(CategoryFactory::class);
$factory->setUser($user);
$category = $factory->findOrCreate(null, $search);
if (null === $category) {
Log::debug(sprintf('RuleAction SetCategory could not set category of journal #%d to "%s" because no such category exists.', $journal['transaction_journal_id'], $search));