From 49e302d74a5b90a0ae2d0c99da75542bec88b0cc Mon Sep 17 00:00:00 2001 From: Louis Jeckel Date: Mon, 7 Sep 2020 08:47:04 +0200 Subject: [PATCH] config / env --- app/Jobs/ProcessEmailBatch.php | 8 ++++---- config/mail.php | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/Jobs/ProcessEmailBatch.php b/app/Jobs/ProcessEmailBatch.php index fa7125d..015b338 100644 --- a/app/Jobs/ProcessEmailBatch.php +++ b/app/Jobs/ProcessEmailBatch.php @@ -107,16 +107,16 @@ class ProcessEmailBatch implements ShouldQueue $params = [ - 'from' => env('MAIL_FROM_NAME').' <'.env('MAIL_FROM_ADDRESS').'>', + 'from' => config('mail.mailgun.from_name').' <'.config('mail.from.address').'>', 'to' => $chunk->pluck('email')->toArray(), 'subject' => $this->batch->subject, 'recipient-variables' => $variables, 'html' => $view, - 'o:tag' => [$this->batch->getTag(), env('APP_ENV').'_batch'], - 'o:testmode' => env('MAILGUN_TEST_MODE', 'yes'), + 'o:tag' => [$this->batch->getTag(), config('app.env').'_batch'], + 'o:testmode' => config('mail.mailgun.test_mode', 'yes'), ]; - Mailgun::messages()->send(env('MAILGUN_DOMAIN'), $params); + Mailgun::messages()->send(config('mail.mailgun.domain'), $params); $this->processUpdate([ 'status' => 'processing', 'total' => $count, diff --git a/config/mail.php b/config/mail.php index f71b11d..0d16729 100644 --- a/config/mail.php +++ b/config/mail.php @@ -108,7 +108,11 @@ return [ 'mailgun' => [ 'api_key' => env('MAILGUN_API_KEY'), - 'chunk_size' => env('MAILGUN_CHUNK_SIZE', 200) + 'chunk_size' => env('MAILGUN_CHUNK_SIZE', 200), + 'from_name' => env('MAIL_FROM_NAME'), + 'from_address' => env('MAIL_FROM_ADDRESS'), + 'test_mode' => env('MAILGUN_TEST_MODE'), + 'domain' => env('MAILGUN_DOMAIN') ] ]; -- 2.39.5