Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6537 from turbo124/v5-develop

Browse Source 
Company Import Fix.
This commit is contained in:
David Bomba 2021-09-01 18:18:05 +10:00 committed by GitHub
commit de2699b5c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Auth/ContactLoginController.php
View File

@ -45,7 +45,7 @@ class ContactLoginController extends Controller
MultiDB::findAndSetDbByDomain(['subdomain' => $subdomain]); MultiDB::findAndSetDbByDomain(['subdomain' => $subdomain]);
$company = Company::where('subdomain', $subdomain)->first(); $company = Company::where('subdomain', $subdomain)->first();
} elseif(Ninja::isHosted()){ } elseif(Ninja::isHosted()){
MultiDB::findAndSetDbByDomain(['portal_domain' => $request->getSchemeAndHttpHost()]); MultiDB::findAndSetDbByDomain(['portal_domain' => $request->getSchemeAndHttpHost()]);
@ -70,6 +70,9 @@ class ContactLoginController extends Controller
{ {
Auth::shouldUse('contact'); Auth::shouldUse('contact');
if(Ninja::isHosted() && $request->has('db'))
MultiDB::setDb($request->input('db'));
$this->validateLogin($request); $this->validateLogin($request);
// If the class is using the ThrottlesLogins trait, we can automatically throttle // 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 // the login attempts for this application. We'll key this by the username and

2
app/Jobs/Company/CompanyImport.php
View File

@ -875,7 +875,7 @@ class CompanyImport implements ShouldQueue
{ {
$this->genericImport(Design::class, $this->genericImport(Design::class,
['company_id', 'user_id'], ['company_id', 'user_id', 'hashed_id'],
[ [
['users' => 'user_id'], ['users' => 'user_id'],
], ],

3
resources/views/portal/ninja2020/auth/login.blade.php
View File

@ -52,6 +52,9 @@
<a class="text-xs text-gray-600 hover:text-gray-800 ease-in duration-100" <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> href="{{ route('client.password.request') }}">{{ trans('texts.forgot_password') }}</a>
</div> </div>
@if($company)
<input type="hidden" name="db" value="{{$company->db}}">
@endif
<input type="password" name="password" id="password" <input type="password" name="password" id="password"
class="input" class="input"
autofocus> autofocus>