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

Fixes for resolving companies and accounts for contact reset

Browse Source
This commit is contained in:
David Bomba 2021-12-02 09:00:40 +11:00
parent 2eeaea61a5
commit 66eb99951e
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Auth/ContactForgotPasswordController.php
View File

@ -60,7 +60,11 @@ class ContactForgotPasswordController extends Controller
{ {
$account_id = $request->has('account_id') ? $request->get('account_id') : 1; $account_id = $request->has('account_id') ? $request->get('account_id') : 1;
$account = Account::find($account_id); $account = Account::find($account_id);
$company = $account->companies->first();
if($request->has('company_key'))
$company = Company::where('company_key', $request->input('company_key'))->first();
else
$company = $account->companies->first();
if(!$account) if(!$account)
$account = Account::first(); $account = Account::first();
@ -93,7 +97,9 @@ class ContactForgotPasswordController extends Controller
// $user = MultiDB::hasContact($request->input('email')); // $user = MultiDB::hasContact($request->input('email'));
$company = Company::where('company_key', $request->input('company_key'))->first(); $company = Company::where('company_key', $request->input('company_key'))->first();
$contact = MultiDB::findContact(['company_id' => $company->id, 'email' => $request->input('email')]); //$contact = MultiDB::findContact(['company_id' => $company->id, 'email' => $request->input('email')]);
nlog(['company_id' => $company->id, 'email' => $request->input('email')]);
$contact = ClientContact::where(['company_id' => $company->id, 'email' => $request->input('email')])->first();
$response = false; $response = false;

4
app/Http/Middleware/SetDomainNameDb.php
View File

@ -49,7 +49,7 @@ class SetDomainNameDb
]; ];
if($company = MultiDB::findAndSetDbByDomain($query)){ if($company = MultiDB::findAndSetDbByDomain($query)){
$request->request->add(['account_id' => $company->account_id]); $request->request->add(['account_id' => $company->account_id, 'company_key' => $company->company_key]);
} }
else else
{ {
@ -71,7 +71,7 @@ class SetDomainNameDb
]; ];
if($company = MultiDB::findAndSetDbByDomain($query)){ if($company = MultiDB::findAndSetDbByDomain($query)){
$request->request->add(['account_id' => $company->account_id]); $request->request->add(['account_id' => $company->account_id, 'company_key' => $company->company_key]);
} }
else else
{ {