Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 08:04:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adjust spam filtering

Browse Source
This commit is contained in:
David Bomba 2022-08-31 12:05:15 +10:00
parent 384ce1fa8d
commit df1bdf0e68
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/ActivityController.php
View File

@ -107,6 +107,7 @@ class ActivityController extends BaseController
'payment' => $activity->payment ? $activity->payment : '', 'payment' => $activity->payment ? $activity->payment : '',
'credit' => $activity->credit ? $activity->credit : '', 'credit' => $activity->credit ? $activity->credit : '',
'task' => $activity->task ? $activity->task : '', 'task' => $activity->task ? $activity->task : '',
'vendor' => $activity->vendor ? $activity->vendor : '',
]; ];
return array_merge($arr, $activity->toArray()); return array_merge($arr, $activity->toArray());

8
app/Jobs/Mail/NinjaMailerJob.php
View File

@ -354,13 +354,13 @@ class NinjaMailerJob implements ShouldQueue
if(!str_contains($this->nmo->to_user->email, "@")) if(!str_contains($this->nmo->to_user->email, "@"))
return true; 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 */ /* 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) if(Ninja::isHosted() && $this->company->account && !$this->company->account->account_sms_verified)
return true; 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; return false;
} }

5
app/Models/Activity.php
View File

@ -266,6 +266,11 @@ class Activity extends StaticModel
return $this->belongsTo(Invoice::class)->withTrashed(); return $this->belongsTo(Invoice::class)->withTrashed();
} }
public function vendor()
{
return $this->belongsTo(Vendor::class)->withTrashed();
}
/** /**
* @return mixed * @return mixed
*/ */