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

Fixed double named accounts.

Browse Source
This commit is contained in:
James Cole
2015-03-26 18:05:23 +01:00
parent 3d59d141c4
commit e0730c7b39
4 changed files with 49 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/Validation/FireflyValidator.php
View File

@@ -4,8 +4,11 @@ namespace FireflyIII\Validation;
use Auth;
use Carbon\Carbon;
use Config;
use DB;
use FireflyIII\Models\AccountType;
use Illuminate\Validation\Validator;
use Input;
use Navigation;
/**
@@ -34,6 +37,13 @@ class FireflyValidator extends Validator
}
/**
* @param $attribute
* @param $value
* @param $parameters
*
* @return bool
*/
public function validatePiggyBankReminder($attribute, $value, $parameters)
{
$array = $this->data;
@@ -51,14 +61,44 @@ class FireflyValidator extends Validator
return true;
}
$nextReminder = Navigation::addPeriod($startDate, $array['reminder'],0);
$nextReminder = Navigation::addPeriod($startDate, $array['reminder'], 0);
// reminder is beyond target?
if($nextReminder > $targetDate) {
if ($nextReminder > $targetDate) {
return false;
}
return true;
}
/**
* @param $attribute
* @param $value
* @param $parameters
*
* @return bool
*/
public function validateUniqueAccountForUser($attribute, $value, $parameters)
{
// get account type from data, we must have this:
$type = isset($this->data['what']) ? $this->data['what'] : Input::get('what');
$longType = Config::get('firefly.accountTypeByIdentifier.' . $type);
$dbType = AccountType::whereType($longType)->first();
if (!$dbType) {
return false;
}
$query = DB::table('accounts')->where('name', $value)->where('account_type_id', $dbType->id)->where('user_id', Auth::user()->id);
if (isset($parameters[0])) {
$query->where('id', '!=', $parameters[0]);
}
$count = $query->count();
if ($count == 0) {
return true;
}
return false;
}
/**
* @param $attribute
* @param $value
@@ -69,7 +109,7 @@ class FireflyValidator extends Validator
public function validateUniqueForUser($attribute, $value, $parameters)
{
$query = DB::table($parameters[0])->where($parameters[1], $value);
$query->where('user_id',Auth::user()->id);
$query->where('user_id', Auth::user()->id);
if (isset($paramers[2])) {
$query->where('id', '!=', $parameters[2]);
}