tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8360 from turbo124/v5-develop

Browse source 
Minor formatting
This commit is contained in:
David Bomba 2023-03-12 16:54:53 +11:00 • committed by GitHub
commit 216da6cb23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Services/Email/EmailDefaults.php
View file

@ -296,7 +296,7 @@ class EmailDefaults
}
/** UBL xml file */
if ($this->email->email_object->entity instanceof Invoice && $this->email->email_object->settings->ubl_email_attachment) {
if ($this->email->email_object->settings->ubl_email_attachment && $this->email->email_object->entity instanceof Invoice) {
$ubl_string = (new CreateUbl($this->email->email_object->entity))->handle();
if ($ubl_string) {
@ -307,7 +307,6 @@ class EmailDefaults
if(!$this->email->email_object->settings->document_email_attachment)
return $this;
/* Company Documents */
$this->email->email_object->documents = array_merge($this->email->email_object->documents, $this->email->company->documents->pluck('id')->toArray());