From 8a4b1a11b31bd8a3d27593fa20bf5523ee21429b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 28 Apr 2021 13:40:11 +1000
Subject: [PATCH] Fixes for company domain

---
 app/Models/Company.php | 6 +++++-
 config/ninja.php       | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Models/Company.php b/app/Models/Company.php
index eeff9efe43c4..c0ed357362dc 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -423,7 +423,11 @@ class Company extends BaseModel
     public function domain()
     {
         if (Ninja::isNinja()) {
-            return $this->subdomain . config('ninja.app_domain');
+
+            if($this->portal_mode == 'domain')
+                return $this->portal_domain;
+
+            return "https://{$this->subdomain}" . config('ninja.app_domain');
         }
 
         return config('ninja.app_url');
diff --git a/config/ninja.php b/config/ninja.php
index 222f7f1348b1..8b2383b03a32 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -13,7 +13,7 @@ return [
     'debug_enabled' => env('APP_DEBUG', false),
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
-    'app_domain' => env('APP_DOMAIN', ''),
+    'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
     'app_version' => '5.1.55',
     'app_tag' => '5.1.55-release',
     'minimum_client_version' => '5.0.16',