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

Merge pull request #6324 from turbo124/v5-develop

Browse Source 
Tweak email delays
This commit is contained in:
David Bomba 2021-07-24 17:28:18 +10:00 committed by GitHub
commit 2756ae76e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/EmailController.php
View File

@ -131,8 +131,8 @@ class EmailController extends BaseController
$entity_obj->service()->markSent()->save(); $entity_obj->service()->markSent()->save();
EmailEntity::dispatch($invitation->fresh(), $invitation->company, $template, $data) EmailEntity::dispatch($invitation->fresh(), $invitation->company, $template, $data);
->delay(now()->addSeconds(30)); // ->delay(now()->addSeconds(30));
} }

4
app/Mail/TemplateEmail.php
View File

@ -107,10 +107,6 @@ class TemplateEmail extends Mailable
$message->invitation = $this->invitation; $message->invitation = $this->invitation;
}); });
/*TODO insert another check here for whether the attachment exists */
nlog($this->build_email->getAttachments());
foreach ($this->build_email->getAttachments() as $file) { foreach ($this->build_email->getAttachments() as $file) {
if(is_string($file)) if(is_string($file))

4
app/Utils/Traits/Uploadable.php
View File

@ -33,10 +33,6 @@ trait Uploadable
if ($file) { if ($file) {
$path = UploadAvatar::dispatchNow($file, $company->company_key); $path = UploadAvatar::dispatchNow($file, $company->company_key);
//$path = str_replace(config("ninja.app_url"), "", $path);
info("the path {$path}");
if ($path) { if ($path) {
$settings = $entity->settings; $settings = $entity->settings;
$settings->company_logo = $path; $settings->company_logo = $path;