Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity

Merge pull request #6060 from turbo124/v5-develop

Browse Source 
Fixes for conflicts
This commit is contained in:
David Bomba 2021-06-17 17:59:16 +10:00 committed by GitHub
commit 2acd39c73e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Providers/MailCssInlinerServiceProvider.php
View File

@ -42,9 +42,9 @@ class MailCssInlinerServiceProvider extends ServiceProvider
return new CssInlinerPlugin([]);
});
$this->app->afterResolving('mail.manager', function (MailManager $mailManager) {
$mailManager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
return $mailManager;
});
// $this->app->afterResolving('mail.manager', function (MailManager $mailManager) {
// $mailManager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
// return $mailManager;
// });
}
}

9
app/Providers/MailServiceProvider.php
View File

@ -33,7 +33,7 @@ class MailServiceProvider extends MailProvider
protected function registerIlluminateMailer()
{
$this->app->singleton('mail.manager', function($app) {
return new GmailTransportManager($app);
});
@ -50,7 +50,12 @@ class MailServiceProvider extends MailProvider
);
});
$this->app->afterResolving('mail.manager', function (MailManager $mailManager) {
$mailManager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
return $mailManager;
});
}
protected function guzzle(array $config): HttpClient