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

Fix various code.

Browse Source
This commit is contained in:
James Cole
2025-05-27 17:06:15 +02:00
parent d8f512ca3a
commit 2cb14f6b72
123 changed files with 581 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,8 @@ use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;
use Override;
use function Safe\json_decode;
/**
* Class TransactionGroupTwig
*/
@@ -91,7 +93,7 @@ class TransactionGroupTwig extends AbstractExtension
$result = app('amount')->formatFlat($array['currency_symbol'], (int) $array['currency_decimal_places'], $amount, $colored);
if (TransactionTypeEnum::TRANSFER->value === $type) {
$result = sprintf('<span class="text-info money-transfer">%s</span>', $result);
return sprintf('<span class="text-info money-transfer">%s</span>', $result);
}
return $result;
@@ -111,7 +113,7 @@ class TransactionGroupTwig extends AbstractExtension
// reconciliation and it comes from reconciliation?
if (TransactionTypeEnum::RECONCILIATION->value === $transactionType && AccountTypeEnum::RECONCILIATION->value !== $sourceType) {
$amount = bcmul($amount, '-1');
return bcmul($amount, '-1');
}
return $amount;
@@ -134,7 +136,7 @@ class TransactionGroupTwig extends AbstractExtension
}
$result = app('amount')->formatFlat($array['foreign_currency_symbol'], (int) $array['foreign_currency_decimal_places'], $amount, $colored);
if (TransactionTypeEnum::TRANSFER->value === $type) {
$result = sprintf('<span class="text-info money-transfer">%s</span>', $result);
return sprintf('<span class="text-info money-transfer">%s</span>', $result);
}
return $result;
@@ -182,7 +184,7 @@ class TransactionGroupTwig extends AbstractExtension
}
$result = app('amount')->formatFlat($currency->symbol, $currency->decimal_places, $amount, $colored);
if (TransactionTypeEnum::TRANSFER->value === $type) {
$result = sprintf('<span class="text-info money-transfer">%s</span>', $result);
return sprintf('<span class="text-info money-transfer">%s</span>', $result);
}
return $result;
@@ -217,7 +219,7 @@ class TransactionGroupTwig extends AbstractExtension
}
$result = app('amount')->formatFlat($currency->symbol, $currency->decimal_places, $amount, $colored);
if (TransactionTypeEnum::TRANSFER->value === $type) {
$result = sprintf('<span class="text-info money-transfer">%s</span>', $result);
return sprintf('<span class="text-info money-transfer">%s</span>', $result);
}
return $result;
@@ -256,7 +258,7 @@ class TransactionGroupTwig extends AbstractExtension
return today(config('app.timezone'));
}
return new Carbon(\Safe\json_decode($entry->data, false));
return new Carbon(json_decode((string) $entry->data, false));
}
);
}
@@ -277,7 +279,7 @@ class TransactionGroupTwig extends AbstractExtension
return '';
}
return \Safe\json_decode($entry->data, true);
return json_decode((string) $entry->data, true);
}
);
}