From a35f796f97e5ebd581a164db1eac2e80bdedae76 Mon Sep 17 00:00:00 2001 From: Louis Jeckel Date: Wed, 7 Oct 2020 10:15:31 +0200 Subject: [PATCH] newsletter --- app/Http/Controllers/Admin/PublishController.php | 9 +++++---- app/Jobs/ProcessEmailBatch.php | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Admin/PublishController.php b/app/Http/Controllers/Admin/PublishController.php index 761134a..5eb5bd8 100644 --- 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 895c30f..afc8f45 100644 --- 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(); -- 2.39.5