kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-02-08 13:14:39 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2026-01-24

Browse Source
This commit is contained in:
JC5
2026-01-24 13:57:28 +01:00
parent 844470bf08
commit 4a4f1ff055
50 changed files with 795 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/TransactionRules/Actions/MoveDescriptionToNotes.php
View File

@@ -47,7 +47,7 @@ class MoveDescriptionToNotes implements ActionInterface
public function actOnArray(array $journal): bool
{
/** @var null|TransactionJournal $object */
$object = TransactionJournal::where('user_id', $journal['user_id'])->find($journal['transaction_journal_id']);
$object = TransactionJournal::where('user_id', $journal['user_id'])->find($journal['transaction_journal_id']);
if (null === $object) {
Log::error(sprintf('No journal #%d belongs to user #%d.', $journal['transaction_journal_id'], $journal['user_id']));
event(new RuleActionFailedOnArray($this->action, $journal, trans('rules.journal_other_user')));
@@ -56,9 +56,9 @@ class MoveDescriptionToNotes implements ActionInterface
}
/** @var null|Note $note */
$note = $object->notes()->first();
$note = $object->notes()->first();
if (null === $note) {
$note = new Note();
$note = new Note();
$note->noteable()->associate($object);
$note->text = '';
}
@@ -69,10 +69,10 @@ class MoveDescriptionToNotes implements ActionInterface
$object->description = '(no description)';
}
if ('' === $note->text) {
$note->text = (string)$object->description;
$note->text = (string) $object->description;
$object->description = '(no description)';
}
$after = $note->text;
$after = $note->text;
event(new TransactionGroupRequestsAuditLogEntry($this->action->rule, $object, 'update_description', $beforeDescription, $object->description));
event(new TransactionGroupRequestsAuditLogEntry($this->action->rule, $object, 'update_notes', $before, $after));