Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

Browse Source
This commit is contained in:
David Bomba 2023-11-18 21:22:08 +11:00
commit c817b7b937
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/ClientController.php
View File

@ -386,6 +386,12 @@ class ClientController extends BaseController
$response = $postmark->activateBounce((int)$bounce_id); $response = $postmark->activateBounce((int)$bounce_id);
if($response && $response?->Message == 'OK' && !$response->Bounce->Inactive && $response->Bounce->Email){
$email = $response->Bounce->Email;
//remove email from quarantine. //@TODO
}
return response()->json(['message' => 'Success'], 200); return response()->json(['message' => 'Success'], 200);
} catch(\Exception $e) { } catch(\Exception $e) {

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

@ -528,7 +528,7 @@ class TaskController extends BaseController
return response()->json(['message' => $hash_or_response], 200); return response()->json(['message' => $hash_or_response], 200);
} }
$tasks->each(function ($task, $key) use ($action, $user) { $tasks->each(function ($task) use ($action, $user) {
if ($user->can('edit', $task)) { if ($user->can('edit', $task)) {
$this->task_repo->{$action}($task); $this->task_repo->{$action}($task);
} }