From 9773e4808db9de6239ca41f5f11e9f00f4ff1163 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 17 May 2021 20:16:30 +1000 Subject: [PATCH] Fixes for URLs --- app/Utils/Traits/Inviteable.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/Utils/Traits/Inviteable.php b/app/Utils/Traits/Inviteable.php index 02e04cde8d6a..ec5b0b64b9c3 100644 --- a/app/Utils/Traits/Inviteable.php +++ b/app/Utils/Traits/Inviteable.php @@ -11,6 +11,7 @@ namespace App\Utils\Traits; +use App\Utils\Ninja; use Illuminate\Support\Str; /** @@ -46,7 +47,10 @@ trait Inviteable { $entity_type = Str::snake(class_basename($this->entityType())); - $domain = isset($this->company->portal_domain) ? $this->company->portal_domain : $this->company->domain(); + if(Ninja::isHosted()) + $domain = isset($this->company->portal_domain) ? $this->company->portal_domain : $this->company->domain(); + else + $domain = config('ninja.app_url'); switch ($this->company->portal_mode) { case 'subdomain': @@ -69,7 +73,10 @@ trait Inviteable public function getPortalLink() :string { - $domain = isset($this->company->portal_domain) ? $this->company->portal_domain : $this->company->domain(); + if(Ninja::isHosted()) + $domain = isset($this->company->portal_domain) ? $this->company->portal_domain : $this->company->domain(); + else + $domain = config('ninja.app_url'); switch ($this->company->portal_mode) { case 'subdomain':