Fixes for client mailers

This commit is contained in:
David Bomba 2023-01-15 15:36:00 +11:00
parent 60d9a33f0d
commit 26e4b6c740

View File

@ -350,6 +350,9 @@ class NinjaMailerJob implements ShouldQueue
{ {
$sending_user = $this->nmo->settings->gmail_sending_user_id; $sending_user = $this->nmo->settings->gmail_sending_user_id;
if($sending_user == "0")
$user = $this->company->owner();
else
$user = User::find($this->decodePrimaryKey($sending_user)); $user = User::find($this->decodePrimaryKey($sending_user));
return $user; return $user;
@ -407,14 +410,6 @@ class NinjaMailerJob implements ShouldQueue
{ {
$user = $this->resolveSendingUser(); $user = $this->resolveSendingUser();
/* Always ensure the user is set on the correct account */
// if($user->account_id != $this->company->account_id){
// $this->nmo->settings->email_sending_method = 'default';
// return $this->setMailDriver();
// }
$this->checkValidSendingUser($user); $this->checkValidSendingUser($user);
nlog("Sending via {$user->name()}"); nlog("Sending via {$user->name()}");