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

Fix broken merge from 294cda7

Browse Source
This commit is contained in:
Florian Dupret
2020-07-27 11:52:25 +02:00
parent 294cda7f33
commit 261156588f
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Support/Twig/TransactionGroupTwig.php
View File

@@ -231,7 +231,6 @@ class TransactionGroupTwig extends AbstractExtension
if ($type === TransactionType::TRANSFER) { if ($type === TransactionType::TRANSFER) {
$colored = false; $colored = false;
} }
$result = app('amount')->formatFlat($journal['foreign_currency_symbol'], (int)$journal['foreign_currency_decimal_places'], $amount, $colored); $result = app('amount')->formatFlat($journal['foreign_currency_symbol'], (int)$journal['foreign_currency_decimal_places'], $amount, $colored);
if ($type === TransactionType::TRANSFER) { if ($type === TransactionType::TRANSFER) {
$result = sprintf('<span class="text-info">%s</span>', $result); $result = sprintf('<span class="text-info">%s</span>', $result);
@@ -286,12 +285,6 @@ class TransactionGroupTwig extends AbstractExtension
$sourceAccountId = $journal['source_account_id']; $sourceAccountId = $journal['source_account_id'];
$amount = $this->signAmount($amount, $type, $destinationType, $sourceAccountId, $account->id); $amount = $this->signAmount($amount, $type, $destinationType, $sourceAccountId, $account->id);
// withdrawals are negative
if ($type !== TransactionType::WITHDRAWAL) {
$amount = bcmul($amount, '-1');
}
if ($type === TransactionType::TRANSFER) { if ($type === TransactionType::TRANSFER) {
$colored = false; $colored = false;
} }