diff --git a/app/Events/JournalCreated.php b/app/Events/JournalCreated.php index d7af994329..debbefd1b8 100644 --- a/app/Events/JournalCreated.php +++ b/app/Events/JournalCreated.php @@ -5,6 +5,11 @@ use FireflyIII\Events\Event; use FireflyIII\Models\TransactionJournal; use Illuminate\Queue\SerializesModels; +/** + * Class JournalCreated + * + * @package FireflyIII\Events + */ class JournalCreated extends Event { use SerializesModels; @@ -23,9 +28,6 @@ class JournalCreated extends Event { $this->journal = $journal; $this->piggyBankId = $piggyBankId; - - - } } diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index be2a922e14..38d19809d6 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -180,22 +180,19 @@ class TransactionController extends Controller case 'withdrawal': $subTitleIcon = 'fa-long-arrow-left'; $subTitle = 'Expenses'; - //$journals = $this->_repository->getWithdrawalsPaginated(50); - $types = ['Withdrawal']; + $types = ['Withdrawal']; break; case 'revenue': case 'deposit': $subTitleIcon = 'fa-long-arrow-right'; $subTitle = 'Revenue, income and deposits'; - // $journals = $this->_repository->getDepositsPaginated(50); - $types = ['Deposit']; + $types = ['Deposit']; break; case 'transfer': case 'transfers': - $subTitleIcon = 'fa-arrows-h'; + $subTitleIcon = 'fa-exchange'; $subTitle = 'Transfers'; - //$journals = $this->_repository->getTransfersPaginated(50); - $types = ['Transfer']; + $types = ['Transfer']; break; } diff --git a/app/Http/Requests/JournalFormRequest.php b/app/Http/Requests/JournalFormRequest.php index 038542c0bc..d3802d8008 100644 --- a/app/Http/Requests/JournalFormRequest.php +++ b/app/Http/Requests/JournalFormRequest.php @@ -59,6 +59,7 @@ class JournalFormRequest extends Request case 'transfer': $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['piggy_bank_id'] = 'exists:piggy_banks,id'; $rules['category'] = 'between:1,255'; break; default: diff --git a/config/app.php b/config/app.php index 23d8fa9af1..adbba6369e 100644 --- a/config/app.php +++ b/config/app.php @@ -95,7 +95,7 @@ return [ | */ - 'log' => 'daily', + 'log' => 'syslog', /* |--------------------------------------------------------------------------