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

Merge pull request #2498 from sevannerse/user-works

Browse Source 
User works
This commit is contained in:
Cüneyt Şentürk
2022-07-03 10:21:18 +03:00
committed by GitHub
parent 05cb662ccc c0a8520671
commit b9e50a6ea7
17 changed files with 252 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Traits/Users.php
View File

@@ -110,31 +110,25 @@ trait Users
}
/**
* Checks if the given user has a pending invitation for the
* provided Company.
* Checks if the given user has a pending invitation.
*
* @return bool
*/
public function hasPendingInvitation($company_id = null)
public function hasPendingInvitation()
{
$company_id = $company_id ?: company_id();
$invitation = UserInvitation::where('user_id', $this->id)->where('company_id', $company_id)->first();
$invitation = UserInvitation::where('user_id', $this->id)->first();
return $invitation ? true : false;
}
/**
* Returns if the given user has a pending invitation for the
* provided Company.
* Returns if the given user has a pending invitation.
*
* @return null|UserInvitation
*/
public function getPendingInvitation($company_id = null)
public function getPendingInvitation()
{
$company_id = $company_id ?: company_id();
$invitation = UserInvitation::where('user_id', $this->id)->where('company_id', $company_id)->first();
$invitation = UserInvitation::where('user_id', $this->id)->first();
return $invitation;
}