Merge remote-tracking branch 'origin/develop'

snipe · Mar 7, 2024 · 109c0f2 · 109c0f2
2 parents 6156d67 + 4231058
commit 109c0f2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
@@ -1178,6 +1178,10 @@ public function sentAssetAcceptanceReminder(Request $request)
             }
         }
 
+        if ($assetItem->assignedTo->email == ''){
+            return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.no_email'));
+        }
+
         return redirect()->route('reports/unaccepted_assets')->with('success', trans('admin/reports/general.reminder_sent'));
     }
 

diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
@@ -201,6 +201,7 @@
     'new_password'          => 'New Password',
     'next'					=> 'Next',
     'next_audit_date'		=> 'Next Audit Date',
+    'no_email'              => 'No email address associated with this user',
     'last_audit'		    => 'Last Audit',
     'new'					=> 'new!',
     'no_depreciation'		=> 'No Depreciation',
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
+            if ($assetItem->assignedTo->email == ''){
+                return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.no_email'));
+            }
             return redirect()->route('reports/unaccepted_assets')->with('success', trans('admin/reports/general.reminder_sent'));
         }
@@ Expand Down @@