Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-10-31 17:27:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4872 from turbo124/v5-develop

Browse Source 
Gmail Attachments
This commit is contained in:
David Bomba 2021-02-11 14:44:17 +11:00 committed by GitHub
commit f3950726dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Exceptions/Handler.php
View File

@ -111,6 +111,10 @@ class Handler extends ExceptionHandler
return false;
}
if (strpos($exception->getMessage(), 'expects parameter 1 to be resource') !== false) {
return false;
}
return true;
}

8
app/Helpers/Mail/GmailTransport.php
View File

@ -11,6 +11,7 @@
namespace App\Helpers\Mail;
use App\Utils\TempFile;
use Dacastro4\LaravelGmail\Services\Message\Mail;
use Illuminate\Mail\Transport\Transport;
use Swift_Mime_SimpleMessage;
@ -64,8 +65,11 @@ class GmailTransport extends Transport
nlog("trying to attach");
nlog($child->getContentType());
if($child->getContentType() != 'text/plain')
$this->gmail->attach($child);
if($child->getContentType() != 'text/plain'){
$this->gmail->attach(TempFile::filePath($child));
}
} //todo this should 'just work'

12
app/Utils/TempFile.php
View File

@ -20,4 +20,16 @@ class TempFile
return $temp_path;
}
/* Downloads a file to temp storage and returns the path - used for mailers */
public static function filePath($data) :string
{
$file_path = sys_get_temp_dir().'/'.sha1(microtime());
file_put_contents($file_path, $data);
return $file_path;
}
}