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

Strip newlines and tabs from description.

Browse Source
This commit is contained in:
James Cole 2018-09-23 06:53:15 +02:00
parent 82e7202ad2
commit 8fd64791d6
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Factory/TransactionJournalFactory.php
View File

@ -36,6 +36,11 @@ use Log;
*/ */
class TransactionJournalFactory class TransactionJournalFactory
{ {
/** @var User The user */
private $user;
use JournalServiceTrait, TransactionTypeTrait;
/** /**
* Constructor. * Constructor.
*/ */
@ -46,10 +51,6 @@ class TransactionJournalFactory
} }
} }
use JournalServiceTrait, TransactionTypeTrait;
/** @var User The user */
private $user;
/** /**
* Store a new transaction journal. * Store a new transaction journal.
* *
@ -67,13 +68,15 @@ class TransactionJournalFactory
$type = $this->findTransactionType($data['type']); $type = $this->findTransactionType($data['type']);
$defaultCurrency = app('amount')->getDefaultCurrencyByUser($this->user); $defaultCurrency = app('amount')->getDefaultCurrencyByUser($this->user);
Log::debug(sprintf('Going to store a %s', $type->type)); Log::debug(sprintf('Going to store a %s', $type->type));
$journal = TransactionJournal::create( $description = app('steam')->cleanString($data['description']);
$description = str_replace(["\n", "\t", "\r"], "\x20", $description);
$journal = TransactionJournal::create(
[ [
'user_id' => $data['user'], 'user_id' => $data['user'],
'transaction_type_id' => $type->id, 'transaction_type_id' => $type->id,
'bill_id' => null, 'bill_id' => null,
'transaction_currency_id' => $defaultCurrency->id, 'transaction_currency_id' => $defaultCurrency->id,
'description' => $data['description'], 'description' => $description,
'date' => $data['date']->format('Y-m-d'), 'date' => $data['date']->format('Y-m-d'),
'order' => 0, 'order' => 0,
'tag_count' => 0, 'tag_count' => 0,
@ -114,7 +117,7 @@ class TransactionJournalFactory
// store date meta fields (if present): // store date meta fields (if present):
$fields = ['sepa-cc', 'sepa-ct-op', 'sepa-ct-id', 'sepa-db', 'sepa-country', 'sepa-ep', 'sepa-ci', 'interest_date', 'book_date', 'process_date', $fields = ['sepa-cc', 'sepa-ct-op', 'sepa-ct-id', 'sepa-db', 'sepa-country', 'sepa-ep', 'sepa-ci', 'interest_date', 'book_date', 'process_date',
'due_date', 'recurrence_id', 'payment_date', 'invoice_date', 'internal_reference', 'bunq_payment_id', 'importHash', 'importHashV2', 'due_date', 'recurrence_id', 'payment_date', 'invoice_date', 'internal_reference', 'bunq_payment_id', 'importHash', 'importHashV2',
'external_id', 'sepa-batch-id','original-source']; 'external_id', 'sepa-batch-id', 'original-source'];
foreach ($fields as $field) { foreach ($fields as $field) {
$this->storeMeta($journal, $data, $field); $this->storeMeta($journal, $data, $field);