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 #4878 from turbo124/v5-develop

Browse Source 
Prevent mailables from being queueable
This commit is contained in:
David Bomba 2021-02-11 23:36:15 +11:00 committed by GitHub
commit 46b9bbcc09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,8 @@ class GmailTransportManager extends MailManager
{
//$token = $this->app['config']->get('services.gmail.token', []);
$token =Config::get('services.gmail.token');
$token = config('services.gmail.token');
$mail = new Mail;
return new GmailTransport($mail, $token);

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

@ -80,15 +80,15 @@ class BaseMailerJob implements ShouldQueue
* just for this request.
*/
Config::set('mail.driver', 'gmail');
Config::set('services.gmail.token', $user->oauth_user_token->access_token);
Config::set('mail.from.address', $user->email);
Config::set('mail.from.name', $user->present()->name());
config(['mail.driver' => 'gmail']);
config(['services.gmail.token' => $user->oauth_user_token->access_token]);
config(['mail.from.address' => $user->email]);
config(['mail.from.name' => $user->present()->name()]);
(new MailServiceProvider(app()))->register();
//(new MailServiceProvider(app()))->register();
nlog("after registering mail service provider");
nlog(Config::set('services.gmail.token'));
nlog(config('services.gmail.token'));
}
public function logMailError($errors, $recipient_object)

5
app/Mail/BouncedEmail.php
View File

@ -17,9 +17,10 @@ use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
class BouncedEmail extends Mailable implements ShouldQueue
// class BouncedEmail extends Mailable implements ShouldQueue
class BouncedEmail extends Mailable
{
use Queueable, SerializesModels;
//use Queueable, SerializesModels;
public $invitation;

2
app/Mail/DownloadInvoices.php
View File

@ -9,7 +9,7 @@ use Illuminate\Queue\SerializesModels;
class DownloadInvoices extends Mailable
{
use Queueable, SerializesModels;
// use Queueable, SerializesModels;
public $file_path;

2
app/Mail/ExistingMigration.php
View File

@ -8,7 +8,7 @@ use Illuminate\Queue\SerializesModels;
class ExistingMigration extends Mailable
{
use Queueable, SerializesModels;
// use Queueable, SerializesModels;
/**
* Create a new message instance.

2
app/Mail/Import/ImportCompleted.php
View File

@ -8,7 +8,7 @@ use Illuminate\Queue\SerializesModels;
class ImportCompleted extends Mailable
{
use Queueable, SerializesModels;
// use Queueable, SerializesModels;
/**
* Create a new message instance.

2
app/Mail/Invoices/InvoiceWasPaid.php
View File

@ -8,7 +8,7 @@ use Illuminate\Queue\SerializesModels;
class InvoiceWasPaid extends Mailable
{
use Queueable, SerializesModels;
// use Queueable, SerializesModels;
/**
* Create a new message instance.

2
app/Mail/MigrationCompleted.php
View File

@ -9,7 +9,7 @@ use Illuminate\Queue\SerializesModels;
class MigrationCompleted extends Mailable
{
use Queueable, SerializesModels;
// use Queueable, SerializesModels;
public $company;

2
app/Mail/MigrationFailed.php
View File

@ -8,7 +8,7 @@ use Illuminate\Queue\SerializesModels;
class MigrationFailed extends Mailable
{
use Queueable, SerializesModels;
// use Queueable, SerializesModels;
public $exception;
public $content;

2
app/Mail/Quote/QuoteWasApproved.php
View File

@ -8,7 +8,7 @@ use Illuminate\Queue\SerializesModels;
class QuoteWasApproved extends Mailable
{
use Queueable, SerializesModels;
// use Queueable, SerializesModels;
/**
* Create a new message instance.

2
app/Mail/SupportMessageSent.php
View File

@ -11,7 +11,7 @@ use SplFileObject;
class SupportMessageSent extends Mailable
{
use Queueable, SerializesModels;
// use Queueable, SerializesModels;
public $message;

2
app/Mail/TemplateEmail.php
View File

@ -20,7 +20,7 @@ use Illuminate\Queue\SerializesModels;
class TemplateEmail extends Mailable
{
use Queueable, SerializesModels;
//use Queueable, SerializesModels;
private $build_email;

2
app/Mail/TestMailServer.php
View File

@ -17,7 +17,7 @@ use Illuminate\Queue\SerializesModels;
class TestMailServer extends Mailable
{
use Queueable, SerializesModels;
// use Queueable, SerializesModels;
public $message;