Merge pull request #6537 from turbo124/v5-develop

Company Import Fix.

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

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'],
             ], 

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>