diff --git a/.env.example b/.env.example index ea1f4a320728..e9d4cec8ed9a 100644 --- a/.env.example +++ b/.env.example @@ -28,15 +28,6 @@ REDIS_HOST=127.0.0.1 REDIS_PASSWORD=null REDIS_PORT=6379 -MAIL_MAILER=smtp -MAIL_HOST=smtp.mailtrap.io -MAIL_PORT=2525 -MAIL_USERNAME=null -MAIL_PASSWORD=null -MAIL_ENCRYPTION=null -MAIL_FROM_ADDRESS="user@example.com" -MAIL_FROM_NAME="Self Hosted User" - POSTMARK_API_TOKEN= REQUIRE_HTTPS=false diff --git a/app/Http/ValidationRules/Ninja/CanAddUserRule.php b/app/Http/ValidationRules/Ninja/CanAddUserRule.php index 64e1281c8d10..dfdddfe63807 100644 --- a/app/Http/ValidationRules/Ninja/CanAddUserRule.php +++ b/app/Http/ValidationRules/Ninja/CanAddUserRule.php @@ -39,20 +39,6 @@ class CanAddUserRule implements Rule return true; } - /* - Check that we have sufficient quota to allow this to happen - - @ 31-01-2024 - changed query to use email instead of user_id - - $count = CompanyUser::query() - ->where('company_user.account_id', $user->account_id) - ->join('users', 'users.id', '=', 'company_user.user_id') - ->whereNull('users.deleted_at') - ->whereNull('company_user.deleted_at') - ->distinct() - ->count('company_user.user_id'); - */ - $count = CompanyUser::query() ->where("company_user.account_id", $user->account_id) ->join("users", "users.id", "=", "company_user.user_id")