diff --git a/app/Http/Controllers/Bo/TicketController.php b/app/Http/Controllers/Bo/TicketController.php index 835d17a..dc00eba 100644 --- a/app/Http/Controllers/Bo/TicketController.php +++ b/app/Http/Controllers/Bo/TicketController.php @@ -178,31 +178,17 @@ class TicketController extends Controller $ticket = new Ticket($request->validated()); - /** @var \Illuminate\Http\UploadedFile|null */ - $fileTicket = $request->file_ticket; - /** @var \Illuminate\Http\UploadedFile|null */ - $fileTicket2 = $request->file_ticket2; - /** @var \Illuminate\Http\UploadedFile|null */ - $fileTicket3 = $request->file_ticket3; - /** @var \Illuminate\Http\UploadedFile|null */ - $fileTicket4 = $request->file_ticket4; - /** @var \Illuminate\Http\UploadedFile|null */ - $fileTicket5 = $request->file_ticket5; - - if ($fileTicket) { - $ticket->file = FileStorageHelper::storeFile($ticket, $fileTicket); - } - if ($fileTicket2) { - $ticket->file2 = FileStorageHelper::storeFile($ticket, $fileTicket2); - } - if ($fileTicket3) { - $ticket->file3 = FileStorageHelper::storeFile($ticket, $fileTicket3); - } - if ($fileTicket4) { - $ticket->file4 = FileStorageHelper::storeFile($ticket, $fileTicket4); - } - if ($fileTicket5) { - $ticket->file5 = FileStorageHelper::storeFile($ticket, $fileTicket5); + /** @var null|array<\Illuminate\Http\UploadedFile> */ + $fileTickets = $request->file_tickets; + if (count($fileTickets) > 0) { + foreach ($fileTickets as $key => $file) { + if ($key === 0) { + $ticket->file = FileStorageHelper::storeFile($ticket, $file); + } else { + $fileNumber = 'file' . $key + 1; + $ticket->$fileNumber = FileStorageHelper::storeFile($ticket, $file); + } + } } $ticket->user()->associate(auth()->user()); @@ -267,33 +253,18 @@ class TicketController extends Controller /** @var \App\Models\Site */ $site = Site::findOrFail($request->site_id); - /** @var \Illuminate\Http\UploadedFile|null */ - $fileTicket = $request->file_ticket; - /** @var \Illuminate\Http\UploadedFile|null */ - $fileTicket2 = $request->file_ticket2; - /** @var \Illuminate\Http\UploadedFile|null */ - $fileTicket3 = $request->file_ticket3; - /** @var \Illuminate\Http\UploadedFile|null */ - $fileTicket4 = $request->file_ticket4; - /** @var \Illuminate\Http\UploadedFile|null */ - $fileTicket5 = $request->file_ticket5; - - if ($fileTicket) { - $ticket->file = FileStorageHelper::storeFile($ticket, $fileTicket); + /** @var null|array<\Illuminate\Http\UploadedFile> */ + $fileTickets = $request->file_tickets; + if (count($fileTickets) > 0) { + foreach ($fileTickets as $key => $file) { + if ($key === 0) { + $ticket->file = FileStorageHelper::storeFile($ticket, $file); + } else { + $fileNumber = 'file' . $key + 1; + $ticket->$fileNumber = FileStorageHelper::storeFile($ticket, $file); + } + } } - if ($fileTicket2) { - $ticket->file2 = FileStorageHelper::storeFile($ticket, $fileTicket2); - } - if ($fileTicket3) { - $ticket->file3 = FileStorageHelper::storeFile($ticket, $fileTicket3); - } - if ($fileTicket4) { - $ticket->file4 = FileStorageHelper::storeFile($ticket, $fileTicket4); - } - if ($fileTicket5) { - $ticket->file5 = FileStorageHelper::storeFile($ticket, $fileTicket5); - } - $ticket->labels()->sync($request->labels); @@ -339,9 +310,8 @@ class TicketController extends Controller try { return DB::transaction(function () use ($request, $ticket) { /** @var \Illuminate\Http\UploadedFile|null */ - $fileMessage = $request->file_message; - - $message = new Message($request->validated()); + $filesMessage = $request->file_messages; + $message = new Message($request->validated()); $message->user()->associate(auth()->user()); $message->ticket()->associate($ticket); @@ -356,12 +326,21 @@ class TicketController extends Controller $user->subscriptions()->detach($ticket->id); } + if (isset($filesMessage) and $filesMessage) { + foreach ($filesMessage as $key => $singleFile) { + if ($key === 0) { + $message->file = FileStorageHelper::storeFile($message, $singleFile); + $message->saveOrFail(); + } else { + $fileNumber = 'file' . $key + 1; + $message->$fileNumber = FileStorageHelper::storeFile($message, $singleFile); + $message->saveOrFail(); + } + } + } + $message->saveOrFail(); - if ($fileMessage) { - $message->file = FileStorageHelper::storeFile($message, $fileMessage); - $message->saveOrFail(); - } return back() ->with('success', trans('Votre message à été ajouté')); }); diff --git a/app/Http/Requests/Bo/CreateMessage.php b/app/Http/Requests/Bo/CreateMessage.php index 59d3e23..5031dc5 100644 --- a/app/Http/Requests/Bo/CreateMessage.php +++ b/app/Http/Requests/Bo/CreateMessage.php @@ -3,7 +3,6 @@ namespace App\Http\Requests\Bo; use App\Enums\MessageTypeEnum; -use App\Enums\Tickets\TicketFileTypeEnum; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rules\Enum; @@ -54,12 +53,11 @@ class CreateMessage extends FormRequest /** @var \App\Models\User */ $user = auth()->user(); return [ - 'subscribe' => 'required|boolean', - 'message' => 'required|min:' . ($user->isAdmin() ? '5' : '20'), - 'file_message' => ['sometimes', new Enum(TicketFileTypeEnum::class), 'max:2048'], - 'file_message2' => ['sometimes', new Enum(TicketFileTypeEnum::class), 'max:2048'], - 'file_message3' => ['sometimes', new Enum(TicketFileTypeEnum::class), 'max:2048'], - 'type' => ['required', new Enum(MessageTypeEnum::class)] + 'subscribe' => 'required|boolean', + 'message' => 'required|min:' . ($user->isAdmin() ? '5' : '20'), + 'file_messages' => 'sometimes|array', + 'file_messages.*' => 'mimes:pptx,docx,xlsx,csv,txt,jpeg,jpg,png,pdf|max:2048', + 'type' => ['required', new Enum(MessageTypeEnum::class)] ]; } } diff --git a/app/Http/Requests/Bo/StoreTicket.php b/app/Http/Requests/Bo/StoreTicket.php index 752ca8c..41a512c 100644 --- a/app/Http/Requests/Bo/StoreTicket.php +++ b/app/Http/Requests/Bo/StoreTicket.php @@ -99,7 +99,7 @@ class StoreTicket extends FormRequest 'text' => 'required|string|min:40', 'title' => 'required|string|between:3,255', 'file_tickets' => 'sometimes|array', - 'file_tickets.*' => 'mimes:pptx,docx,xlsx,csv,jpeg,jpg,png,pdf|max:2048', + 'file_tickets.*' => 'mimes:pptx,docx,xlsx,csv,txt,jpeg,jpg,png,pdf|max:2048', 'is_internal' => 'required|boolean', 'labels' => 'sometimes|array', 'labels.*' => [ diff --git a/database/migrations/2024_07_19_150414_add_files_to_tickets_table.php b/database/migrations/2024_07_19_150414_add_files_to_tickets_table.php index f93fb3a..a3e3ace 100644 --- a/database/migrations/2024_07_19_150414_add_files_to_tickets_table.php +++ b/database/migrations/2024_07_19_150414_add_files_to_tickets_table.php @@ -14,9 +14,9 @@ return new class extends Migration public function up(): void { Schema::table('tickets', function (Blueprint $table) { - $table->string('file3')->after('file2')->comment('Pièce jointes n°3'); - $table->string('file4')->after('file3')->comment('Pièce jointes n°4'); - $table->string('file5')->after('file4')->comment('Pièce jointes n°5'); + $table->string('file3')->after('file2')->nullable()->comment('Pièce jointes n°3'); + $table->string('file4')->after('file3')->nullable()->comment('Pièce jointes n°4'); + $table->string('file5')->after('file4')->nullable()->comment('Pièce jointes n°5'); }); } diff --git a/database/migrations/2024_07_19_151553_add_files_to_messages_table.php b/database/migrations/2024_07_19_151553_add_files_to_messages_table.php index 5a5c3b2..214885d 100644 --- a/database/migrations/2024_07_19_151553_add_files_to_messages_table.php +++ b/database/migrations/2024_07_19_151553_add_files_to_messages_table.php @@ -14,8 +14,8 @@ return new class extends Migration public function up() { Schema::table('messages', function (Blueprint $table) { - $table->string('file2')->after('file')->comment('Pièce jointes n°2'); - $table->string('file3')->after('file2')->comment('Pièce jointes n°3'); + $table->string('file2')->after('file')->nullable()->comment('Pièce jointes n°2'); + $table->string('file3')->after('file2')->nullable()->comment('Pièce jointes n°3'); }); } diff --git a/resources/views/bo/pages/tickets/show.blade.php b/resources/views/bo/pages/tickets/show.blade.php index f575c69..567099c 100644 --- a/resources/views/bo/pages/tickets/show.blade.php +++ b/resources/views/bo/pages/tickets/show.blade.php @@ -119,24 +119,14 @@ + @for($i = 1; $i < 4; $i++)