kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 06:01:21 +00:00
Code Issues Projects Releases Wiki Activity

Account search fixed.

Browse Source
This commit is contained in:
James Cole
2020-08-28 11:24:55 +02:00
parent 63794cab07
commit 093f34b7a8
26 changed files with 157 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

159
app/TransactionRules/Actions/ConvertToDeposit.php
View File

@@ -53,112 +53,6 @@ class ConvertToDeposit implements ActionInterface
$this->action = $action;
}
/**
* Execute the action.
*
* @param TransactionJournal $journal
* @deprecated
* @codeCoverageIgnore
* @return bool
* @throws FireflyException
*/
public function act(TransactionJournal $journal): bool
{
$type = $journal->transactionType->type;
if (TransactionType::DEPOSIT === $type) {
// @codeCoverageIgnoreStart
Log::error(sprintf('Journal #%d is already a deposit (rule "%s").', $journal->id, $this->action->rule->title));
return false;
// @codeCoverageIgnoreEnd
}
$destTransactions = $journal->transactions()->where('amount', '>', 0)->get();
$sourceTransactions = $journal->transactions()->where('amount', '<', 0)->get();
// break if count is zero:
if (1 !== $sourceTransactions->count()) {
// @codeCoverageIgnoreStart
Log::error(
vsprintf(
'Journal #%d has %d source transactions. ConvertToDeposit failed. (rule "%s").',
[$journal->id, $sourceTransactions->count(), $this->action->rule->title]
)
);
return false;
// @codeCoverageIgnoreEnd
}
if (0 === $destTransactions->count()) {
// @codeCoverageIgnoreStart
Log::error(
vsprintf(
'Journal #%d has %d dest transactions. ConvertToDeposit failed. (rule "%s").',
[$journal->id, $destTransactions->count(), $this->action->rule->title]
)
);
return false;
// @codeCoverageIgnoreEnd
}
if (TransactionType::WITHDRAWAL === $type) {
Log::debug('Going to transform a withdrawal to a deposit.');
return $this->convertWithdrawal($journal);
}
if (TransactionType::TRANSFER === $type) {
Log::debug('Going to transform a transfer to a deposit.');
return $this->convertTransfer($journal);
}
return false; // @codeCoverageIgnore
}
/**
* Input is a transfer from A to B.
* Output is a deposit from C to B.
*
* @param TransactionJournal $journal
* @return bool
* @throws FireflyException
* @deprecated
*/
private function convertTransfer(TransactionJournal $journal): bool
{
// find or create revenue account.
/** @var AccountFactory $factory */
$factory = app(AccountFactory::class);
$factory->setUser($journal->user);
$sourceTransactions = $journal->transactions()->where('amount', '<', 0)->get();
// get the action value, or use the original source name in case the action value is empty:
// this becomes a new or existing revenue account.
/** @var Account $source */
$source = $sourceTransactions->first()->account;
$revenueName = '' === $this->action->action_value ? $source->name : $this->action->action_value;
$revenue = $factory->findOrCreate($revenueName, AccountType::REVENUE);
Log::debug(sprintf('ConvertToDeposit. Action value is "%s", revenue name is "%s"', $this->action->action_value, $source->name));
unset($source);
// update source transaction(s) to be revenue account
$journal->transactions()
->where('amount', '<', 0)
->update(['account_id' => $revenue->id]);
// change transaction type of journal:
$newType = TransactionType::whereType(TransactionType::DEPOSIT)->first();
$journal->transaction_type_id = $newType->id;
$journal->save();
Log::debug('Converted transfer to deposit.');
return true;
}
/**
* Input is a transfer from A to B.
* Output is a deposit from C to B.
@@ -202,59 +96,6 @@ class ConvertToDeposit implements ActionInterface
return true;
}
/**
* Input is a withdrawal from A to B
* Is converted to a deposit from C to A.
*
* @param TransactionJournal $journal
* @deprecated
* @return bool
* @throws FireflyException
*/
private function convertWithdrawal(TransactionJournal $journal): bool
{
// find or create revenue account.
/** @var AccountFactory $factory */
$factory = app(AccountFactory::class);
$factory->setUser($journal->user);
$destTransactions = $journal->transactions()->where('amount', '>', 0)->get();
$sourceTransactions = $journal->transactions()->where('amount', '<', 0)->get();
// get the action value, or use the original destination name in case the action value is empty:
// this becomes a new or existing revenue account.
/** @var Account $destination */
$destination = $destTransactions->first()->account;
$revenueName = '' === $this->action->action_value ? $destination->name : $this->action->action_value;
$revenue = $factory->findOrCreate($revenueName, AccountType::REVENUE);
Log::debug(sprintf('ConvertToDeposit. Action value is "%s", revenue name is "%s"', $this->action->action_value, $destination->name));
// get source account from transaction(s).
/** @var Account $source */
$source = $sourceTransactions->first()->account;
// update source transaction(s) to be revenue account
$journal->transactions()
->where('amount', '<', 0)
->update(['account_id' => $revenue->id]);
// update destination transaction(s) to be original source account(s).
$journal->transactions()
->where('amount', '>', 0)
->update(['account_id' => $source->id]);
// change transaction type of journal:
$newType = TransactionType::whereType(TransactionType::DEPOSIT)->first();
$journal->transaction_type_id = $newType->id;
$journal->save();
Log::debug('Converted withdrawal to deposit.');
return true;
}
/**
* Input is a withdrawal from A to B
* Is converted to a deposit from C to A.