From 480482f5b2b456e977c940daecdb57e3cdf4dd51 Mon Sep 17 00:00:00 2001 From: Alexis Gousseau Date: Mon, 6 Nov 2023 09:28:50 +0100 Subject: [PATCH] update contact pdf validation --- app/Http/Requests/Fo/ContactRequest.php | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/app/Http/Requests/Fo/ContactRequest.php b/app/Http/Requests/Fo/ContactRequest.php index 7f45aab..f70c409 100644 --- a/app/Http/Requests/Fo/ContactRequest.php +++ b/app/Http/Requests/Fo/ContactRequest.php @@ -141,14 +141,12 @@ class ContactRequest extends FormRequest 'accept_rules' => 'required|boolean', 'send_data' => 'required|boolean', ]; - if (request()->file->getClientMimeType() === "application/pdf") { - \array_merge($rules, [ - //phpcs:ignore Generic.Files.LineLength.TooLong - 'file' => 'sometimes|nullable|mimes:application/pdf|required_with:product_name,product_date_limit,product_barcode,product_lot,product_date_consumption,product_location' - ]); - } elseif (request()->file->getClientMimeType() === "image/jpeg" || request()->file->getClientMimeType() === "image/png") { - dd(request()->file->getClientMimeType()); - \array_merge($rules, $this->pictureRules( + if ( + isset(request()->file) and + (request()->file->getClientMimeType() === "image/jpeg" || + request()->file->getClientMimeType() === "image/png") + ) { + $rules = \array_merge($rules, $this->pictureRules( 'file', 0, 0, @@ -158,7 +156,12 @@ class ContactRequest extends FormRequest true, 'product_name,product_date_limit,product_barcode,product_lot,product_date_consumption,product_location' )); - } + } elseif (isset(request()->file) and (request()->file->getClientMimeType() === "application/pdf")) { + $rules = \array_merge($rules, [ + //phpcs:ignore Generic.Files.LineLength.TooLong + 'file' => 'sometimes|nullable|mimes:pdf|required_with:product_name,product_date_limit,product_barcode,product_lot,product_date_consumption,product_location' + ]); + } //end if return $rules; } @@ -189,7 +192,7 @@ class ContactRequest extends FormRequest 'message' => trans('validation.attributes.message'), 'accept_rules' => trans('validation.custom.accept_rules'), 'send_data' => trans('validation.custom.send_data'), - 'file' => trans('validation.custom.send_data'), + 'file' => trans('validation.custom.file'), ]; } }