From c62456b3197d1e96a0671641489487a8e7ac0ddc Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 20 Jan 2023 10:58:24 +1100
Subject: [PATCH] Minor fixes for import

---
 app/Jobs/Account/CreateAccount.php |  2 +-
 app/Jobs/Company/CompanyImport.php |  6 ++++++
 app/Jobs/Util/Import.php           | 11 +++++++++++
 app/Models/Document.php            |  5 +++++
 app/Policies/DocumentPolicy.php    |  9 +++++++++
 5 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/app/Jobs/Account/CreateAccount.php b/app/Jobs/Account/CreateAccount.php
index 5c35378b8026..169892cf6956 100644
--- a/app/Jobs/Account/CreateAccount.php
+++ b/app/Jobs/Account/CreateAccount.php
@@ -86,7 +86,7 @@ class CreateAccount
             $sp794f3f->hosted_company_count = config('ninja.quotas.free.max_companies');
             $sp794f3f->account_sms_verified = true;
 
-            if(in_array($this->getDomain($this->request['email']), ['givmail.com','yopmail.com','gmail.com', 'hotmail.com', 'outlook.com', 'yahoo.com', 'aol.com', 'mail.ru'])){
+            if(in_array($this->getDomain($this->request['email']), ['givmail.com','yopmail.com','gmail.com', 'hotmail.com', 'outlook.com', 'yahoo.com', 'aol.com', 'mail.ru','brand-app.biz','proton.me','ema-sofia.eu'])){
                 $sp794f3f->account_sms_verified = false;
             }
 
diff --git a/app/Jobs/Company/CompanyImport.php b/app/Jobs/Company/CompanyImport.php
index 03359ef0001a..35fa2167199e 100644
--- a/app/Jobs/Company/CompanyImport.php
+++ b/app/Jobs/Company/CompanyImport.php
@@ -506,6 +506,12 @@ class CompanyImport implements ShouldQueue
 
         }
         
+        if(Ninja::isHosted())
+        {
+            $this->company->portal_mode = 'sub_domain';
+            $this->company->portal_domain = '';            
+        }
+
         $this->company->save();
 
     	return $this;
diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index b2f9dfd33bdb..1b659d5923e8 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -516,6 +516,12 @@ class Import implements ShouldQueue
 
             }
 
+                if(Ninja::isHosted())   
+                {
+                    $data['portal_mode'] = 'subdomain';
+                    $data['portal_domain'] = '';
+                }
+           
             $data['settings'] = $company_settings;
         }
 
@@ -564,6 +570,11 @@ class Import implements ShouldQueue
 
         TaxRate::reguard();
 
+        if(TaxRate::count() > 0){
+            $this->company->enabled_tax_rates = 2;
+            $this->company->save();
+        }
+
         /*Improve memory handling by setting everything to null when we have finished*/
         $data = null;
         $rules = null;
diff --git a/app/Models/Document.php b/app/Models/Document.php
index 9205fec8b3e6..33c3573bf076 100644
--- a/app/Models/Document.php
+++ b/app/Models/Document.php
@@ -101,6 +101,11 @@ class Document extends BaseModel
         return $this->morphTo();
     }
 
+    public function user()
+    {
+        return $this->belongsTo(User::class)->withTrashed();
+    }
+
     public function generateUrl($absolute = false)
     {
         $url = Storage::disk($this->disk)->url($this->url);
diff --git a/app/Policies/DocumentPolicy.php b/app/Policies/DocumentPolicy.php
index 5ac01f5146b8..f6d72b31110d 100644
--- a/app/Policies/DocumentPolicy.php
+++ b/app/Policies/DocumentPolicy.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
 
 namespace App\Policies;