diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index a7d534780cec..b19c3525a93e 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -55,18 +55,18 @@ class Handler extends ExceptionHandler ]; protected $selfHostDontReport = [ - FilePermissionsFailure::class, - PDOException::class, - MaxAttemptsExceededException::class, - CommandNotFoundException::class, - ValidationException::class, - ModelNotFoundException::class, - NotFoundHttpException::class, - UnableToCreateDirectory::class, - GuzzleHttp\Exception\ConnectException::class, - Symfony\Component\Process\Exception\RuntimeException::class, - InvalidArgumentException::class, - RuntimeException::class, + // FilePermissionsFailure::class, + // PDOException::class, + // MaxAttemptsExceededException::class, + // CommandNotFoundException::class, + // ValidationException::class, + // ModelNotFoundException::class, + // NotFoundHttpException::class, + // UnableToCreateDirectory::class, + // GuzzleHttp\Exception\ConnectException::class, + // Symfony\Component\Process\Exception\RuntimeException::class, + // InvalidArgumentException::class, + // RuntimeException::class, ]; protected $hostedDontReport = [ diff --git a/app/Http/Controllers/EmailController.php b/app/Http/Controllers/EmailController.php index 8329a71337bd..d618d8cf0dd9 100644 --- a/app/Http/Controllers/EmailController.php +++ b/app/Http/Controllers/EmailController.php @@ -147,9 +147,9 @@ class EmailController extends BaseController if (! $invitation->contact->trashed() && $invitation->contact->email) { $entity_obj->service()->markSent()->save(); - // EmailEntity::dispatch($invitation->fresh(), $invitation->company, $template, $data); + EmailEntity::dispatch($invitation->fresh(), $invitation->company, $template, $data); - MailEntity::dispatch($invitation, $invitation->company->db, $mo); + // MailEntity::dispatch($invitation, $invitation->company->db, $mo); } }); diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php index 695e4f0b34fa..8511280b2cdd 100644 --- a/app/Jobs/Mail/NinjaMailerJob.php +++ b/app/Jobs/Mail/NinjaMailerJob.php @@ -138,6 +138,8 @@ class NinjaMailerJob implements ShouldQueue $mailer->mailgun_config($this->client_mailgun_secret, $this->client_mailgun_domain); } +nlog($this->nmo->to_user->email); + $mailer ->to($this->nmo->to_user->email) ->send($this->nmo->mailable); @@ -393,8 +395,9 @@ class NinjaMailerJob implements ShouldQueue * as the Mailer */ private function setPostmarkMailer() - { + {nlog("configuring postmark"); if(strlen($this->nmo->settings->postmark_secret) > 2){ + nlog($this->nmo->settings->postmark_secret); $this->client_postmark_secret = $this->nmo->settings->postmark_secret; } else{ @@ -406,7 +409,8 @@ class NinjaMailerJob implements ShouldQueue $sending_email = (isset($this->nmo->settings->custom_sending_email) && stripos($this->nmo->settings->custom_sending_email, "@")) ? $this->nmo->settings->custom_sending_email : $user->email; $sending_user = (isset($this->nmo->settings->email_from_name) && strlen($this->nmo->settings->email_from_name) > 2) ? $this->nmo->settings->email_from_name : $user->name(); - +nlog($sending_email); +nlog($sending_user); $this->nmo ->mailable ->from($sending_email, $sending_user); diff --git a/app/Mail/Engine/InvoiceEmailEngine.php b/app/Mail/Engine/InvoiceEmailEngine.php index 46b13aabcec3..a089c0696af6 100644 --- a/app/Mail/Engine/InvoiceEmailEngine.php +++ b/app/Mail/Engine/InvoiceEmailEngine.php @@ -217,3 +217,4 @@ class InvoiceEmailEngine extends BaseEmailEngine return $this; } } +} \ No newline at end of file diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index a0c93ab683fb..f7a75620ecf9 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -94,7 +94,7 @@ class AppServiceProvider extends ServiceProvider }); Mailer::macro('postmark_config', function (string $postmark_key) { - + nlog($postmark_key); Mailer::setSymfonyTransport(app('mail.manager')->createSymfonyTransport([ 'transport' => 'postmark', 'token' => $postmark_key diff --git a/app/Services/Quote/SendEmail.php b/app/Services/Quote/SendEmail.php index b060616429ff..9e05fbb74f2c 100644 --- a/app/Services/Quote/SendEmail.php +++ b/app/Services/Quote/SendEmail.php @@ -52,9 +52,9 @@ class SendEmail $this->quote->invitations->each(function ($invitation) use ($mo){ if (! $invitation->contact->trashed() && $invitation->contact->email) { - // EmailEntity::dispatch($invitation, $invitation->company, $this->reminder_template); + EmailEntity::dispatch($invitation, $invitation->company, $this->reminder_template); - MailEntity::dispatch($invitation, $invitation->company->db, $mo); + // MailEntity::dispatch($invitation, $invitation->company->db, $mo); } });