diff --git a/app/Http/Controllers/Auth/ContactForgotPasswordController.php b/app/Http/Controllers/Auth/ContactForgotPasswordController.php index 991aea83c4b9..65f0118fbf01 100644 --- a/app/Http/Controllers/Auth/ContactForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ContactForgotPasswordController.php @@ -100,10 +100,18 @@ class ContactForgotPasswordController extends Controller if(Ninja::isHosted() && $company = Company::where('company_key', $request->input('company_key'))->first()) { - $contact = ClientContact::where(['email' => $request->input('email'), 'company_id' => $company->id])->first(); + $contact = ClientContact::where(['email' => $request->input('email'), 'company_id' => $company->id]) + ->whereHas('client', function ($query) { + $query->where('is_deleted',0); + })->first(); + } + else { + + $contact = ClientContact::where(['email' => $request->input('email')]) + ->whereHas('client', function ($query) { + $query->where('is_deleted',0); + })->first(); } - else - $contact = ClientContact::where(['email' => $request->input('email')])->first(); $response = false; diff --git a/app/Http/Controllers/Auth/ContactLoginController.php b/app/Http/Controllers/Auth/ContactLoginController.php index bd39ca0da864..18fbf462dc0d 100644 --- a/app/Http/Controllers/Auth/ContactLoginController.php +++ b/app/Http/Controllers/Auth/ContactLoginController.php @@ -98,7 +98,10 @@ class ContactLoginController extends Controller if(Ninja::isHosted() && $request->has('password') && $company = Company::where('company_key', $request->input('company_key'))->first()){ - $contact = ClientContact::where(['email' => $request->input('email'), 'company_id' => $company->id])->first(); + $contact = ClientContact::where(['email' => $request->input('email'), 'company_id' => $company->id]) + ->whereHas('client', function ($query) { + $query->where('is_deleted',0); + })->first(); if(!$contact) return $this->sendFailedLoginResponse($request);