shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed default company identification

Browse Source 
caused by https://github.com/laravel/framework/pull/42942
This commit is contained in:
Denis Duliçi
2022-07-14 18:44:56 +03:00
parent 781711be53
commit b3a10b554a
4 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/Http/Middleware/IdentifyCompany.php
View File

@ -26,9 +26,7 @@ class IdentifyCompany
{
$this->request = $request;
$company_id = $this->request->isApi()
? $this->getCompanyIdFromApi()
: $this->getCompanyIdFromWeb();
$company_id = $this->getCompanyId();
if (empty($company_id)) {
abort(500, 'Missing company');
@ -60,6 +58,19 @@ class IdentifyCompany
return $next($this->request);
}
protected function getCompanyId()
{
if ($company_id = company_id()) {
return $company_id;
}
if ($this->request->isApi()) {
return $this->getCompanyIdFromApi();
}
return $this->getCompanyIdFromWeb();
}
protected function getCompanyIdFromWeb()
{
return $this->getCompanyIdFromRoute() ?: ($this->getCompanyIdFromQuery() ?: $this->getCompanyIdFromHeader());
@ -86,4 +97,4 @@ class IdentifyCompany
{
return (int) $this->request->header('X-Company');
}
}
}