kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-18 18:44:16 +00:00
Code Issues Projects Releases Wiki Activity

For consistency, renamed some events.

Browse Source
This commit is contained in:
James Cole
2014-11-18 09:41:43 +01:00
parent eebac2a66d
commit 058e5602a3
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/TransactionController.php
View File

@@ -103,7 +103,7 @@ class TransactionController extends BaseController
/* /*
* Trigger creation of new piggy bank event * Trigger creation of new piggy bank event
*/ */
Event::fire('piggybank.destroyTransfer', [$transactionJournal]); // new and used. Event::fire('transactionJournal.destroy', [$transactionJournal]); // new and used.
/** @var \FireflyIII\Database\TransactionJournal $repository */ /** @var \FireflyIII\Database\TransactionJournal $repository */
$repository = App::make('FireflyIII\Database\TransactionJournal'); $repository = App::make('FireflyIII\Database\TransactionJournal');
@@ -324,9 +324,11 @@ class TransactionController extends BaseController
* Trigger a search for the related (if selected) * Trigger a search for the related (if selected)
* piggy bank and store an event. * piggy bank and store an event.
*/ */
$piggyID = null;
if (!is_null(Input::get('piggybank_id')) && intval(Input::get('piggybank_id')) > 0) { if (!is_null(Input::get('piggybank_id')) && intval(Input::get('piggybank_id')) > 0) {
Event::fire('piggybank.storeTransfer', [$journal, intval(Input::get('piggybank_id'))]); // new and used. $piggyID = intval(Input::get('piggybank_id'));
} }
Event::fire('transactionJournal.store', [$journal, $piggyID]); // new and used.
if ($data['post_submit_action'] == 'create_another') { if ($data['post_submit_action'] == 'create_another') {
return Redirect::route('transactions.create', $what)->withInput(); return Redirect::route('transactions.create', $what)->withInput();
@@ -371,7 +373,7 @@ class TransactionController extends BaseController
if ($messageBag->count() == 0) { if ($messageBag->count() == 0) {
// has been saved, return to index: // has been saved, return to index:
Session::flash('success', 'Transaction updated!'); Session::flash('success', 'Transaction updated!');
Event::fire('piggybank.updateTransfer', [$journal]); // new and used. Event::fire('transactionJournal.update', [$journal]); // new and used.
if (Input::get('post_submit_action') == 'return_to_edit') { if (Input::get('post_submit_action') == 'return_to_edit') {
return Redirect::route('transactions.edit', $journal->id)->withInput(); return Redirect::route('transactions.edit', $journal->id)->withInput();

13
app/lib/FireflyIII/Event/Piggybank.php
View File

@@ -110,6 +110,9 @@ class Piggybank
*/ */
public function storeTransfer(\TransactionJournal $journal, $piggybankId = 0) public function storeTransfer(\TransactionJournal $journal, $piggybankId = 0)
{ {
if ($piggybankId == 0 || is_null($piggybankId)) {
return;
}
/** @var \FireflyIII\Database\Piggybank $repository */ /** @var \FireflyIII\Database\Piggybank $repository */
$repository = \App::make('FireflyIII\Database\Piggybank'); $repository = \App::make('FireflyIII\Database\Piggybank');
@@ -176,12 +179,16 @@ class Piggybank
*/ */
public function subscribe(Dispatcher $events) public function subscribe(Dispatcher $events)
{ {
// triggers on piggy bank events:
$events->listen('piggybank.addMoney', 'FireflyIII\Event\Piggybank@addMoney'); $events->listen('piggybank.addMoney', 'FireflyIII\Event\Piggybank@addMoney');
$events->listen('piggybank.removeMoney', 'FireflyIII\Event\Piggybank@removeMoney'); $events->listen('piggybank.removeMoney', 'FireflyIII\Event\Piggybank@removeMoney');
$events->listen('piggybank.storeTransfer', 'FireflyIII\Event\Piggybank@storeTransfer');
$events->listen('piggybank.storePiggybank', 'FireflyIII\Event\Piggybank@storePiggybank'); $events->listen('piggybank.storePiggybank', 'FireflyIII\Event\Piggybank@storePiggybank');
$events->listen('piggybank.destroyTransfer', 'FireflyIII\Event\Piggybank@destroyTransfer');
$events->listen('piggybank.updateTransfer', 'FireflyIII\Event\Piggybank@updateTransfer'); // triggers when others are updated.
$events->listen('transactionJournal.store', 'FireflyIII\Event\Piggybank@storeTransfer');
$events->listen('transactionJournal.update', 'FireflyIII\Event\Piggybank@updateTransfer');
$events->listen('transactionJournal.destroy', 'FireflyIII\Event\Piggybank@destroyTransfer');
} }
public function updateTransfer(\TransactionJournal $journal) public function updateTransfer(\TransactionJournal $journal)