Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4870 from turbo124/v5-develop

Browse Source 
Working on GMail
This commit is contained in:
David Bomba 2021-02-11 10:38:59 +11:00 committed by GitHub
commit 8a533e59d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Helpers/Mail/GmailTransport.php
View File

@ -60,13 +60,15 @@ class GmailTransport extends Transport
$this->gmail->cc($message->getCc()); $this->gmail->cc($message->getCc());
$this->gmail->bcc($message->getBcc()); $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"); } //todo this should 'just work'
// nlog($child);
// $this->gmail->attach($child);
// } //todo this should 'just work'
$this->gmail->send(); $this->gmail->send();

2
app/Helpers/Mail/GmailTransportManager.php
View File

@ -11,7 +11,7 @@ class GmailTransportManager extends MailManager
{ {
protected function createGmailTransport() protected function createGmailTransport()
{ {
info('ping pong');
$token = $this->app['config']->get('services.gmail.token', []); $token = $this->app['config']->get('services.gmail.token', []);
$mail = new Mail; $mail = new Mail;

1
app/Jobs/Mail/BaseMailerJob.php
View File

@ -45,6 +45,7 @@ class BaseMailerJob implements ShouldQueue
{ {
/* Singletons need to be rebooted each time just in case our Locale is changing*/ /* Singletons need to be rebooted each time just in case our Locale is changing*/
App::forgetInstance('translator'); App::forgetInstance('translator');
App::forgetInstance('mail.manager'); //singletons must be destroyed!
/* Inject custom translations if any exist */ /* Inject custom translations if any exist */
Lang::replace(Ninja::transformTranslations($this->settings)); Lang::replace(Ninja::transformTranslations($this->settings));

2
app/Providers/MailServiceProvider.php
View File

@ -20,7 +20,7 @@ class MailServiceProvider extends MailProvider
return new GmailTransportManager($app); return new GmailTransportManager($app);
}); });
// Copied from Illuminate\Mail\MailServiceProvider
$this->app->bind('mailer', function ($app) { $this->app->bind('mailer', function ($app) {
return $app->make('mail.manager')->mailer(); return $app->make('mail.manager')->mailer();
}); });