newsletter

diff --git a/app/Http/Controllers/Admin/PublishController.php b/app/Http/Controllers/Admin/PublishController.php
index 761134ad8e0e7e5fc3f37eae50fa8de88491d73b..5eb5bd807667483024161630131978b17e30c1a7 100644 (file)
--- a/app/Http/Controllers/Admin/PublishController.php
+++ b/app/Http/Controllers/Admin/PublishController.php
@@ -169,18 +169,19 @@ class PublishController extends Controller
             ],
             'subscribers' => [
                 'slug' => 'subscribers',
-                'builder' => User::registeredUser(),
+                'builder' => User::hasActiveSubscription(),
                 'text' => 'Abonnés',
             ],
             'discover' => [
                 'slug' => 'discover',
-                'builder' => User::discoverUser(),
+                'builder' => User::isOnTrial()->orWhere->isOnDiscovery(),
                 'text' => 'Découverte',
             ],
             'admin' => [
                 'slug' => 'admin',
-                'builder' => User::where('email', 'louis.jeckel@outlook.com'),
-                'text' => 'Administrateur',
+                'builder' => User::where('email', 'louis.jeckel@outlook.com')
+                    ->orWhere('email', 'admin@prescription-quotidien.com'),
+                'text' => 'Administrateur (test)',
             ],
 
         ];

diff --git a/app/Jobs/ProcessEmailBatch.php b/app/Jobs/ProcessEmailBatch.php
index 895c30f20678fd3c7d0df8926885dda934b7be04..afc8f45cbc8c035d5934aa50896c90346fcdc7c9 100644 (file)
--- a/app/Jobs/ProcessEmailBatch.php
+++ b/app/Jobs/ProcessEmailBatch.php
@@ -104,7 +104,7 @@ class ProcessEmailBatch implements ShouldQueue
                 $this->batch->subject,
                 $this->type,
                 null,
-                $this->batch->file->coverUrl
+                optional($this->batch->file)->coverUrl
             ))->render();