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

Expand recurring transactions API

Browse Source
This commit is contained in:
James Cole
2018-06-29 19:27:07 +02:00
parent d0db1117f7
commit 2d7b7c2f3f
21 changed files with 670 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Services/Internal/Support/RecurringTransactionTrait.php
View File

@@ -66,8 +66,6 @@ trait RecurringTransactionTrait
/**
* @param Recurrence $recurrence
* @param array $transactions
*
* @throws FireflyException
*/
public function createTransactions(Recurrence $recurrence, array $transactions): void
{
@@ -76,19 +74,17 @@ trait RecurringTransactionTrait
$source = null;
$destination = null;
switch ($recurrence->transactionType->type) {
default:
throw new FireflyException(sprintf('Cannot create "%s".', $recurrence->transactionType->type));
case TransactionType::WITHDRAWAL:
$source = $this->findAccount(AccountType::ASSET, $array['source_account_id'], null);
$destination = $this->findAccount(AccountType::EXPENSE, null, $array['destination_account_name']);
$source = $this->findAccount(AccountType::ASSET, $array['source_id'], $array['source_name'] ?? null);
$destination = $this->findAccount(AccountType::EXPENSE, $array['destination_id'] ?? null, $array['destination_name']);
break;
case TransactionType::DEPOSIT:
$source = $this->findAccount(AccountType::REVENUE, null, $array['source_account_name']);
$destination = $this->findAccount(AccountType::ASSET, $array['destination_account_id'], null);
$source = $this->findAccount(AccountType::REVENUE, $array['source_id'] ?? null, $array['source_name']);
$destination = $this->findAccount(AccountType::ASSET, $array['destination_id'], $array['destination_name'] ?? null);
break;
case TransactionType::TRANSFER:
$source = $this->findAccount(AccountType::ASSET, $array['source_account_id'], null);
$destination = $this->findAccount(AccountType::ASSET, $array['destination_account_id'], null);
$source = $this->findAccount(AccountType::ASSET, $array['source_id'], $array['source_name'] ?? null);
$destination = $this->findAccount(AccountType::ASSET, $array['destination_id'], $array['destination_name'] ?? null);
break;
}
@@ -96,9 +92,9 @@ trait RecurringTransactionTrait
[
'recurrence_id' => $recurrence->id,
'transaction_currency_id' => $array['transaction_currency_id'],
'foreign_currency_id' => '' === (string)$array['foreign_amount'] ? null : $array['foreign_currency_id'],
'source_account_id' => $source->id,
'destination_account_id' => $destination->id,
'foreign_currency_id' => '' === (string)$array['foreign_currency_id'] ? null : $array['foreign_currency_id'],
'source_id' => $source->id,
'destination_id' => $destination->id,
'amount' => $array['amount'],
'foreign_amount' => '' === (string)$array['foreign_amount'] ? null : (string)$array['foreign_amount'],
'description' => $array['description'],