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

Improve view for transactions.

Browse Source
This commit is contained in:
James Cole
2018-03-11 14:09:44 +01:00
parent a9870b35be
commit c2dfbcba10
4 changed files with 103 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Support/Twig/Extension/Transaction.php
View File

@@ -101,17 +101,15 @@ class Transaction extends Twig_Extension
public function amountArray(array $transaction): string
{
// first display amount:
$amount = TransactionType::WITHDRAWAL === $transaction['journal_type'] ? $transaction['source_amount']
: $transaction['destination_amount'];
$amount = strval($transaction['amount']);
$fakeCurrency = new TransactionCurrency;
$fakeCurrency->decimal_places = $transaction['transaction_currency_dp'];
$fakeCurrency->symbol = $transaction['transaction_currency_symbol'];
$fakeCurrency->decimal_places = $transaction['currency_dp'];
$fakeCurrency->symbol = $transaction['currency_symbol'];
$string = app('amount')->formatAnything($fakeCurrency, $amount, true);
// then display (if present) the foreign amount:
if (null !== $transaction['foreign_source_amount']) {
$amount = TransactionType::WITHDRAWAL === $transaction['journal_type'] ? $transaction['foreign_source_amount']
: $transaction['foreign_destination_amount'];
if (null !== $transaction['foreign_amount']) {
$amount = strval($transaction['foreign_amount']);
$fakeCurrency = new TransactionCurrency;
$fakeCurrency->decimal_places = $transaction['foreign_currency_dp'];
$fakeCurrency->symbol = $transaction['foreign_currency_symbol'];