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

This should catch the missing piggy bank events.

Browse Source
This commit is contained in:
James Cole
2015-03-24 20:54:25 +01:00
parent f50b133f2e
commit 3dc794002f
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Events/JournalCreated.php
View File

@@ -5,6 +5,11 @@ use FireflyIII\Events\Event;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
/**
* Class JournalCreated
*
* @package FireflyIII\Events
*/
class JournalCreated extends Event { class JournalCreated extends Event {
use SerializesModels; use SerializesModels;
@@ -23,9 +28,6 @@ class JournalCreated extends Event {
$this->journal = $journal; $this->journal = $journal;
$this->piggyBankId = $piggyBankId; $this->piggyBankId = $piggyBankId;
} }
} }

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

@@ -180,21 +180,18 @@ class TransactionController extends Controller
case 'withdrawal': case 'withdrawal':
$subTitleIcon = 'fa-long-arrow-left'; $subTitleIcon = 'fa-long-arrow-left';
$subTitle = 'Expenses'; $subTitle = 'Expenses';
//$journals = $this->_repository->getWithdrawalsPaginated(50);
$types = ['Withdrawal']; $types = ['Withdrawal'];
break; break;
case 'revenue': case 'revenue':
case 'deposit': case 'deposit':
$subTitleIcon = 'fa-long-arrow-right'; $subTitleIcon = 'fa-long-arrow-right';
$subTitle = 'Revenue, income and deposits'; $subTitle = 'Revenue, income and deposits';
// $journals = $this->_repository->getDepositsPaginated(50);
$types = ['Deposit']; $types = ['Deposit'];
break; break;
case 'transfer': case 'transfer':
case 'transfers': case 'transfers':
$subTitleIcon = 'fa-arrows-h'; $subTitleIcon = 'fa-exchange';
$subTitle = 'Transfers'; $subTitle = 'Transfers';
//$journals = $this->_repository->getTransfersPaginated(50);
$types = ['Transfer']; $types = ['Transfer'];
break; break;
} }

1
app/Http/Requests/JournalFormRequest.php
View File

@@ -59,6 +59,7 @@ class JournalFormRequest extends Request
case 'transfer': case 'transfer':
$rules['account_from_id'] = 'required|exists:accounts,id|belongsToUser:accounts|different:account_to_id'; $rules['account_from_id'] = 'required|exists:accounts,id|belongsToUser:accounts|different:account_to_id';
$rules['account_to_id'] = 'required|exists:accounts,id|belongsToUser:accounts|different:account_from_id'; $rules['account_to_id'] = 'required|exists:accounts,id|belongsToUser:accounts|different:account_from_id';
$rules['piggy_bank_id'] = 'exists:piggy_banks,id';
$rules['category'] = 'between:1,255'; $rules['category'] = 'between:1,255';
break; break;
default: default:

2
config/app.php
View File

@@ -95,7 +95,7 @@ return [
| |
*/ */
'log' => 'daily', 'log' => 'syslog',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------