diff --git a/app/Http/Controllers/Fo/ContactController.php b/app/Http/Controllers/Fo/ContactController.php index 1b85da70..8df460b4 100644 --- a/app/Http/Controllers/Fo/ContactController.php +++ b/app/Http/Controllers/Fo/ContactController.php @@ -74,7 +74,7 @@ class ContactController extends Controller $validatedData['email'], $validatedData['message'], config('crm.brand'), - $validatedData['crmsubject'], + ContactFormType::make($validatedData['type'])->crmId(), $validatedData['address'], $validatedData['town'], $validatedData['postal'], diff --git a/app/Http/Requests/Fo/ContactFormRequest.php b/app/Http/Requests/Fo/ContactFormRequest.php index ae631ff8..630980fc 100644 --- a/app/Http/Requests/Fo/ContactFormRequest.php +++ b/app/Http/Requests/Fo/ContactFormRequest.php @@ -47,7 +47,6 @@ class ContactFormRequest extends FormRequest 'town' => 'required|min:3|max:90', 'phone' => 'required|phone:FR', 'message' => 'required|min:20|max:1900', - 'crmsubject' => ['required', Rule::in(array_values(ContactFormType::crmIds()))], ]; if (ContactFormType::make($this->input('type'))->equals(ContactFormType::complain)) { @@ -102,7 +101,6 @@ class ContactFormRequest extends FormRequest 'consumptionDateMonth' => sprintf('%s - %s', trans('validation.custom.consumption_date'), trans('month')), 'consumptionDateYear' => sprintf('%s - %s', trans('validation.custom.consumption_date'), trans('year')), 'joinFile' => trans('validation.custom.attachment'), - 'crmsubject' => trans('validation.custom.crmsubject'), ]; } } diff --git a/resources/ts/fo/partials/contact-form.ts b/resources/ts/fo/partials/contact-form.ts index b1223758..caf55bc7 100644 --- a/resources/ts/fo/partials/contact-form.ts +++ b/resources/ts/fo/partials/contact-form.ts @@ -2,34 +2,21 @@ document.addEventListener("DOMContentLoaded", function () { const checkedSubject = document.querySelector("input[name=\"type\"]:checked") as HTMLInputElement; const typeRadioInputs = document.querySelectorAll("input[name=\"type\"]") as NodeListOf; - const crmSubjectInput = document.querySelector("input[name=\"crmsubject\"]") as HTMLInputElement; if (!document.querySelector("#contact-form") || !checkedSubject || !typeRadioInputs) { return; } checkRadioChecked(checkedSubject.value); - updateCrmSubjectValue(checkedSubject, crmSubjectInput); for (const typeRadioInput of typeRadioInputs) { typeRadioInput.addEventListener("change", (e: Event) => { if (e.currentTarget instanceof HTMLInputElement) { checkRadioChecked(e.currentTarget.value); - updateCrmSubjectValue(e.currentTarget, crmSubjectInput); } }); } }); -/** - * Update the crm subject value depending on checked radio input. - * @param input HTMLInputElement - * @param crmSubjectInput HTMLInputElement - * @return void - */ -function updateCrmSubjectValue(input: HTMLInputElement, crmSubjectInput: HTMLInputElement): void { - crmSubjectInput.value = String(input.getAttribute("data-crm-subject")); -} - function checkRadioChecked(value: string) { // Display complain form if the current checked radio is equal to ContactFormType::complain. displayComplainForm(value === "3"); diff --git a/resources/views/components/fo/contact/contact-form.blade.php b/resources/views/components/fo/contact/contact-form.blade.php index 2a06a59c..4a4094c6 100644 --- a/resources/views/components/fo/contact/contact-form.blade.php +++ b/resources/views/components/fo/contact/contact-form.blade.php @@ -76,8 +76,6 @@ @endif - {{-- CRM SUBJECT --}} - {{-- SUBMIT BUTTON --}}