From 8ff01a97a230d752dddd59ab191904c42d503507 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 24 Jul 2021 17:43:16 +1000 Subject: [PATCH 1/2] Remove base 64 encoding --- app/Models/Presenters/CompanyPresenter.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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; From 465fb7196231654725b812398d4c985f1277e573 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 24 Jul 2021 17:43:40 +1000 Subject: [PATCH 2/2] Remove time delays --- app/Http/Controllers/EmailController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)); }