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

Expanded Amount and expanded TransactionJournal to include source and destination information.

Browse Source
This commit is contained in:
James Cole
2016-03-02 12:25:00 +01:00
parent 869360f26c
commit f2c1dd41d0
2 changed files with 59 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/Support/Amount.php
View File

@@ -70,31 +70,29 @@ class Amount
*/
public function formatJournal(TransactionJournal $journal, bool $coloured = true): string
{
$cache = new CacheProperties;
$cache->addProperty($journal->id);
$cache->addProperty('formatJournal');
if ($cache->has()) {
return $cache->get(); // @codeCoverageIgnore
$locale = setlocale(LC_MONETARY, 0);
$float = floatval($journal->destination_amount);
if ($journal->isWithdrawal()) {
$float = floatval($journal->source_amount);
}
$formatter = new NumberFormatter($locale, NumberFormatter::CURRENCY);
$result = $formatter->formatCurrency($float, $journal->transaction_currency_code);
if ($journal->isTransfer() && $coloured) {
$txt = '<span class="text-info">' . $this->formatAnything($journal->transactionCurrency, $journal->amount_positive, false) . '</span>';
$cache->store($txt);
return $txt;
if ($coloured === true && $float == 0) {
return '<span style="color:#999">' . $result . '</span>'; // always grey.
}
if ($journal->isTransfer() && !$coloured) {
$txt = $this->formatAnything($journal->transactionCurrency, $journal->amount_positive, false);
$cache->store($txt);
return $txt;
if (!$coloured) {
return $result;
}
if (!$journal->isTransfer()) {
if ($float > 0) {
return '<span class="text-success">' . $result . '</span>';
}
$txt = $this->formatAnything($journal->transactionCurrency, $journal->amount, $coloured);
$cache->store($txt);
return $txt;
return '<span class="text-danger">' . $result . '</span>';
} else {
return '<span class="text-info">' . $result . '</span>';
}
}
/**