Halo {{ $recipient->name }},
+ + {!! $content !!} +diff --git a/app/Jobs/SendEmailBlast.php b/app/Jobs/SendEmailBlast.php index 2cdea35..9a37ab6 100644 --- a/app/Jobs/SendEmailBlast.php +++ b/app/Jobs/SendEmailBlast.php @@ -8,6 +8,7 @@ use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; use Illuminate\Support\Facades\Mail; +use Modules\Webstatement\Models\Customer; use Modules\Webstatement\Models\EmailBlastHistory; use Modules\Webstatement\Mail\EmailBlastMail; @@ -27,9 +28,11 @@ class SendEmailBlast implements ShouldQueue public function handle() { foreach ($this->recipients as $recipient) { - Mail::to($recipient)->send(new EmailBlastMail($this->emailBlastHistory)); + $_receipent = Customer::where('email', $recipient)->first(); + Mail::to($recipient)->send(new EmailBlastMail($this->emailBlastHistory, $_receipent)); } + $this->emailBlastHistory->update(['status' => 'completed']); } } diff --git a/app/Mail/EmailBlastMail.php b/app/Mail/EmailBlastMail.php index 087ca5b..2ce4102 100644 --- a/app/Mail/EmailBlastMail.php +++ b/app/Mail/EmailBlastMail.php @@ -12,10 +12,12 @@ class EmailBlastMail extends Mailable use Queueable, SerializesModels; public $emailBlastHistory; + public $recipient; - public function __construct(EmailBlastHistory $emailBlastHistory) + public function __construct(EmailBlastHistory $emailBlastHistory, $recipient) { $this->emailBlastHistory = $emailBlastHistory; + $this->recipient = $recipient; } public function build() @@ -23,7 +25,9 @@ class EmailBlastMail extends Mailable return $this->subject($this->emailBlastHistory->subject) ->view('webstatement::emails.blast') ->with([ - 'content' => $this->emailBlastHistory->content + 'content' => $this->emailBlastHistory->content, + 'subject' => $this->emailBlastHistory->subject, + 'recipient' => $this->recipient->name, ]); } } diff --git a/resources/views/emails/blast.blade.php b/resources/views/emails/blast.blade.php index 3cf1761..0ce76a8 100644 --- a/resources/views/emails/blast.blade.php +++ b/resources/views/emails/blast.blade.php @@ -3,22 +3,69 @@
-Halo {{ $recipient->name }},
+ + {!! $content !!} +