Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 07:02:34 +01:00
Code Issues Releases Activity

Merge pull request #5954 from turbo124/v5-develop

Browse Source 
Assign public property to $messag
This commit is contained in:
David Bomba 2021-06-08 12:50:38 +10:00 committed by GitHub
commit 764e23dd0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Jobs/Company/CompanyImport.php
View File

@ -288,6 +288,7 @@ class CompanyImport implements ShouldQueue
$nmo->to_user = $this->company->owner(); $nmo->to_user = $this->company->owner();
NinjaMailerJob::dispatchNow($nmo); NinjaMailerJob::dispatchNow($nmo);
nlog($this->message);
throw new \Exception($this->message); throw new \Exception($this->message);
} }

2
app/Mail/Import/CompanyImportFailure.php
View File

@ -56,6 +56,8 @@ class CompanyImportFailure extends Mailable
$this->title = ctrans('texts.company_import_failure_subject', ['company' => $this->company->present()->name()]); $this->title = ctrans('texts.company_import_failure_subject', ['company' => $this->company->present()->name()]);
$this->whitelabel = $this->company->account->isPaid(); $this->whitelabel = $this->company->account->isPaid();
nlog($this->user_message);
return $this->from(config('mail.from.address'), config('mail.from.name')) return $this->from(config('mail.from.address'), config('mail.from.name'))
->subject(ctrans('texts.company_import_failure_subject', ['company' => $this->company->present()->name()])) ->subject(ctrans('texts.company_import_failure_subject', ['company' => $this->company->present()->name()]))
->view('email.import.import_failure', ['user_message' => $this->user_message, 'title' => $this->title]); ->view('email.import.import_failure', ['user_message' => $this->user_message, 'title' => $this->title]);