wip #3316 @1

diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php
index 86dd4f3fd2cf6c1e5e2267e99aff265770d0a9dc..2fd5079064c36ee02012d12a4af5ac2da2925a52 100644 (file)
--- a/app/Http/Controllers/AjaxController.php
+++ b/app/Http/Controllers/AjaxController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use App\Models\Page;
 use App\Models\Product;
 use App\Models\QuoteRequest;
+use App\Models\Settings;
 use Carbon\Carbon;
 use Cubist\Backpack\app\Http\Controllers\CubistFrontController;
 use Cubist\Backpack\app\Magic\PageData;
@@ -97,8 +98,10 @@ class AjaxController extends CubistFrontController
             $message->from(config('mail.from.address'), config('mail.from.name'));
             $message->sender(config('mail.from.address'), config('mail.from.name'));
             $message->bcc('test+pmi@cubedesigners.com');
-            if (null === $page->form_destination) {
-                $message->to('contact@pm-instrumentation.com');
+            if (null === $page->form_destination || empty($page->form_destination)) {
+                foreach (Settings::getData()->form_default_recipients as $recipient) {
+                    $message->to($recipient);
+                }
             } else {
                 foreach ($page->form_destination as $item) {
                     $message->to($item);

diff --git a/app/Models/Settings.php b/app/Models/Settings.php
index 04366ad12b867612b5b6832458afabae78626a67..9dfb0adf10641a139be2cb5d673b8b695c0000d6 100644 (file)
--- a/app/Models/Settings.php
+++ b/app/Models/Settings.php
@@ -37,6 +37,13 @@ class Settings extends \Cubist\Backpack\app\Magic\Models\Settings
         ]);
 
         //=== Forms
+        $this->addField([
+            'name' => 'form_default_recipients',
+            'type' => 'Tags',
+            'label' => 'Destinataires par défaut des formulaires',
+            'tab' => 'Formulaires',
+        ]);
+
         $this->addField([
             'name' => 'form_privacy',
             'type' => 'Markdown',
@@ -44,6 +51,7 @@ class Settings extends \Cubist\Backpack\app\Magic\Models\Settings
             'tab' => 'Formulaires',
         ]);
 
+
         //=== Footer
         $this->addField([
             'name' => 'footer_text',

diff --git a/app/Templates/Base.php b/app/Templates/Base.php
index e46c63767a4e5ffa939fe67a6b701f10b49e38f7..694bb749a58db2aed0f47b45de90aae8b37d7f42 100644 (file)
--- a/app/Templates/Base.php
+++ b/app/Templates/Base.php
@@ -55,6 +55,7 @@ class Base extends TemplatePage
         $this->addField(['name' => 'form_destination',
             'type' => 'Tags',
             'label' => 'Destinataires du formulaire',
+            'hint' => 'Laisser vide pour utiliser les destinataires par défaut',
             'tab' => $tab]);
 
         $this->addField(['name' => 'form_prefix',

diff --git a/config/app.php b/config/app.php
index 03aae891bfdc7952c711361e64171cf3e3ba3136..65dd406bdf0c1a8bf1ebea222fb8b6c1c503bf1c 100644 (file)
--- a/config/app.php
+++ b/config/app.php
@@ -175,7 +175,7 @@ return [
         Illuminate\Bus\BusServiceProvider::class,
         Illuminate\Cache\CacheServiceProvider::class,
         Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
-        Illuminate\Cookie\CookieServiceProvider::class,
+        Cubist\Backpack\CookieServiceProvider::class,
         Illuminate\Database\DatabaseServiceProvider::class,
         Illuminate\Encryption\EncryptionServiceProvider::class,
         Illuminate\Filesystem\FilesystemServiceProvider::class,