Merge branch 'develop' into trunk

This commit is contained in:
Noah Lancien 2025-04-08 12:05:10 +02:00
commit 587823b874
5 changed files with 133 additions and 12 deletions

2
.gitignore vendored
View file

@ -9,6 +9,8 @@ public/app/upgrade
public/app/uploads/*
!public/app/uploads/.gitkeep
public/app/cache/*
public/app/webp-express
public/app/themes/.htaccess
# WordPress
public/wp

View file

@ -27,7 +27,7 @@
"roots/wordpress": "6.7.2",
"roots/wp-config": "1.0.0",
"roots/wp-password-bcrypt": "1.2.0",
"uwil/ldc-theme": "^1.0",
"uwil/ldc-theme": "^1.1",
"ldc/ldccrmv4client": "^4.0",
"wpackagist-plugin/breadcrumb-navxt": "^7.4",
"wpengine/advanced-custom-fields-pro": "^6.3",

10
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "05e823cbfb064529a000350458ebf643",
"content-hash": "18e8af366c29fa60c54eb4cef3391e63",
"packages": [
{
"name": "composer/installers",
@ -1893,16 +1893,16 @@
},
{
"name": "uwil/ldc-theme",
"version": "1.0.1",
"version": "1.1.1",
"source": {
"type": "git",
"url": "git@lab.s-web.fr:ldc-web/projets/ldc-theme.git",
"reference": "b07def11bff468b2c5cea0c4db134be56befad38"
"reference": "44f0e4df169a83ff766f03465484b8615cb236b6"
},
"dist": {
"type": "zip",
"url": "https://lab.s-web.fr/api/v4/projects/232/packages/composer/archives/uwil/ldc-theme.zip?sha=b07def11bff468b2c5cea0c4db134be56befad38",
"reference": "b07def11bff468b2c5cea0c4db134be56befad38",
"url": "https://lab.s-web.fr/api/v4/projects/232/packages/composer/archives/uwil/ldc-theme.zip?sha=44f0e4df169a83ff766f03465484b8615cb236b6",
"reference": "44f0e4df169a83ff766f03465484b8615cb236b6",
"shasum": ""
},
"type": "wordpress-theme",

File diff suppressed because one or more lines are too long

View file

@ -38,12 +38,10 @@ function getContactsList()
6672, // Une demande en tant que client / détaillant / distributeur
8640 //EN
],
'MessageTypeID' => 2, // Une demande en tant que client / détaillant / distributeur
'MessageTypeID' => 7, // Une demande en tant que client / détaillant / distributeur
'MessageLabel' => 'Une demande en tant que client / détaillant / distributeur',
'contacts' => [
'anne-lise.launay@ldc.fr',
'cedric.trouve@ldc.fr',
'marine.bregere@ldc.fr'
'rhd@ldc.fr'
]
],
[