|
|
@ -57,9 +57,13 @@ function admin_free()
|
|
|
|
$join->on('UserAngelTypes.user_id', '=', 'users.id')
|
|
|
|
$join->on('UserAngelTypes.user_id', '=', 'users.id')
|
|
|
|
->where('UserAngelTypes.angeltype_id', '=', $angelType);
|
|
|
|
->where('UserAngelTypes.angeltype_id', '=', $angelType);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
$query->join('AngelTypes', 'UserAngelTypes.angeltype_id', 'AngelTypes.id')
|
|
|
|
|
|
|
|
->whereNotNull('UserAngelTypes.confirm_user_id')
|
|
|
|
$query->join('AngelTypes', function ($join) {
|
|
|
|
->orWhere('AngelTypes.restricted', '=', '0');
|
|
|
|
/** @var JoinClause $join */
|
|
|
|
|
|
|
|
$join->on('UserAngelTypes.angeltype_id', '=', 'AngelTypes.id')
|
|
|
|
|
|
|
|
->whereNotNull('UserAngelTypes.confirm_user_id')
|
|
|
|
|
|
|
|
->orWhere('AngelTypes.restricted', '=', '0');
|
|
|
|
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
$users = $query->get();
|
|
|
|
$users = $query->get();
|
|
|
|