diff --git a/config/config.php b/config/config.php index 549ef98..ecdd5c5 100644 --- a/config/config.php +++ b/config/config.php @@ -132,5 +132,12 @@ * Ether you define your models for references or customize the view. * Example: [App/Models/User::class] */ - 'reference-models' => [] + 'reference-models' => [], + /* + * Should be listed? + */ + 'list' => [ + 'users' => false, + 'files' => false + ] ]; diff --git a/resources/views/tickets/partials/files.blade.php b/resources/views/tickets/partials/files.blade.php new file mode 100644 index 0000000..09c5d57 --- /dev/null +++ b/resources/views/tickets/partials/files.blade.php @@ -0,0 +1,24 @@ +
+ @foreach ($ticket->messages()->with('uploads')->get() as $message) + @foreach($message->uploads()->get() as $upload) +
+
+
+
+
+ +
+ + {{ $message->user->name }} {{ $upload->created_at->format(config('laravel-tickets.datetime-format')) }} + +
+
+
+
+
+
+ @endforeach + @endforeach +
diff --git a/resources/views/tickets/partials/users.blade.php b/resources/views/tickets/partials/users.blade.php new file mode 100644 index 0000000..f9f5cf8 --- /dev/null +++ b/resources/views/tickets/partials/users.blade.php @@ -0,0 +1,26 @@ +
+ @foreach ($ticket->messages()->whereNotIn('user_id', [$ticket->user_id])->orderBy('created_at', 'asc')->get()->unique('user_id') as $message) +
+
+
+
+ + +
+
+
+
+ {{ $message->user->name }} +
+
+ {{ $message->created_at->format(config('laravel-tickets.datetime-format')) }} +
+
+
+
+
+
+ @endforeach +
diff --git a/resources/views/tickets/show.blade.php b/resources/views/tickets/show.blade.php index 643e6f4..ec2ce3a 100644 --- a/resources/views/tickets/show.blade.php +++ b/resources/views/tickets/show.blade.php @@ -2,7 +2,7 @@ @section('content')
-
+
@includeWhen(session()->has('message'), 'laravel-tickets::alert', ['type' => 'info', 'message' => session()->get('message')]) @if (config('laravel-tickets.open-ticket-with-answer') || $ticket->state !== 'CLOSED') @@ -22,8 +22,13 @@ @if (config('laravel-tickets.files'))
+ class="custom-file-input @error('files') is-invalid @enderror {{ empty($errors->get('files.*'))?'':'is-invalid' }}" + id="files"> + @foreach($errors->get('files.*') as $value) +
{{ $value[0] }}
+ @endforeach + @error('files')
{{ $message }}
@enderror @@ -74,7 +79,7 @@ class="custom-file-input @error('files') is-invalid @enderror" id="files"> {!! $messages->links('pagination::bootstrap-4') !!}
-
+
@lang('Ticket overview') @@ -117,6 +122,30 @@ class="custom-file-input @error('files') is-invalid @enderror" id="files"> @endif
+ + +
+
+ @include('laravel-tickets::tickets.partials.users', compact('ticket')) +
+
+ @include('laravel-tickets::tickets.partials.files', compact('ticket')) +
+
+
@endsection diff --git a/resources/views/tickets/supporters.blade.php b/resources/views/tickets/supporters.blade.php new file mode 100644 index 0000000..e69de29