diff --git a/app/Http/Controllers/EmailController.php b/app/Http/Controllers/EmailController.php index 89c10a8dff6c..bedd150153d3 100644 --- a/app/Http/Controllers/EmailController.php +++ b/app/Http/Controllers/EmailController.php @@ -114,7 +114,7 @@ class EmailController extends BaseController public function send(SendEmailRequest $request) { $entity = $request->input('entity'); - $entity_obj = $entity::find($request->input('entity_id')); + $entity_obj = $entity::withTrashed()->with('invitations')->find($request->input('entity_id')); $subject = $request->has('subject') ? $request->input('subject') : ''; $body = $request->has('body') ? $request->input('body') : ''; $entity_string = strtolower(class_basename($entity_obj)); diff --git a/app/Http/Requests/Email/SendEmailRequest.php b/app/Http/Requests/Email/SendEmailRequest.php index c37fdbfe2138..89abecebc224 100644 --- a/app/Http/Requests/Email/SendEmailRequest.php +++ b/app/Http/Requests/Email/SendEmailRequest.php @@ -82,7 +82,7 @@ class SendEmailRequest extends Request $entity = $input['entity']; /* Harvest the entity*/ - $entity_obj = $entity::whereId($input['entity_id'])->company()->first(); + $entity_obj = $entity::whereId($input['entity_id'])->withTrashed()->company()->first(); /* Check object, check user and company id is same as users, and check user can edit the object */ if ($entity_obj && ($company->id == $entity_obj->company_id) && auth()->user()->can('edit', $entity_obj)) {