From 8dd09be1430ac795b7334c616b3297929af33607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 14 Sep 2021 11:28:10 +0200 Subject: [PATCH 1/2] Add `website()` to CompanyPresenter --- app/Models/Presenters/CompanyPresenter.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/app/Models/Presenters/CompanyPresenter.php b/app/Models/Presenters/CompanyPresenter.php index 27194763fbdd..44dd0572275b 100644 --- a/app/Models/Presenters/CompanyPresenter.php +++ b/app/Models/Presenters/CompanyPresenter.php @@ -12,6 +12,7 @@ namespace App\Models\Presenters; use App\Models\Country; +use Illuminate\Support\Str; /** * Class CompanyPresenter. @@ -139,4 +140,24 @@ class CompanyPresenter extends EntityPresenter { return $this->entity->size ? $this->entity->size->name : ''; } + + /** + * Return company website URL. + * + * @return string + */ + public function website(): string + { + $website = $this->entity->getSetting('website'); + + if (empty($website)) { + return $website; + } + + if (Str::contains($website, ['http', 'https'])) { + return $website; + } + + return \sprintf('http://%s', $website); + } } From 11a7d9333ea74ff3cef69a239a86c1af6df246f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 14 Sep 2021 11:28:23 +0200 Subject: [PATCH 2/2] Update login page to use presenter --- resources/views/portal/ninja2020/auth/login.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/portal/ninja2020/auth/login.blade.php b/resources/views/portal/ninja2020/auth/login.blade.php index 0ad0f20d90d2..c8674eeb83a1 100644 --- a/resources/views/portal/ninja2020/auth/login.blade.php +++ b/resources/views/portal/ninja2020/auth/login.blade.php @@ -77,10 +77,10 @@ @endif - @if(!is_null($company) && !empty($company->getSetting('website'))) + @if(!empty($company->present()->website())) @endif