Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 21:24:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for emailing archived invoices

Browse Source
This commit is contained in:
David Bomba 2021-09-28 16:12:50 +10:00
parent 445a17cf94
commit 1163dba723
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/EmailController.php
View File

@ -114,7 +114,7 @@ class EmailController extends BaseController
public function send(SendEmailRequest $request) public function send(SendEmailRequest $request)
{ {
$entity = $request->input('entity'); $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') : ''; $subject = $request->has('subject') ? $request->input('subject') : '';
$body = $request->has('body') ? $request->input('body') : ''; $body = $request->has('body') ? $request->input('body') : '';
$entity_string = strtolower(class_basename($entity_obj)); $entity_string = strtolower(class_basename($entity_obj));

2
app/Http/Requests/Email/SendEmailRequest.php
View File

@ -82,7 +82,7 @@ class SendEmailRequest extends Request
$entity = $input['entity']; $entity = $input['entity'];
/* Harvest the 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 */ /* 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)) { if ($entity_obj && ($company->id == $entity_obj->company_id) && auth()->user()->can('edit', $entity_obj)) {