diff --git a/app/Http/Controllers/Bo/TicketController.php b/app/Http/Controllers/Bo/TicketController.php index e3b891b..b54cd7c 100644 --- a/app/Http/Controllers/Bo/TicketController.php +++ b/app/Http/Controllers/Bo/TicketController.php @@ -517,9 +517,9 @@ class TicketController extends Controller return back()->with('error', trans('Le ticket que vous avez renseigné ne fait pas partie du même site.')); } - if (!$ticket->linkedTicket()->where('linked_ticket_id', $linkedTicket->id)->exists()) { - $ticket->linkedTicket()->attach($linkedTicket->id); - $linkedTicket->linkedTicket()->attach($ticket->id); + if (!$ticket->linkedTickets()->where('linked_ticket_id', $linkedTicket->id)->exists()) { + $ticket->linkedTickets()->attach($linkedTicket->id); + $linkedTicket->linkedTickets()->attach($ticket->id); return back()->with('success', trans('Les tickets ont été liés avec succès.')); } @@ -536,8 +536,8 @@ class TicketController extends Controller */ public function unlinkTicket(Ticket $ticket, Ticket $linkedTicket) { - $ticket->linkedTicket()->detach($linkedTicket->id); - $linkedTicket->linkedTicket()->detach($ticket->id); + $ticket->linkedTickets()->detach($linkedTicket->id); + $linkedTicket->linkedTickets()->detach($ticket->id); return back()->with('warning', trans('Le lien entre les tickets à été supprimé.')); } diff --git a/resources/views/bo/pages/tickets/index.blade.php b/resources/views/bo/pages/tickets/index.blade.php index 211023b..8e34379 100644 --- a/resources/views/bo/pages/tickets/index.blade.php +++ b/resources/views/bo/pages/tickets/index.blade.php @@ -18,10 +18,11 @@ @if (session('tickets.pr')) @php - $projectManager = \App\Models\Site::query()->find(session('tickets.pr')) ? \App\Models\Site::query()->find(session('tickets.pr'))->projectManager : false; + $site = \App\Models\Site::query()->find(session('tickets.pr')); + $projectManager = $site ? $site->projectManager : false; @endphp - @if($projectManager) -

{{ __("Chef de projet") }} : {{ $projectManager->name }}

+ @if ($projectManager) +

{{ __('Chef de projet') }} : {{ $projectManager->name }}

@endif @endif @@ -76,8 +77,7 @@ {{-- All types --}}
- + @foreach ($status as $statut) @@ -125,8 +124,7 @@ @can('assignTickets', App\Models\Ticket::class)
- + @if (session('tickets.pr') && session('tickets.st') != \App\Enums\Tickets\TicketStatusEnum::archived->value) @if (session('tickets.or')) - +   {{ __('see_mode', ['mode' => __('validation.custom.default')]) }} @@ -209,7 +205,7 @@
-
+
@php @@ -245,16 +241,13 @@ @endphp @include('bo.modules.table-col-sorter', [ 'cols' => $cols, - 'ignore' => session('tickets.or') - ? array_keys($cols) - : ['id', 'site', 'status', 'tickets'], + 'ignore' => session('tickets.or') ? array_keys($cols) : ['id', 'site', 'status', 'tickets'], ]) @if (!count($tickets)) - @@ -267,7 +260,7 @@ 'routeName' => 'ticket', 'model' => $ticket, 'models' => $tickets, - 'value' => ($key + 1) + (($tickets->currentPage() - 1) * $tickets->perPage()), + 'value' => $key + 1 + ($tickets->currentPage() - 1) * $tickets->perPage(), 'noRightsVisible' => false, ]) @endif @@ -291,16 +284,14 @@ 'sitename' => $ticket->site->name, ]) }}">{{ $ticket->site->name }} @else - {{ $ticket->site->name }} + {{ $ticket->site->name }} @endif @endif {{-- type --}} {{-- status --}}
+

{{ __('Aucun ticket') }}

- {{ $ticket->type->label() }} + {{ $ticket->type->label() }} @@ -347,13 +338,10 @@ $ticket_files = $ticket->getFiles(); @endphp @foreach ($ticket_files as $key => $file) - @if ( - $file !== null && - (\App\Lib\Helpers\ToolboxHelper::isImageFile($file) || \App\Lib\Helpers\ToolboxHelper::isPdfFile($file))) + @if ($file !== null && (\App\Lib\Helpers\ToolboxHelper::isImageFile($file) || \App\Lib\Helpers\ToolboxHelper::isPdfFile($file))) + data-gallery="gallery{{ $ticket->id }}" href="{{ asset($file) }}" + target="_blank"> @break @endif @@ -361,8 +349,8 @@ {{-- Modal du ticket --}} + data-bs-target="#ticket{{ $ticket->id }}Modal" type="button"> @@ -377,10 +365,8 @@ action="{{ route('bo.ticket.archive', $ticket) }}"> @method('PUT') @csrf - + @endif @endcan @@ -388,13 +374,12 @@