diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 4a243c7cb..5a368ecde 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -492,7 +492,7 @@ class UsersController extends Controller } /** - * Notify a specific user via email with all of his assigned assets. + * Notify a specific user via email with all of their assigned assets. * * @author [Lukas Fehling] [] * @since [v6.0.13] @@ -505,22 +505,11 @@ class UsersController extends Controller $user = User::findOrFail($id); if (empty($user->email)) { - return response()->json( - [ - 'status' => 'error', - 'message' => 'This user has no email set.', - 'payload' => null, - ], 404); + return response()->json(Helper::formatStandardApiResponse(‘error’, null, trans('admin/users/message.inventorynotification.error'))); } - - $user->notify((new CurrentInventory($user))); - - return response()->json( - [ - 'status' => 'success', - 'message' => 'The user was notified about his current inventory.', - 'payload' => null, - ], 200); + + return response()->Helper::formatStandardApiResponse('success', null, trans('admin/users/message.inventorynotification.success')); + } /** diff --git a/resources/lang/en/admin/accessories/message.php b/resources/lang/en/admin/accessories/message.php index a35646306..8099a3ac8 100644 --- a/resources/lang/en/admin/accessories/message.php +++ b/resources/lang/en/admin/accessories/message.php @@ -31,7 +31,8 @@ return array( 'error' => 'Accessory was not checked in, please try again', 'success' => 'Accessory checked in successfully.', 'user_does_not_exist' => 'That user is invalid. Please try again.' - ) + ), + ); diff --git a/resources/lang/en/admin/users/message.php b/resources/lang/en/admin/users/message.php index 29f82db38..11292a069 100644 --- a/resources/lang/en/admin/users/message.php +++ b/resources/lang/en/admin/users/message.php @@ -59,4 +59,8 @@ 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.', ), + 'inventorynotification' => array( + 'error' => 'This user has no email set.', + 'success' => 'The user has been notified about their current inventory.' + ) ); \ No newline at end of file