Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 18:34:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6327 from turbo124/v5-develop

Browse Source 
Remove email time delays
This commit is contained in:
David Bomba 2021-07-24 17:43:55 +10:00 committed by GitHub
commit d236483e9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 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();
EmailEntity::dispatch($invitation->fresh(), $invitation->company, $template, $data)
->delay(now()->addSeconds(45));
EmailEntity::dispatch($invitation->fresh(), $invitation->company, $template, $data);
// ->delay(now()->addSeconds(45));
}

11
app/Models/Presenters/CompanyPresenter.php
View File

@ -30,10 +30,8 @@ class CompanyPresenter extends EntityPresenter
//return $this->entity->name ?: ctrans('texts.untitled_account');
}
/*
@deprecated
*/
public function logo2($settings = null)
public function logo($settings = null)
{
if (! $settings) {
$settings = $this->entity->settings;
@ -48,7 +46,10 @@ class CompanyPresenter extends EntityPresenter
}
public function logo($settings = null)
/**
* Test for using base64 encoding
*/
public function logo2($settings = null)
{
if (! $settings) {
$settings = $this->entity->settings;