diff --git a/app/Models/Presenters/ClientPresenter.php b/app/Models/Presenters/ClientPresenter.php index 824393a7ba11..f7a3e7f265ff 100644 --- a/app/Models/Presenters/ClientPresenter.php +++ b/app/Models/Presenters/ClientPresenter.php @@ -48,7 +48,15 @@ class ClientPresenter extends EntityPresenter public function email() { - return $this->entity->primary_contact->first() !== null ? $this->entity->primary_contact->first()->email : 'No Email Set'; + $primary_contact = $this->entity->primary_contact->first(); + + if($primary_contact && strlen($primary_contact->email) > 1) + return $primary_contact->email; + + $contact = $this->entity->contacts->whereNotNull('email')->first(); + + return $contact ? $contact->email : 'No Email Set'; + } public function address()