diff --git a/app/Http/Controllers/EmailController.php b/app/Http/Controllers/EmailController.php index de93ae0516a0..14866f1e47b2 100644 --- a/app/Http/Controllers/EmailController.php +++ b/app/Http/Controllers/EmailController.php @@ -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)); } diff --git a/app/Models/Presenters/CompanyPresenter.php b/app/Models/Presenters/CompanyPresenter.php index 3e57e930ff5c..b550213277de 100644 --- a/app/Models/Presenters/CompanyPresenter.php +++ b/app/Models/Presenters/CompanyPresenter.php @@ -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;