From 5efe45226d4aed386e5e72ba5d34824da58b1257 Mon Sep 17 00:00:00 2001
From: mikeroq <mikeroq@gmail.com>
Date: Mon, 11 Jul 2022 20:02:10 -0500
Subject: [PATCH] Fixes Email List of All Assigned being "successful" when the
 user has no email Added check in view to disable button if there is no email
 Added translation for title on disabled button and for email check in
 controller Fixed missing trans for user not found message

---
 app/Http/Controllers/Users/UsersController.php | 16 +++++++++-------
 resources/lang/en/admin/users/message.php      |  3 ++-
 resources/views/users/view.blade.php           | 16 ++++++++++------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index 421e07b4ef..7cbbbdb10b 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -628,14 +628,16 @@ class UsersController extends Controller
     {
         $this->authorize('view', User::class);
 
-        if( User::where('id', $id)->first()->exists())
-            {
-                $user= User::where('id', $id)->first();
-                $user->notify((new CurrentInventory($user)));
-                return redirect()->back()->with('success', trans('admin/users/general.user_notified'));
-            }
+        if (!$user = User::find($id)) {
+            return redirect()->back()
+                ->with('error', trans('admin/users/message.user_not_found', ['id' => $id]));
+        }
+        if (empty($user->email)) {
+            return redirect()->back()->with('error', trans('admin/users/message.user_has_no_email'));
+        }
 
-        return redirect()->back()->with('error', 'admin/accessories/message.user_does_not_exist');
+        $user->notify((new CurrentInventory($user)));
+        return redirect()->back()->with('success', trans('admin/users/general.user_notified'));
     }
 
     /**
diff --git a/resources/lang/en/admin/users/message.php b/resources/lang/en/admin/users/message.php
index 85d016f04a..29f82db38b 100644
--- a/resources/lang/en/admin/users/message.php
+++ b/resources/lang/en/admin/users/message.php
@@ -14,6 +14,7 @@ return array(
     'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
     'password_reset_sent'       => 'A password reset link has been sent to :email!',
+    'user_has_no_email'         => 'This user does not have an email address in their profile.',
 
 
     'success' => array(
@@ -58,4 +59,4 @@ return array(
         'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
     ),
 
-);
+);
\ No newline at end of file
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 616ab70890..8763c5718f 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -184,12 +184,16 @@
                 @endcan
 
                 @can('view', $user)
-                    <div class="col-md-12" style="padding-top: 5px;">
-                        <form action="{{ route('users.email',['userId'=> $user->id]) }}" method="POST">
-                            {{ csrf_field() }}
-                            <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener">{{ trans('admin/users/general.email_assigned') }}</button>
-                        </form>
-                    </div>
+                  <div class="col-md-12" style="padding-top: 5px;">
+                  @if(!empty($user->email))
+                    <form action="{{ route('users.email',['userId'=> $user->id]) }}" method="POST">
+                      {{ csrf_field() }}
+                      <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener">{{ trans('admin/users/general.email_assigned') }}</button>
+                    </form>
+                  @else
+                      <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_email') }}">{{ trans('admin/users/general.email_assigned') }}</button>
+                  @endif
+                  </div>
                 @endcan
 
                 @can('update', $user)