kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-21 19:49:54 +00:00
Code Issues Projects Releases Wiki Activity

Complexity cleanup [skip ci]

Browse Source
This commit is contained in:
James Cole
2014-12-31 16:45:12 +01:00
parent 8ec8042045
commit 6fa73ee28d
10 changed files with 92 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/controllers/TransactionController.php
View File

@@ -165,8 +165,8 @@ class TransactionController extends BaseController
*/
public function doRelate()
{
$brother = intval(Input::get('id'));
$sister = intval(Input::get('relateTo'));
$brother = intval(Input::get('id'));
$sister = intval(Input::get('relateTo'));
$journal = $this->_repository->find($brother);
$sis = $this->_repository->find($sister);
@@ -358,9 +358,14 @@ class TransactionController extends BaseController
*/
public function store($what)
{
$data = Input::except('_token');
$data['what'] = $what;
$data['currency'] = 'EUR'; // TODO allow custom currency
$data = Input::except('_token');
$transactionType = $this->_repository->getJournalType($what);
$transactionCurrency = $this->_repository->getJournalCurrency('EUR');
$data['transaction_type_id'] = $transactionType->id;
$data['transaction_currency_id'] = $transactionCurrency->id;
$data['completed'] = 0;
$data['what'] = $what;
$data['currency'] = 'EUR'; // TODO allow custom currency
// always validate:
$messages = $this->_repository->validate($data);
@@ -434,10 +439,13 @@ class TransactionController extends BaseController
*/
public function update(TransactionJournal $journal)
{
$data = Input::except('_token');
$data['currency'] = 'EUR';
$data['what'] = strtolower($journal->transactionType->type);
$messages = $this->_repository->validate($data);
$data = Input::except('_token');
$data['currency'] = 'EUR';
$data['what'] = strtolower($journal->transactionType->type);
$data['transaction_type_id'] = $journal->transaction_type_id;
$data['transaction_currency_id'] = $journal->transaction_currency_id;
$data['completed'] = 1;
$messages = $this->_repository->validate($data);
Session::flash('warnings', $messages['warnings']);
Session::flash('successes', $messages['successes']);