forge-joniko/ldc-supportweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'trunk'

Browse source
This commit is contained in:
Jérémy Munsch 2022-02-02 16:48:06 +01:00
commit 87672410eb
No known key found for this signature in database
GPG key ID: 55196BEE445F6049
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/TicketController.php
View file

@ -70,7 +70,8 @@ class TicketController extends Controller
});
});
}
$tickets = $tickets->where('status', ($request->st==TicketStatus::archived()) ? '=' : '<>', TicketStatus::archived());
$tickets = $tickets->where('status', ($request->status == TicketStatus::archived()) ?
'=' : '<>', TicketStatus::archived());
if ($request->search) {
$tickets = $this->searchTicket($tickets, $request);
}

12
app/Models/Message.php
View file

@ -41,8 +41,16 @@ class Message extends Model
}
// ? Is message author is admin ?
if ($messageUser->isAdmin()) {
$ticket->subscriptions()->attach($messageUser);
\session()->flash('info', trans('Vous avez été inscrit.'));
// TODO: investigate why this make errors on prod,
// https://supportweb.ldc.fr/ticket/583/message/create
// SQLSTATE[23000]: Integrity constraint violation: 1062 Duplicate entry '583-8' for key 'PRIMARY'
// $ticket->subscriptions()->attach($messageUser);
// Add subscription
if (!$messageUser->subscriptions()->find($ticket->id)) {
$messageUser->subscriptions()->attach($ticket->id);
\session()->flash('info', trans('Vous avez été inscrit.'));
}
}
// * Send mail to other subscribed users
event(new NotifySubscriptions(