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

#135

Browse Source
This commit is contained in:
James Cole
2015-12-26 08:16:30 +01:00
parent 77b843efd8
commit b833e8dfa2
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,20 +31,20 @@ class JournalFormRequest extends Request
public function getJournalData() public function getJournalData()
{ {
return [ return [
'what' => $this->get('what'), 'what' => $this->get('what'),
'description' => $this->get('description'), 'description' => $this->get('description'),
'account_id' => intval($this->get('account_id')), 'account_id' => intval($this->get('account_id')),
'account_from_id' => intval($this->get('account_from_id')), 'account_from_id' => intval($this->get('account_from_id')),
'account_to_id' => intval($this->get('account_to_id')), 'account_to_id' => intval($this->get('account_to_id')),
'expense_account' => $this->get('expense_account'), 'expense_account' => $this->get('expense_account'),
'revenue_account' => $this->get('revenue_account'), 'revenue_account' => $this->get('revenue_account'),
'amount' => round($this->get('amount'), 2), 'amount' => round($this->get('amount'), 2),
'user' => Auth::user()->id, 'user' => Auth::user()->id,
'amount_currency_id' => intval($this->get('amount_currency_id')), 'amount_currency_id_amount' => intval($this->get('amount_currency_id')),
'date' => new Carbon($this->get('date')), 'date' => new Carbon($this->get('date')),
'budget_id' => intval($this->get('budget_id')), 'budget_id' => intval($this->get('budget_id')),
'category' => $this->get('category'), 'category' => $this->get('category'),
'tags' => explode(',', $this->get('tags')), 'tags' => explode(',', $this->get('tags')),
]; ];
} }
@@ -57,11 +57,11 @@ class JournalFormRequest extends Request
{ {
$what = Input::get('what'); $what = Input::get('what');
$rules = [ $rules = [
'description' => 'required|min:1,max:255', 'description' => 'required|min:1,max:255',
'what' => 'required|in:withdrawal,deposit,transfer', 'what' => 'required|in:withdrawal,deposit,transfer',
'amount' => 'numeric|required|min:0.01', 'amount' => 'numeric|required|min:0.01',
'date' => 'required|date', 'date' => 'required|date',
'amount_currency_id' => 'required|exists:transaction_currencies,id', 'amount_currency_id_amount' => 'required|exists:transaction_currencies,id',
]; ];