Merge branch 'develop' into trunk

.env.example

@@ -41,6 +41,7 @@ CONTACT_MAIL_COMMERCIAL=
 CONTACT_MAIL_PRESSE=
 CONTACT_MAIL_AUTRE=
 CONTACT_MAIL_PAI=
+CONTACT_MAIL_SAV=
 
 # MATOMO
 MATOMO_SITE_ID=

.gitignore

@@ -13,6 +13,10 @@ public/wp
 
 # Logs
 *.log
+.zshrc
+.npm/
+.composer/
+.npmrc
 
 # Dotenv
 .env

composer.lock

@@ -968,16 +968,16 @@
         },
         {
             "name": "uwil/sbv-theme",
-            "version": "1.4.2",
+            "version": "1.4.3",
             "source": {
                 "type": "git",
                 "url": "git@lab.s-web.fr:ldc-web/projets/sbv-theme.git",
-                "reference": "cb3cb90ac0f0e6cd4bfe5982923317b0c53f8f3e"
+                "reference": "39b474254a0ca5565b5b89bb68b2bbc3f4fb3de2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://lab.s-web.fr/api/v4/projects/153/packages/composer/archives/uwil/sbv-theme.zip?sha=cb3cb90ac0f0e6cd4bfe5982923317b0c53f8f3e",
-                "reference": "cb3cb90ac0f0e6cd4bfe5982923317b0c53f8f3e",
+                "url": "https://lab.s-web.fr/api/v4/projects/153/packages/composer/archives/uwil/sbv-theme.zip?sha=39b474254a0ca5565b5b89bb68b2bbc3f4fb3de2",
+                "reference": "39b474254a0ca5565b5b89bb68b2bbc3f4fb3de2",
                 "shasum": ""
             },
             "type": "wordpress-theme",

config/custom.php

@@ -39,6 +39,7 @@ Config::define('CONTACT_MAIL_COMMERCIAL', env('CONTACT_MAIL_COMMERCIAL'));
 Config::define('CONTACT_MAIL_PRESSE', env('CONTACT_MAIL_PRESSE'));
 Config::define('CONTACT_MAIL_AUTRE', env('CONTACT_MAIL_AUTRE'));
 Config::define('CONTACT_MAIL_PAI', env('CONTACT_MAIL_PAI'));
+Config::define('CONTACT_MAIL_SAV', env('CONTACT_MAIL_SAV'));
 
 /**
  * MATOMO ANALYTICS

manifest.yaml

@@ -34,6 +34,7 @@ data:
   CONTACT_MAIL_PRESSE: "${APP_CONTACT_MAIL_PRESSE}"
   CONTACT_MAIL_AUTRE: "${APP_CONTACT_MAIL_AUTRE}"
   CONTACT_MAIL_PAI: "${APP_CONTACT_MAIL_PAI}"
+  CONTACT_MAIL_SAV: "${APP_CONTACT_MAIL_SAV}"
   MATOMO_SITE_ID: "${APP_MATOMO_SITE_ID}"
   LDCWEB_API_TOKEN: "${APP_LDCWEB_API_TOKEN}"
   GOOGLE_RECAPTCHA_PUBLIC: "${APP_GOOGLE_RECAPTCHA_PUBLIC}"
@@ -119,4 +120,4 @@ spec:
         - name: redirect-no-www-to-www
           namespace: common-services
   tls:
-    secretName: ${CRT_TLS_NAME}
+    secretName: ${CRT_TLS_NAME}