Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for client mailers

This commit is contained in:
David Bomba 2023-01-15 15:36:00 +11:00
parent 60d9a33f0d
commit 26e4b6c740
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -350,7 +350,10 @@ class NinjaMailerJob implements ShouldQueue
{ {
$sending_user = $this->nmo->settings->gmail_sending_user_id; $sending_user = $this->nmo->settings->gmail_sending_user_id;
$user = User::find($this->decodePrimaryKey($sending_user)); if($sending_user == "0")
$user = $this->company->owner();
else
$user = User::find($this->decodePrimaryKey($sending_user));
return $user; return $user;
} }
@ -406,14 +409,6 @@ class NinjaMailerJob implements ShouldQueue
private function setOfficeMailer() private function setOfficeMailer()
{ {
$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);