TPS
/
birzha-legalizasia
5
0
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Wiki Activity

updates on ticket messages author

This commit is contained in:
ilmedova 2023-03-28 13:28:20 +05:00
parent 3a2c7b2428
commit e74f2388f7
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/API/TicketController.php
View File

@ -38,7 +38,7 @@ public function getTicketMessages(Request $request)
{
if(Ticket::find($request->ticket_id))
{
$messages = Message::where('ticket_id', $request->ticket_id)
$messages = Message::with('admin')->where('ticket_id', $request->ticket_id)
->orderBy('id', 'asc')
->paginate($request->per_page ?? 10);

7
resources/views/admin/messages.blade.php
View File

@ -82,8 +82,6 @@
</h3>
<div class="chat-log__message"><p>{{ $ticket->content }}</p></div>
</div>
@else
<div class="chat-log__item admin bg-gray-200"><h3 class="chat-log__author">{{backpack_user()->name}} <small class="small-date">{{ $ticket->created_at }}</small></h3><div class="chat-log__message">{{ $ticket->content }}</div></div>
@endif
<div id="chat-messages">
</div>
@ -111,6 +109,7 @@
type: 'GET',
dataType: 'json', // added data type
success: function(res) {
console.log(res);
res.data.forEach(element => {
var m = new Date(element.created_at);
var dateString = m.getUTCDate() + "." + (m.getUTCMonth()+1) + "." + m.getUTCFullYear() + " " + m.getUTCHours() + ":" + m.getUTCMinutes();
@ -118,7 +117,7 @@
$('#chat-messages').append('<div class="chat-log__item client"><h3 class="chat-log__author">{{ $ticket->account->profile->name ?? "user" }} <small class="small-date">' + dateString + '</small></h3><div class="chat-log__message"><p>' + element.content + '</p></div></div>');
}
else{
$('#chat-messages').append('<div class="chat-log__item admin bg-gray-200"><h3 class="chat-log__author">{{backpack_user()->name}} <small class="small-date">' + dateString + '</small></h3><div class="chat-log__message">' + element.content + '</div></div>');
$('#chat-messages').append('<div class="chat-log__item admin bg-gray-200"><h3 class="chat-log__author">' + element.admin + '<small class="small-date">' + dateString + '</small></h3><div class="chat-log__message">' + element.content + '</div></div>');
}
$("#chat-log").scrollTop(1000000);
});
@ -140,7 +139,7 @@
$('#chat-messages').append('<div class="chat-log__item client"><h3 class="chat-log__author">{{ $ticket->client->firstname ?? null }} {{ $ticket->client->lastname ?? null }}<small class="small-date">' + dateString + '</small></h3><div class="chat-log__message"><p>' + element.content + '</p></div></div>');
}
else{
$('#chat-messages').append('<div class="chat-log__item admin bg-gray-200"><h3 class="chat-log__author">{{backpack_user()->name}} <small class="small-date">' + dateString + '</small></h3><div class="chat-log__message">' + element.content + '</div></div>');
$('#chat-messages').append('<div class="chat-log__item admin bg-gray-200"><h3 class="chat-log__author">' + element.admin + '<small class="small-date">' + dateString + '</small></h3><div class="chat-log__message">' + element.content + '</div></div>');
}
});
console.log(res);