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

Some code for #1272

Browse Source
This commit is contained in:
James Cole
2018-04-24 19:26:16 +02:00
parent 798d9ee876
commit f78b8f9267
28 changed files with 172 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Transformers/TransactionTransformer.php
View File

@@ -157,16 +157,12 @@ class TransactionTransformer extends TransformerAbstract
$categoryName = null;
$budgetId = null;
$budgetName = null;
$categoryId = null === $transaction->transaction_category_id ? $transaction->transaction_journal_category_id
: $transaction->transaction_category_id;
$categoryName = null === $transaction->transaction_category_name ? $transaction->transaction_journal_category_name
: $transaction->transaction_category_name;
$categoryId = $transaction->transaction_category_id ?? $transaction->transaction_journal_category_id;
$categoryName = $transaction->transaction_category_name ?? $transaction->transaction_journal_category_name;
if ($transaction->transaction_type_type === TransactionType::WITHDRAWAL) {
$budgetId = null === $transaction->transaction_budget_id ? $transaction->transaction_journal_budget_id
: $transaction->transaction_budget_id;
$budgetName = null === $transaction->transaction_budget_name ? $transaction->transaction_journal_budget_name
: $transaction->transaction_budget_name;
$budgetId = $transaction->transaction_budget_id ?? $transaction->transaction_journal_budget_id;
$budgetName = $transaction->transaction_budget_name ?? $transaction->transaction_journal_budget_name;
}
/** @var Note $dbNote */
$dbNote = $transaction->transactionJournal->notes()->first();
@@ -250,7 +246,7 @@ class TransactionTransformer extends TransformerAbstract
}
// expand description.
if (strlen((string)$transaction->transaction_description) > 0) {
if (\strlen((string)$transaction->transaction_description) > 0) {
$data['description'] = $transaction->transaction_description . ' (' . $transaction->description . ')';
}