kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-06 12:45:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix some edge cases in liabilities.

Browse Source
This commit is contained in:
James Cole
2021-05-15 09:16:54 +02:00
parent e7d8c3451b
commit a7f74522bd
1 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,15 +101,19 @@ class CreditRecalculateService
$this->repository->setUser($account->user); $this->repository->setUser($account->user);
$startOfDebt = $this->repository->getOpeningBalanceAmount($account) ?? '0'; $startOfDebt = $this->repository->getOpeningBalanceAmount($account) ?? '0';
$leftOfDebt = app('steam')->positive($startOfDebt); $leftOfDebt = app('steam')->positive($startOfDebt);
/** @var AccountMetaFactory $factory */ /** @var AccountMetaFactory $factory */
$factory = app(AccountMetaFactory::class); $factory = app(AccountMetaFactory::class);
$factory->crud($account, 'start_of_debt', $startOfDebt); $factory->crud($account, 'start_of_debt', $startOfDebt);
// get direction of liability:
$direction = (string)$this->repository->getMetaValue($account, 'liability_direction');
// now loop all transactions (except opening balance and credit thing) // now loop all transactions (except opening balance and credit thing)
$transactions = $account->transactions()->get(); $transactions = $account->transactions()->get();
/** @var Transaction $transaction */ /** @var Transaction $transaction */
foreach ($transactions as $transaction) { foreach ($transactions as $transaction) {
$leftOfDebt = $this->processTransaction($account, $transaction, $leftOfDebt); $leftOfDebt = $this->processTransaction($account, $direction, $transaction, $leftOfDebt);
} }
$factory->crud($account, 'current_debt', $leftOfDebt); $factory->crud($account, 'current_debt', $leftOfDebt);
@@ -235,25 +239,49 @@ class CreditRecalculateService
} }
/** /**
* @param Account $account
* @param string $direction
* @param Transaction $transaction * @param Transaction $transaction
* @param string $amount * @param string $amount
* *
* @return string * @return string
*/ */
private function processTransaction(Account $account, Transaction $transaction, string $amount): string private function processTransaction(Account $account, string $direction, Transaction $transaction, string $amount): string
{ {
Log::debug(sprintf('Now in %s(#%d, %s)', __METHOD__, $transaction->id, $amount)); Log::debug(sprintf('Now in %s(#%d, %s)', __METHOD__, $transaction->id, $amount));
$journal = $transaction->transactionJournal; $journal = $transaction->transactionJournal;
$groupId = $journal->transaction_group_id;
$type = $journal->transactionType->type; $type = $journal->transactionType->type;
if ('' === $direction) {
Log::debug(sprintf('Type is "%s"', $type)); Log::debug('Since direction is "", do nothing.');
if (in_array($type, [TransactionType::WITHDRAWAL]) && (int)$account->id === (int)$transaction->account_id && 1 === bccomp($transaction->amount, '0')) {
Log::debug(sprintf('Transaction #%d is withdrawal into liability #%d, does not influence the amount left.', $account->id, $transaction->account_id));
return $amount; return $amount;
} }
if (in_array($type, [TransactionType::DEPOSIT]) && (int)$account->id === (int)$transaction->account_id && -1 === bccomp($transaction->amount, '0')) {
Log::debug(sprintf('Transaction #%d is deposit from liability #%d,does not influence the amount left.', $account->id, $transaction->account_id)); Log::debug(sprintf('Processing group #%d, journal #%d of type "%s"', $journal->id, $groupId, $type));
// it's a withdrawal into this liability (from asset).
// if it's a credit, we don't care, because sending more money
// to a credit-liability doesn't increase the amount (yet)
if (
in_array($type, [TransactionType::WITHDRAWAL])
&& (int)$account->id === (int)$transaction->account_id
&& 1 === bccomp($transaction->amount, '0')
&& 'credit' === $direction
) {
Log::debug(sprintf('Is withdrawal into credit liability #%d, does not influence the amount due.', $transaction->account_id));
return $amount;
}
// likewise deposit into a credit debt does not change the amount
if (
in_array($type, [TransactionType::DEPOSIT])
&& (int)$account->id === (int)$transaction->account_id
&& -1 === bccomp($transaction->amount, '0')
&& 'credit' === $direction
) {
Log::debug(sprintf('Is deposit from liability #%d,does not influence the amount left.', $transaction->account_id));
return $amount; return $amount;
} }