cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-28 08:53:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/34.1-jenkins-vapor' into vapor/development

Browse Source
This commit is contained in:
Dillon Ngo
2024-03-24 20:15:58 +08:00
parent 9f94c2e184 bd7fd92cf0
commit 330103bc79
9 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/CompanyResource.php
-4
View File
@@ -52,10 +52,6 @@ class CompanyResource extends JsonResource
$userInfoType = Auth::user()->type;
}
//cief todo: remove
// Log::error('CompanyResource 1: '. json_encode($userInfoEmail));
// Log::error('CompanyResource 2: '. json_encode($userInfoType));
if(!is_null($userInfoEmail) && !is_null($userInfoType)){
//cief todo: to review following merge conflict
//new UserResource(Auth::user() && Auth::user()->type === RoleTypes::USER ? $this->employees()->where('email', '=', Auth::user()->email)->first() : $this->employees()->orderBy('id', 'DESC')->first()),