Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-04 07:34:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes for contact login

Browse Source
This commit is contained in:
David Bomba 2021-11-15 10:29:33 +11:00
parent 2db0ea41fc
commit 293367cd16
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,12 +36,9 @@ class ContactLoginController extends Controller
public function showLoginForm(Request $request) public function showLoginForm(Request $request)
{ {
//if we are on the root domain invoicing.co do not show any company logos
// if(Ninja::isHosted() && count(explode('.', request()->getHost())) == 2){
// $company = null;
// }else
$company = false; $company = false;
$account = false;
if($request->has('company_key')){ if($request->has('company_key')){
MultiDB::findAndSetDbByCompanyKey($request->input('company_key')); MultiDB::findAndSetDbByCompanyKey($request->input('company_key'));
@ -65,13 +62,16 @@ class ContactLoginController extends Controller
} }
elseif (Ninja::isSelfHost()) { elseif (Ninja::isSelfHost()) {
$company = Account::first()->default_company; $account = Account::first();
$company = $account->default_company;
} else { } else {
$company = null; $company = null;
} }
$account_id = $request->get('account_id'); if(!$account){
$account = Account::find($account_id); $account_id = $request->get('account_id');
$account = Account::find($account_id);
}
return $this->render('auth.login', ['account' => $account, 'company' => $company]); return $this->render('auth.login', ['account' => $account, 'company' => $company]);