IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-09 23:15:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #942

Browse Source
This commit is contained in:
James Cole 2017-10-19 20:37:39 +02:00
parent 7d921d648d
commit c53618d0e2
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Transaction/SplitController.php
View File

@ -21,6 +21,7 @@ use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\SplitJournalFormRequest;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\Note;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
@ -221,6 +222,12 @@ class SplitController extends Controller
{
$sourceAccounts = $journal->sourceAccountList();
$destinationAccounts = $journal->destinationAccountList();
$notes = '';
/** @var Note $note */
$note = $journal->notes()->first();
if (!is_null($note)) {
$notes = $note->text;
}
$array = [
'journal_description' => $request->old('journal_description', $journal->description),
'journal_amount' => $journal->amountPositive(),
@ -241,7 +248,7 @@ class SplitController extends Controller
'payment_date' => $request->old('payment_date', $journal->getMeta('payment_date')),
'invoice_date' => $request->old('invoice_date', $journal->getMeta('invoice_date')),
'internal_reference' => $request->old('internal_reference', $journal->getMeta('internal_reference')),
'notes' => $request->old('notes', $journal->getMeta('notes')),
'notes' => $request->old('notes', $notes),
// transactions.
'transactions' => $this->getTransactionDataFromJournal($journal),