From 5c609f91f1c6843e748cf2c61080f6e276205e82 Mon Sep 17 00:00:00 2001
From: = <turbo124@gmail.com>
Date: Wed, 1 Sep 2021 17:36:36 +1000
Subject: [PATCH 1/2] Fixes for client portal login

---
 app/Http/Controllers/Auth/ContactLoginController.php  | 5 ++++-
 resources/views/portal/ninja2020/auth/login.blade.php | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Auth/ContactLoginController.php b/app/Http/Controllers/Auth/ContactLoginController.php
index 4f4eaf1131d6..057adf6448e7 100644
--- a/app/Http/Controllers/Auth/ContactLoginController.php
+++ b/app/Http/Controllers/Auth/ContactLoginController.php
@@ -45,7 +45,7 @@ class ContactLoginController extends Controller
             MultiDB::findAndSetDbByDomain(['subdomain' => $subdomain]);
 
             $company = Company::where('subdomain', $subdomain)->first();
-            
+
         } elseif(Ninja::isHosted()){
 
             MultiDB::findAndSetDbByDomain(['portal_domain' => $request->getSchemeAndHttpHost()]);
@@ -70,6 +70,9 @@ class ContactLoginController extends Controller
     {
         Auth::shouldUse('contact');
 
+        if(Ninja::isHosted() && $request->has('db'))
+            MultiDB::setDb($request->input('db'));
+
         $this->validateLogin($request);
         // If the class is using the ThrottlesLogins trait, we can automatically throttle
         // the login attempts for this application. We'll key this by the username and
diff --git a/resources/views/portal/ninja2020/auth/login.blade.php b/resources/views/portal/ninja2020/auth/login.blade.php
index ec2e188f8ff3..69b1ff0a7183 100644
--- a/resources/views/portal/ninja2020/auth/login.blade.php
+++ b/resources/views/portal/ninja2020/auth/login.blade.php
@@ -52,6 +52,9 @@
                                 <a class="text-xs text-gray-600 hover:text-gray-800 ease-in duration-100"
                                    href="{{ route('client.password.request') }}">{{ trans('texts.forgot_password') }}</a>
                             </div>
+                            @if($company)
+                            <input type="hidden" name="db" value="{{$company->db}}">
+                            @endif
                             <input type="password" name="password" id="password"
                                    class="input"
                                    autofocus>

From a3588ace62d25f82d9755283ad011fa9b5d24306 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 1 Sep 2021 18:17:29 +1000
Subject: [PATCH 2/2] Fixes for company import

---
 app/Jobs/Company/CompanyImport.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Jobs/Company/CompanyImport.php b/app/Jobs/Company/CompanyImport.php
index 17017722a2ab..10a030bd044e 100644
--- a/app/Jobs/Company/CompanyImport.php
+++ b/app/Jobs/Company/CompanyImport.php
@@ -875,7 +875,7 @@ class CompanyImport implements ShouldQueue
     {
         
         $this->genericImport(Design::class, 
-            ['company_id', 'user_id'], 
+            ['company_id', 'user_id', 'hashed_id'], 
             [
                 ['users' => 'user_id'],
             ],