forge-joniko/ldc-legaulois
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into trunk

Browse source
This commit is contained in:
Vincent BRIDIER 2025-12-19 09:15:47 +01:00
commit 8879306572
3 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Fo/ContactController.php
View file

@ -54,7 +54,7 @@ class ContactController extends Controller
if (ContactFormType::make($validatedData['type'])->equals(ContactFormType::complain)) {
// Send to Passerelle if it is a complain about a product.
\dispatch(new SendPasserelleMail($data, $joinFilePath));
} else if (ContactFormType::make($validatedData['locale'] ?? null)->equals(ContactFormType::nl)) {
} else if (isset($validatedData['locale']) && ContactFormType::make($validatedData['locale'])->equals(ContactFormType::nl)) {
// Send to Export Mailing List if it is a complain from NL page.
app()->setLocale('nl');
\dispatch(new SendNLMail($data, $joinFilePath));

21
composer.lock generated
View file

@ -2659,16 +2659,16 @@
},
{
"name": "ldc/ldccrmv4client",
"version": "4.1.4",
"version": "4.1.5",
"source": {
"type": "git",
"url": "git@lab.s-web.fr:ldc-web/projets/crm-client.git",
"reference": "9aa66a8b3f62c401b0fd43616ba5fd52fe15541a"
"reference": "9725ed12914d75c39f0ee66990a1bff6c77f457c"
},
"dist": {
"type": "zip",
"url": "https://lab.s-web.fr/api/v4/projects/26/packages/composer/archives/ldc/ldccrmv4client.zip?sha=9aa66a8b3f62c401b0fd43616ba5fd52fe15541a",
"reference": "9aa66a8b3f62c401b0fd43616ba5fd52fe15541a",
"url": "https://lab.s-web.fr/api/v4/projects/26/packages/composer/archives/ldc/ldccrmv4client.zip?sha=9725ed12914d75c39f0ee66990a1bff6c77f457c",
"reference": "9725ed12914d75c39f0ee66990a1bff6c77f457c",
"shasum": ""
},
"require": {
@ -2698,21 +2698,16 @@
"license": [
"MIT"
],
"authors": [
{
"name": "Jérémy Munsch",
"email": "jeremy.munsch@ldc.fr",
"homepage": "https://jeremydev.ovh"
}
],
"description": "LDC CRM Client V4",
"homepage": "https://github.com/kwaadpepper",
"keywords": [
"CRM",
"Client",
"LDC",
"Laravel"
]
],
"support": {
"email": "digital@ldc.fr"
}
},
{
"name": "league/commonmark",

1
resources/ts/fo/partials/contact-form.ts
View file

@ -35,6 +35,7 @@ function checkRadioChecked(value: string) {
displayComplainForm(value === "3");
// Display complain form if the current checked radio is ContactFormType::complain, club or games.
// FIXME: Passer les values depuis le controller
const validEnumsValues = ["1", "3", "9"];
displayFileInput(validEnumsValues.includes(value));
}