Merge branch 'develop' into trunk
This commit is contained in:
commit
746cc4d8eb
2 changed files with 10 additions and 9 deletions
|
|
@ -137,24 +137,25 @@ class CafelEggBreeder extends Model
|
|||
/**
|
||||
* Check if inuav codes are unique
|
||||
*
|
||||
* @param self $eleveur
|
||||
* @param self $breeder
|
||||
* @return boolean
|
||||
* @throws \Illuminate\Validation\ValidationException If inuav code is already used.
|
||||
*/
|
||||
protected static function areInuavCodesUniques(self $eleveur): bool
|
||||
protected static function areInuavCodesUniques(self $breeder): bool
|
||||
{
|
||||
$q = self::query();
|
||||
// * Update condition
|
||||
$q->where(function ($q) use ($eleveur) {
|
||||
foreach ($eleveur->inuavs as $inuav) {
|
||||
$q->orWhere('inuavs', 'LIKE', "%$inuav%");
|
||||
$q->where(function ($q) use ($breeder) {
|
||||
foreach ($breeder->inuavs as $inuav) {
|
||||
$q->orWhere('inuavs', '=', $inuav);
|
||||
}
|
||||
});
|
||||
if ($eleveur->cafel_code) {
|
||||
$q->where('cafel_code', '!=', $eleveur->cafel_code);
|
||||
if ($breeder->cafel_code) {
|
||||
$q->where('cafel_code', '!=', $breeder->cafel_code);
|
||||
}
|
||||
if ($q->count()) {
|
||||
throw ValidationException::withMessages(['inuavs' => 'Les codes INUAVS doinvent être uniques'
|
||||
throw ValidationException::withMessages([
|
||||
'inuavs' => 'Les codes INUAVS doinvent être uniques : ' . collect($breeder->inuavs)->implode(',')
|
||||
]);
|
||||
}
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ class CafelPoultryBreeder extends Model
|
|||
}
|
||||
if ($q->count()) {
|
||||
throw ValidationException::withMessages([
|
||||
'inuavs' => 'Les codes INUAVS doinvent être uniques'
|
||||
'inuavs' => 'Les codes INUAVS doinvent être uniques : ' . collect($breeder->inuavs)->implode(',')
|
||||
]);
|
||||
}
|
||||
return true;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue