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

Removed double code.

Browse Source
This commit is contained in:
James Cole
2015-03-29 12:32:00 +02:00
parent f601af3da0
commit bd96b2819f
1 changed files with 35 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
app/Repositories/Journal/JournalRepository.php
View File

@@ -139,41 +139,7 @@ class JournalRepository implements JournalRepositoryInterface
} }
// store accounts (depends on type) // store accounts (depends on type)
switch ($transactionType->type) { list($from, $to) = $this->storeAccounts($transactionType, $data);
case 'Withdrawal':
$from = Account::find($data['account_id']);
if (strlen($data['expense_account']) > 0) {
$toType = AccountType::where('type', 'Expense account')->first();
$to = Account::firstOrCreate(
['user_id' => $data['user'], 'account_type_id' => $toType->id, 'name' => $data['expense_account'], 'active' => 1]
);
} else {
$toType = AccountType::where('type', 'Cash account')->first();
$to = Account::firstOrCreate(['user_id' => $data['user'], 'account_type_id' => $toType->id, 'name' => 'Cash account', 'active' => 1]);
}
break;
case 'Deposit':
$to = Account::find($data['account_id']);
if (strlen($data['revenue_account']) > 0) {
$fromType = AccountType::where('type', 'Revenue account')->first();
$from = Account::firstOrCreate(
['user_id' => $data['user'], 'account_type_id' => $fromType->id, 'name' => $data['revenue_account'], 'active' => 1]
);
} else {
$toType = AccountType::where('type', 'Cash account')->first();
$from = Account::firstOrCreate(['user_id' => $data['user'], 'account_type_id' => $toType->id, 'name' => 'Cash account', 'active' => 1]);
}
break;
case 'Transfer':
$from = Account::find($data['account_from_id']);
$to = Account::find($data['account_to_id']);
break;
}
// store accompanying transactions. // store accompanying transactions.
Transaction::create( // first transaction. Transaction::create( // first transaction.
@@ -198,7 +164,6 @@ class JournalRepository implements JournalRepositoryInterface
} }
/** /**
* @param TransactionJournal $journal * @param TransactionJournal $journal
* @param array $data * @param array $data
@@ -228,7 +193,39 @@ class JournalRepository implements JournalRepositoryInterface
} }
// store accounts (depends on type) // store accounts (depends on type)
switch ($journal->transactionType->type) { list($from, $to) = $this->storeAccounts($journal->transactionType, $data);
// update the from and to transaction.
/** @var Transaction $transaction */
foreach ($journal->transactions()->get() as $transaction) {
if (floatval($transaction->amount) < 0) {
// this is the from transaction, negative amount:
$transaction->amount = $data['amount'] * -1;
$transaction->account_id = $from->id;
$transaction->save();
}
if (floatval($transaction->amount) > 0) {
$transaction->amount = $data['amount'];
$transaction->account_id = $to->id;
$transaction->save();
}
}
$journal->save();
return $journal;
}
/**
* @param TransactionType $type
* @param array $data
*
* @return array
*/
protected function storeAccounts(TransactionType $type, array $data)
{
switch ($type->type) {
case 'Withdrawal': case 'Withdrawal':
$from = Account::find($data['account_id']); $from = Account::find($data['account_id']);
@@ -264,26 +261,7 @@ class JournalRepository implements JournalRepositoryInterface
break; break;
} }
// update the from and to transaction. return [$from, $to];
/** @var Transaction $transaction */
foreach ($journal->transactions()->get() as $transaction) {
if (floatval($transaction->amount) < 0) {
// this is the from transaction, negative amount:
$transaction->amount = $data['amount'] * -1;
$transaction->account_id = $from->id;
$transaction->save();
}
if (floatval($transaction->amount) > 0) {
$transaction->amount = $data['amount'];
$transaction->account_id = $to->id;
$transaction->save();
}
}
$journal->save();
return $journal;
} }
} }