kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Implemented new link thing.

Browse Source
This commit is contained in:
James Cole
2019-07-20 06:47:34 +02:00
parent 63832b31f8
commit 6d34cfb940
15 changed files with 581 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Requests/JournalLinkRequest.php
View File

@@ -52,12 +52,9 @@ class JournalLinkRequest extends Request
$linkType = $this->get('link_type');
$parts = explode('_', $linkType);
$return['link_type_id'] = (int)$parts[0];
$return['transaction_journal_id'] = $this->integer('link_journal_id');
$return['transaction_journal_id'] = $this->integer('opposing');
$return['notes'] = $this->string('notes');
$return['direction'] = $parts[1];
if (0 === $return['transaction_journal_id'] && ctype_digit($this->string('link_other'))) {
$return['transaction_journal_id'] = $this->integer('link_other');
}
return $return;
}
@@ -81,8 +78,8 @@ class JournalLinkRequest extends Request
// fixed
return [
'link_type' => sprintf('required|in:%s', $string),
'link_journal_id' => 'belongsToUser:transaction_journals',
'link_type' => sprintf('required|in:%s', $string),
'opposing' => 'belongsToUser:transaction_journals',
];
}
}