deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

User optimisation and code cleanup

Browse Source
This commit is contained in:
Deon George
2024-07-05 22:56:02 +10:00
parent b6b036e06d
commit 326b1dcfc5
12 changed files with 80 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/Policies/AccountPolicy.php
View File

@@ -20,13 +20,7 @@ class AccountPolicy
public function view(User $uo,Account $ao): bool
{
// If this is a service for an account managed by a user.
return ($uo->accounts->pluck('id')->search($ao->id) !== FALSE)
// The user is the wholesaler
OR $uo->isWholesaler()
// The user has this as one of their accounts
OR $uo->accounts->pluck('id')->contains($ao->id);
return $uo->accounts_all->pluck('id')->contains($ao->id) || $uo->isWholesaler();
}
/**

9
app/Models/Policies/InvoicePolicy.php
View File

@@ -19,14 +19,7 @@ class InvoicePolicy
*/
public function view(User $uo,Invoice $io): bool
{
// If this is a service for an account managed by a user.
return ($uo->invoices->pluck('id')->search($io->id) !== FALSE)
// The user is the wholesaler
OR $uo->isWholesaler()
// The user has this as one of their accounts
OR $uo->accounts->pluck('id')->contains($io->account_id);
return $uo->accounts_all->pluck('id')->contains($io->account_id) || $uo->isWholesaler();
}
/**

8
app/Models/Policies/ServicePolicy.php
View File

@@ -20,13 +20,7 @@ class ServicePolicy
public function view(User $uo, Service $so): bool
{
// If this is a service for an account managed by a user.
return ($uo->services->pluck('id')->search($so->id) !== FALSE)
// The user is the wholesaler
OR $uo->isWholesaler()
// The user has this as one of their accounts
OR $uo->accounts->pluck('id')->contains($so->account_id);
return $uo->accounts_all->pluck('id')->contains($so->account_id) || $uo->isWholesaler();
}
/**

11
app/Models/Policies/UserPolicy.php
View File

@@ -15,11 +15,11 @@ class UserPolicy
*
* @param User $uo
* @param string $ability
* @return bool|null
* @return null|bool
*/
public function before(User $uo,string $ability): bool
public function before(User $uo,string $ability): bool|NULL
{
return $uo->isWholesaler() ?: FALSE;
return $uo->isWholesaler() ?: NULL;
}
/**
@@ -44,9 +44,6 @@ class UserPolicy
public function view(User $uo,User $o): bool
{
// If this is a service for an account managed by a user.
return ($uo->id == $o->id)
// The user has this as one of their accounts
OR $uo->accounts->pluck('user')->pluck('id')->unique()->contains($o->id);
return ($uo->id == $o->id) || $uo->accounts_all->pluck('user_id')->contains($o->id) || $uo->isWholesaler();
}
}