IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Validation bug.

Browse Source
This commit is contained in:
James Cole 2015-03-27 09:21:09 +01:00
parent 9f9af0b693
commit 3fc560597c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Repositories/Journal/JournalRepository.php
View File

@ -11,6 +11,7 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log;
/** /**
* Class JournalRepository * Class JournalRepository
@ -153,6 +154,7 @@ class JournalRepository implements JournalRepositoryInterface
$toType = AccountType::where('type', 'Cash account')->first(); $toType = AccountType::where('type', 'Cash account')->first();
$to = Account::firstOrCreate(['user_id' => $data['user'], 'account_type_id' => $toType->id, 'name' => 'Cash account', 'active' => 1]); $to = Account::firstOrCreate(['user_id' => $data['user'], 'account_type_id' => $toType->id, 'name' => 'Cash account', 'active' => 1]);
} }
Log::error('Could not store TO account for Withdrawal (Expense account) because: ' .$to->getErrors()->toJson());
break; break;
case 'Deposit': case 'Deposit':

6
app/Validation/FireflyValidator.php
View File

@ -80,10 +80,12 @@ class FireflyValidator extends Validator
public function validateUniqueAccountForUser($attribute, $value, $parameters) public function validateUniqueAccountForUser($attribute, $value, $parameters)
{ {
// get account type from data, we must have this: // get account type from data, we must have this:
$type = isset($this->data['what']) ? $this->data['what'] : null; $validTypes = [array_keys(Config::get('firefly.subTitlesByIdentifier'))];
$type = isset($this->data['what']) && in_array($this->data['what'],$validTypes) ? $this->data['what'] : null;
// some fallback: // some fallback:
if(is_null($type)) { if(is_null($type)) {
$type = Input::get('what'); $type = in_array(Input::get('what'),$validTypes) ? Input::get('what') : null;
} }
// still null? // still null?
if(is_null($type)) { if(is_null($type)) {