diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php index e64f3df8bec5..8e85d37f1209 100644 --- a/app/Http/Controllers/ActivityController.php +++ b/app/Http/Controllers/ActivityController.php @@ -107,6 +107,7 @@ class ActivityController extends BaseController 'payment' => $activity->payment ? $activity->payment : '', 'credit' => $activity->credit ? $activity->credit : '', 'task' => $activity->task ? $activity->task : '', + 'vendor' => $activity->vendor ? $activity->vendor : '', ]; return array_merge($arr, $activity->toArray()); diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php index 0f291e22d0de..928a75f36e06 100644 --- a/app/Jobs/Mail/NinjaMailerJob.php +++ b/app/Jobs/Mail/NinjaMailerJob.php @@ -354,13 +354,13 @@ class NinjaMailerJob implements ShouldQueue if(!str_contains($this->nmo->to_user->email, "@")) return true; - /* On the hosted platform we actively scan all outbound emails to ensure outbound email quality remains high */ - if(class_exists(\Modules\Admin\Jobs\Account\EmailQuality::class)) - return (new \Modules\Admin\Jobs\Account\EmailQuality($this->nmo, $this->company))->run(); - /* On the hosted platform if the user has not verified their account we fail here */ if(Ninja::isHosted() && $this->company->account && !$this->company->account->account_sms_verified) return true; + + /* On the hosted platform we actively scan all outbound emails to ensure outbound email quality remains high */ + if(class_exists(\Modules\Admin\Jobs\Account\EmailQuality::class)) + return (new \Modules\Admin\Jobs\Account\EmailQuality($this->nmo, $this->company))->run(); return false; } diff --git a/app/Models/Activity.php b/app/Models/Activity.php index 5a7d3f8d7ca7..65d8be82eee7 100644 --- a/app/Models/Activity.php +++ b/app/Models/Activity.php @@ -266,6 +266,11 @@ class Activity extends StaticModel return $this->belongsTo(Invoice::class)->withTrashed(); } + public function vendor() + { + return $this->belongsTo(Vendor::class)->withTrashed(); + } + /** * @return mixed */