wip: mimes type for ticket files
This commit is contained in:
parent
a4d0b131a4
commit
23e296978d
6 changed files with 52 additions and 85 deletions
|
|
@ -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é'));
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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)]
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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.*' => [
|
||||
|
|
|
|||
|
|
@ -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');
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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');
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -119,24 +119,14 @@
|
|||
<textarea name="message" class="form-control" rows="10"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
@for($i = 1; $i < 4; $i++)
|
||||
<div class="row mt-4">
|
||||
<div class="col">
|
||||
<label for="formFile" class="form-label">{{ __('Joindre un fichier 2Mo max') }}</label>
|
||||
<input class="form-control" type="file" id="formFile" name="file_message" accept="image/png, image/jpeg, image/jpg, .pdf, .pptx, .docx, .xlsx, .csv">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mt-4">
|
||||
<div class="col">
|
||||
<label for="formFile2" class="form-label">{{ __('Joindre un fichier 2Mo max') }}</label>
|
||||
<input class="form-control" type="file" id="formFile2" name="file_message2" accept="image/png, image/jpeg, image/jpg, .pdf, .pptx, .docx, .xlsx, .csv">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mt-4">
|
||||
<div class="col">
|
||||
<label for="formFile3" class="form-label">{{ __('Joindre un fichier 2Mo max') }}</label>
|
||||
<input class="form-control" type="file" id="formFile3" name="file_message3" accept="image/png, image/jpeg, image/jpg, .pdf, .pptx, .docx, .xlsx, .csv">
|
||||
<h4>Fichier joint {{ $i }}</h4>
|
||||
<input name="file_messages[]" class="form-control" type="file" accept="image/png, image/jpeg, image/jpg, .pdf, .pptx, .docx, .xlsx, .csv">
|
||||
</div>
|
||||
</div>
|
||||
@endfor
|
||||
<div class="row mt-4">
|
||||
<div class="col">
|
||||
<div class="form-check">
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue