1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00

Fixes for conflicts

This commit is contained in:
David Bomba 2021-06-17 18:44:07 +10:00
parent d076027d14
commit a059924ca2

View File

@ -35,9 +35,9 @@ class MailServiceProvider extends MailProvider
{
$this->app->singleton('mail.manager', function($app) {
$mailManager = new GmailTransportManager($app);
$mailManager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
return $mailManager;
$manager = new GmailTransportManager($app);
$manager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
return $manager;
});
$this->app->bind('mailer', function ($app) {
@ -53,6 +53,24 @@ class MailServiceProvider extends MailProvider
});
$this->app->extend('mail.manager', function(GmailTransportManager $manager) {
$manager->extend('cocopostmark', function() {
return new PostmarkTransport(
$this->guzzle(config('postmark.guzzle', [])),
config('postmark.secret')
);
$manager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
});
return $manager;
});
// $this->app->afterResolving('mail.manager', function (GmailTransportManager $mailManager) {
// $mailManager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
// return $mailManager;