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

New chart and lots of stuff for piggy banks

Browse Source
This commit is contained in:
James Cole
2014-11-16 10:31:19 +01:00
parent 61aba29df7
commit 2d9c89375a
11 changed files with 284 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/controllers/TransactionController.php
View File

@@ -100,10 +100,16 @@ class TransactionController extends BaseController
{
$type = $transactionJournal->transactionType->type;
/*
* Trigger creation of new piggy bank event
*/
Event::fire('piggybank.destroyTransfer', [$transactionJournal]);
/** @var \FireflyIII\Database\TransactionJournal $repository */
$repository = App::make('FireflyIII\Database\TransactionJournal');
$repository->destroy($transactionJournal);
switch ($type) {
case 'Withdrawal':
return Redirect::route('transactions.index', 'withdrawal');
@@ -126,6 +132,9 @@ class TransactionController extends BaseController
*/
public function edit(TransactionJournal $journal)
{
/*
* TODO the piggybank id must be filled in when relevant.
*/
/*
* All the repositories we need:
*/
@@ -199,9 +208,17 @@ class TransactionController extends BaseController
$prefilled['amount'] = floatval($journal->transactions[1]->amount);
break;
case 'transfer':
$prefilled['account_from_id'] = $journal->transactions[1]->account->id;
$prefilled['account_to_id'] = $journal->transactions[0]->account->id;
$prefilled['amount'] = floatval($journal->transactions[1]->amount);
if (floatval($journal->transactions[0]->amount) < 0) {
// zero = from account.
$prefilled['account_from_id'] = $journal->transactions[0]->account->id;
$prefilled['account_to_id'] = $journal->transactions[1]->account->id;
$prefilled['amount'] = floatval($journal->transactions[1]->amount);
} else {
// one = from account
$prefilled['account_from_id'] = $journal->transactions[1]->account->id;
$prefilled['account_to_id'] = $journal->transactions[0]->account->id;
$prefilled['amount'] = floatval($journal->transactions[0]->amount);
}
break;
}
@@ -248,7 +265,7 @@ class TransactionController extends BaseController
break;
}
return View::make('transactions.index', compact('subTitle', 'subTitleIcon','journals'))->with('what', $what);
return View::make('transactions.index', compact('subTitle', 'subTitleIcon', 'journals'))->with('what', $what);
}
@@ -295,9 +312,17 @@ class TransactionController extends BaseController
return Redirect::route('transactions.create', $what)->withInput()->withErrors($messages['errors']);
}
// store!
$repository->store($data);
$journal = $repository->store($data);
Session::flash('success', 'New transaction stored!');
/*
* Trigger a search for the related (if selected)
* piggy bank and store an event.
*/
if (!is_null(Input::get('piggybank_id')) && intval(Input::get('piggybank_id')) > 0) {
Event::fire('piggybank.createTransfer', [$journal, intval(Input::get('piggybank_id'))]);
}
if ($data['post_submit_action'] == 'create_another') {
return Redirect::route('transactions.create', $what)->withInput();
} else {
@@ -339,6 +364,7 @@ class TransactionController extends BaseController
// has been saved, return to index:
Session::flash('success', 'Transaction updated!');
// Event::fire('journals.update', [$journal]);
Event::fire('piggybank.updateTransfer', [$journal]);
if (Input::get('post_submit_action') == 'return_to_edit') {
return Redirect::route('transactions.edit', $journal->id)->withInput();