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

Rename models for clarity

Browse Source
This commit is contained in:
James Cole
2016-01-12 21:38:05 +01:00
parent 4b35059140
commit 11f63fa6ce
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Events/TransactionJournalStored.php
View File

@@ -1,6 +1,6 @@
<?php <?php
/** /**
* JournalWasCreated.php * TransactionJournalStored.php
* Copyright (C) 2016 Sander Dorigo * Copyright (C) 2016 Sander Dorigo
* *
* This software may be modified and distributed under the terms * This software may be modified and distributed under the terms
@@ -13,7 +13,7 @@ use FireflyIII\Models\TransactionJournal;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
/** /**
* Class JournalWasCreated * Class TransactionJournalStored
* *
* @codeCoverageIgnore * @codeCoverageIgnore
* @package FireflyIII\Events * @package FireflyIII\Events

8
app/Handlers/Events/ConnectJournalToPiggyBank.php
View File

@@ -1,7 +1,7 @@
<?php namespace FireflyIII\Handlers\Events; <?php namespace FireflyIII\Handlers\Events;
use Auth; use Auth;
use FireflyIII\Events\JournalCreated; use FireflyIII\Events\TransactionJournalStored;
use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\PiggyBankEvent; use FireflyIII\Models\PiggyBankEvent;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
@@ -26,13 +26,13 @@ class ConnectJournalToPiggyBank
} }
/** /**
* Handle the event when journal is saved. * Connect a new transaction journal to any related piggy banks.
* *
* @param JournalCreated $event * @param TransactionJournalStored $event
* *
* @return boolean * @return boolean
*/ */
public function handle(JournalCreated $event) public function handle(TransactionJournalStored $event)
{ {
/** @var TransactionJournal $journal */ /** @var TransactionJournal $journal */
$journal = $event->journal; $journal = $event->journal;

6
app/Handlers/Events/RescanJournal.php
View File

@@ -1,6 +1,6 @@
<?php namespace FireflyIII\Handlers\Events; <?php namespace FireflyIII\Handlers\Events;
use FireflyIII\Events\JournalSaved; use FireflyIII\Events\TransactionJournalUpdated;
use Log; use Log;
/** /**
@@ -24,11 +24,11 @@ class RescanJournal
/** /**
* Handle the event. * Handle the event.
* *
* @param JournalSaved $event * @param TransactionJournalUpdated $event
* *
* @return void * @return void
*/ */
public function handle(JournalSaved $event) public function handle(TransactionJournalUpdated $event)
{ {
$journal = $event->journal; $journal = $event->journal;

6
app/Handlers/Events/UpdateJournalConnection.php
View File

@@ -1,6 +1,6 @@
<?php namespace FireflyIII\Handlers\Events; <?php namespace FireflyIII\Handlers\Events;
use FireflyIII\Events\JournalSaved; use FireflyIII\Events\TransactionJournalUpdated;
use FireflyIII\Models\PiggyBankEvent; use FireflyIII\Models\PiggyBankEvent;
use FireflyIII\Models\PiggyBankRepetition; use FireflyIII\Models\PiggyBankRepetition;
@@ -25,11 +25,11 @@ class UpdateJournalConnection
/** /**
* Handle the event. * Handle the event.
* *
* @param JournalSaved $event * @param TransactionJournalUpdated $event
* *
* @return void * @return void
*/ */
public function handle(JournalSaved $event) public function handle(TransactionJournalUpdated $event)
{ {
$journal = $event->journal; $journal = $event->journal;

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

@@ -5,8 +5,8 @@ use Auth;
use Carbon\Carbon; use Carbon\Carbon;
use Config; use Config;
use ExpandedForm; use ExpandedForm;
use FireflyIII\Events\JournalCreated; use FireflyIII\Events\TransactionJournalStored;
use FireflyIII\Events\JournalSaved; use FireflyIII\Events\TransactionJournalUpdated;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Http\Requests\JournalFormRequest; use FireflyIII\Http\Requests\JournalFormRequest;
use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBank;
@@ -317,10 +317,10 @@ class TransactionController extends Controller
} }
// rescan journal, UpdateJournalConnection // rescan journal, UpdateJournalConnection
event(new JournalSaved($journal)); event(new TransactionJournalUpdated($journal));
if ($journal->isTransfer() && intval($request->get('piggy_bank_id')) > 0) { if ($journal->isTransfer() && intval($request->get('piggy_bank_id')) > 0) {
event(new JournalCreated($journal, intval($request->get('piggy_bank_id')))); event(new TransactionJournalStored($journal, intval($request->get('piggy_bank_id'))));
} }
Session::flash('success', 'New transaction "' . $journal->description . '" stored!'); Session::flash('success', 'New transaction "' . $journal->description . '" stored!');
@@ -369,7 +369,7 @@ class TransactionController extends Controller
Session::flash('info', $att->getMessages()->get('attachments')); Session::flash('info', $att->getMessages()->get('attachments'));
} }
event(new JournalSaved($journal)); event(new TransactionJournalUpdated($journal));
// update, get events by date and sort DESC // update, get events by date and sort DESC
Session::flash('success', 'Transaction "' . e($journalData['description']) . '" updated.'); Session::flash('success', 'Transaction "' . e($journalData['description']) . '" updated.');

4
app/Providers/EventServiceProvider.php
View File

@@ -29,12 +29,12 @@ class EventServiceProvider extends ServiceProvider
*/ */
protected $listen protected $listen
= [ = [
'FireflyIII\Events\JournalSaved' => [ 'FireflyIII\Events\TransactionJournalUpdated' => [
'FireflyIII\Handlers\Events\RescanJournal', 'FireflyIII\Handlers\Events\RescanJournal',
'FireflyIII\Handlers\Events\UpdateJournalConnection', 'FireflyIII\Handlers\Events\UpdateJournalConnection',
], ],
'FireflyIII\Events\JournalCreated' => [ 'FireflyIII\Events\TransactionJournalStored' => [
'FireflyIII\Handlers\Events\ConnectJournalToPiggyBank', 'FireflyIII\Handlers\Events\ConnectJournalToPiggyBank',
] ]
]; ];