config / env

diff --git a/app/Jobs/ProcessEmailBatch.php b/app/Jobs/ProcessEmailBatch.php
index fa7125d8a6fc70c98f3c7d65c2adaa63f57fad7c..015b33894993ff6fe947c2bbee5c2e5a1c0e8687 100644 (file)
--- 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 f71b11dc1025fd99871ee109d169ca569585cf31..0d16729484e8989ef122ac39cbd6b357bac3d250 100644 (file)
--- 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')
     ]
 
 ];