kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-18 18:40:12 +00:00
Code Issues Projects Releases Wiki Activity

Add more rounded debug

Browse Source
This commit is contained in:
James Cole
2023-10-14 14:52:21 +02:00
parent ab546865a8
commit 127b6ea515
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Services/Internal/Support/CreditRecalculateService.php
View File

@@ -196,7 +196,9 @@ class CreditRecalculateService
} }
$startOfDebt = $this->repository->getOpeningBalanceAmount($account) ?? '0'; $startOfDebt = $this->repository->getOpeningBalanceAmount($account) ?? '0';
$leftOfDebt = app('steam')->positive($startOfDebt); $leftOfDebt = app('steam')->positive($startOfDebt);
app('log')->debug(sprintf('Start of debt is "%s", so initial left of debt is "%s"', $startOfDebt, $leftOfDebt)); $currency = $this->repository->getAccountCurrency($account);
$decimals = (int)($currency?->decimal_places ?? 2);
app('log')->debug(sprintf('Start of debt is "%s", so initial left of debt is "%s"', app('steam')->bcround($startOfDebt, $decimals), app('steam')->bcround($leftOfDebt, $decimals)));
/** @var AccountMetaFactory $factory */ /** @var AccountMetaFactory $factory */
$factory = app(AccountMetaFactory::class); $factory = app(AccountMetaFactory::class);
@@ -268,17 +270,20 @@ class CreditRecalculateService
*/ */
private function processTransaction(Account $account, string $direction, Transaction $transaction, string $leftOfDebt): string private function processTransaction(Account $account, string $direction, Transaction $transaction, string $leftOfDebt): string
{ {
app('log')->debug(sprintf('Left of debt is: %s', $leftOfDebt));
$journal = $transaction->transactionJournal; $journal = $transaction->transactionJournal;
$foreignCurrency = $transaction->foreignCurrency; $foreignCurrency = $transaction->foreignCurrency;
$accountCurrency = $this->repository->getAccountCurrency($account); $accountCurrency = $this->repository->getAccountCurrency($account);
$groupId = $journal->transaction_group_id; $groupId = $journal->transaction_group_id;
$decimals = (int)$accountCurrency->decimal_places;
$type = $journal->transactionType->type; $type = $journal->transactionType->type;
/** @var Transaction $destTransaction */ /** @var Transaction $destTransaction */
$destTransaction = $journal->transactions()->where('amount', '>', '0')->first(); $destTransaction = $journal->transactions()->where('amount', '>', '0')->first();
/** @var Transaction $sourceTransaction */ /** @var Transaction $sourceTransaction */
$sourceTransaction = $journal->transactions()->where('amount', '<', '0')->first(); $sourceTransaction = $journal->transactions()->where('amount', '<', '0')->first();
app('log')->debug(sprintf('Left of debt is: %s', app('steam')->bcround($leftOfDebt, $decimals)));
if ('' === $direction) { if ('' === $direction) {
app('log')->warning('Direction is empty, so do nothing.'); app('log')->warning('Direction is empty, so do nothing.');
return $leftOfDebt; return $leftOfDebt;
@@ -289,7 +294,6 @@ class CreditRecalculateService
} }
// amount to use depends on the currency: // amount to use depends on the currency:
$decimals = (int)$accountCurrency->decimal_places;
$usedAmount = $transaction->amount; $usedAmount = $transaction->amount;
app('log')->debug(sprintf('Amount of transaction is %s', app('steam')->bcround($usedAmount, $decimals))); app('log')->debug(sprintf('Amount of transaction is %s', app('steam')->bcround($usedAmount, $decimals)));
if (null !== $foreignCurrency && $foreignCurrency->id === $accountCurrency->id) { if (null !== $foreignCurrency && $foreignCurrency->id === $accountCurrency->id) {