From 5a29b3ef02dceb5e6fd5d67058983a3063696876 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 11 Feb 2021 10:38:42 +1100 Subject: [PATCH] Working on GMail --- app/Helpers/Mail/GmailTransport.php | 14 ++++++++------ app/Helpers/Mail/GmailTransportManager.php | 2 +- app/Jobs/Mail/BaseMailerJob.php | 1 + app/Providers/MailServiceProvider.php | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/Helpers/Mail/GmailTransport.php b/app/Helpers/Mail/GmailTransport.php index 5da256a2f642..b22c8b0d86c0 100644 --- a/app/Helpers/Mail/GmailTransport.php +++ b/app/Helpers/Mail/GmailTransport.php @@ -60,13 +60,15 @@ class GmailTransport extends Transport $this->gmail->cc($message->getCc()); $this->gmail->bcc($message->getBcc()); - nlog($message->getChildren()); + foreach ($message->getChildren() as $child) { + nlog("trying to attach"); + nlog($child->getContentType()); + + if($child->getContentType() == 'multipart/related') + $this->gmail->attach($child); - // foreach ($message->getChildren() as $child) { - // nlog("trying to attach"); - // nlog($child); - // $this->gmail->attach($child); - // } //todo this should 'just work' + + } //todo this should 'just work' $this->gmail->send(); diff --git a/app/Helpers/Mail/GmailTransportManager.php b/app/Helpers/Mail/GmailTransportManager.php index f82ee33eda56..d264f1de7624 100644 --- a/app/Helpers/Mail/GmailTransportManager.php +++ b/app/Helpers/Mail/GmailTransportManager.php @@ -11,7 +11,7 @@ class GmailTransportManager extends MailManager { protected function createGmailTransport() { - info('ping pong'); + $token = $this->app['config']->get('services.gmail.token', []); $mail = new Mail; diff --git a/app/Jobs/Mail/BaseMailerJob.php b/app/Jobs/Mail/BaseMailerJob.php index 104aad63e1b8..04a48bf1ae5e 100644 --- a/app/Jobs/Mail/BaseMailerJob.php +++ b/app/Jobs/Mail/BaseMailerJob.php @@ -45,6 +45,7 @@ class BaseMailerJob implements ShouldQueue { /* Singletons need to be rebooted each time just in case our Locale is changing*/ App::forgetInstance('translator'); + App::forgetInstance('mail.manager'); //singletons must be destroyed! /* Inject custom translations if any exist */ Lang::replace(Ninja::transformTranslations($this->settings)); diff --git a/app/Providers/MailServiceProvider.php b/app/Providers/MailServiceProvider.php index acc322b1e0fa..ef9e15fe9c93 100644 --- a/app/Providers/MailServiceProvider.php +++ b/app/Providers/MailServiceProvider.php @@ -20,7 +20,7 @@ class MailServiceProvider extends MailProvider return new GmailTransportManager($app); }); - // Copied from Illuminate\Mail\MailServiceProvider + $this->app->bind('mailer', function ($app) { return $app->make('mail.manager')->mailer(); });