From f583a54863d9c3c31c3f04269af173bb59e306be Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 1 Jul 2022 21:07:34 +1000 Subject: [PATCH 1/2] Fixes for tests --- app/Jobs/Mail/NinjaMailerJob.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php index ed5fc8476dde..ca8227a8b1d7 100644 --- a/app/Jobs/Mail/NinjaMailerJob.php +++ b/app/Jobs/Mail/NinjaMailerJob.php @@ -334,8 +334,8 @@ class NinjaMailerJob implements ShouldQueue return true; /* On the hosted platform we actively scan all outbound emails to ensure outbound email quality remains high */ - if(Ninja::isHosted()) - return (new \Modules\Admin\Jobs\Account\EmailQuality($this->nmo, $this->company))->run(); + // if(Ninja::isHosted()) + // return (new \Modules\Admin\Jobs\Account\EmailQuality($this->nmo, $this->company))->run(); return false; } From f464c6fb1c50bb3f16866818a100f12c2272301f Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 1 Jul 2022 21:08:20 +1000 Subject: [PATCH 2/2] Minor fixes --- app/Jobs/Mail/NinjaMailerJob.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php index ca8227a8b1d7..f5513e36f341 100644 --- a/app/Jobs/Mail/NinjaMailerJob.php +++ b/app/Jobs/Mail/NinjaMailerJob.php @@ -310,7 +310,7 @@ class NinjaMailerJob implements ShouldQueue { /* If we are migrating data we don't want to fire any emails */ - if($this->nmo->company->is_disabled && !$this->override) + if($this->company->is_disabled && !$this->override) return true; /* On the hosted platform we set default contacts a @example.com email address - we shouldn't send emails to these types of addresses */ @@ -326,7 +326,7 @@ class NinjaMailerJob implements ShouldQueue return true; /* To handle spam users we drop all emails from flagged accounts */ - if(Ninja::isHosted() && $this->company->account && $this->nmo->company->account->is_flagged) + if(Ninja::isHosted() && $this->company->account && $this->company->account->is_flagged) return true; /* Ensure the user has a valid email address */