kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-25 14:58:40 +00:00
Code Issues Projects Releases Wiki Activity

Update event.

Browse Source
This commit is contained in:
James Cole
2015-03-01 08:34:59 +01:00
parent dddb8cdbc0
commit 19e34b460f
4 changed files with 86 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/Events/JournalSaved.php Normal file
View File

@@ -0,0 +1,25 @@
<?php namespace FireflyIII\Events;
use FireflyIII\Events\Event;
use FireflyIII\Models\TransactionJournal;
use Illuminate\Queue\SerializesModels;
class JournalSaved extends Event {
use SerializesModels;
public $journal;
/**
* Create a new event instance.
*
* @return void
*/
public function __construct(TransactionJournal $journal)
{
//
$this->journal = $journal;
}
}

53
app/Handlers/Events/RescanJournal.php Normal file
View File

@@ -0,0 +1,53 @@
<?php namespace FireflyIII\Handlers\Events;
use FireflyIII\Events\JournalSaved;
use Log;
use App;
/**
* Class RescanJournal
*
* @package FireflyIII\Handlers\Events
*/
class RescanJournal
{
/**
* Create the event handler.
*
* @return void
*/
public function __construct()
{
//
}
/**
* Handle the event.
*
* @param JournalSaved $event
*
* @return void
*/
public function handle(JournalSaved $event)
{
$journal = $event->journal;
Log::debug('Triggered saved event for journal #' . $journal->id . ' (' . $journal->description . ')');
/** @var \FireflyIII\Repositories\Bill\BillRepositoryInterface $repository */
$repository = App::make('FireflyIII\Repositories\Bill\BillRepositoryInterface');
$list = $journal->user->bills()->where('active', 1)->where('automatch', 1)->get();
Log::debug('Found ' . $list->count() . ' bills to check.');
/** @var Bill $bill */
foreach ($list as $bill) {
Log::debug('Now calling bill #' . $bill->id . ' (' . $bill->name . ')');
$repository->scan($bill, $journal);
}
Log::debug('Done!');
}
}

6
app/Http/Controllers/TransactionController.php
View File

@@ -3,6 +3,7 @@
use Auth; use Auth;
use Carbon\Carbon; use Carbon\Carbon;
use ExpandedForm; use ExpandedForm;
use FireflyIII\Events\JournalSaved;
use FireflyIII\Http\Requests; use FireflyIII\Http\Requests;
use FireflyIII\Http\Requests\JournalFormRequest; use FireflyIII\Http\Requests\JournalFormRequest;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
@@ -264,6 +265,8 @@ class TransactionController extends Controller
$journal = $repository->store($journalData); $journal = $repository->store($journalData);
event(new JournalSaved($journal));
Session::flash('success', 'New transaction "' . $journal->description . '" stored!'); Session::flash('success', 'New transaction "' . $journal->description . '" stored!');
return Redirect::route('transactions.index', $request->input('what')); return Redirect::route('transactions.index', $request->input('what'));
@@ -298,6 +301,9 @@ class TransactionController extends Controller
]; ];
$repository->update($journal, $journalData); $repository->update($journal, $journalData);
event(new JournalSaved($journal));
Session::flash('success', 'Transaction "' . e($journalData['description']) . '" updated.'); Session::flash('success', 'Transaction "' . e($journalData['description']) . '" updated.');
return Redirect::route('transactions.index', $journalData['what']); return Redirect::route('transactions.index', $journalData['what']);

27
app/Providers/EventServiceProvider.php
View File

@@ -30,11 +30,8 @@ class EventServiceProvider extends ServiceProvider
*/ */
protected $listen protected $listen
= [ = [
'event.name' => [ 'FireflyIII\Events\JournalSaved' => [
'EventListener', 'FireflyIII\Handlers\Events\RescanJournal',
],
'App\Events\JournalDeleted' => [
'App\Handlers\Events\JournalDeletedHandler@handle',
], ],
]; ];
@@ -59,26 +56,6 @@ class EventServiceProvider extends ServiceProvider
} }
); );
// TransactionJournal::saved(
// function (TransactionJournal $journal) {
//
// Log::debug('Triggered saved event for journal #' . $journal->id . ' (' . $journal->description . ')');
//
// /** @var \FireflyIII\Repositories\Bill\BillRepositoryInterface $repository */
// $repository = App::make('FireflyIII\Repositories\Bill\BillRepositoryInterface');
// $list = $journal->user->bills()->where('active', 1)->where('automatch', 1)->get();
//
// Log::debug('Found ' . $list->count() . ' bills to check.');
//
// /** @var Bill $bill */
// foreach ($list as $bill) {
// Log::debug('Now calling bill #' . $bill->id . ' (' . $bill->name . ')');
// $repository->scan($bill, $journal);
// }
//
// Log::debug('Done!');
// }
// );
Account::deleted( Account::deleted(