Merge pull request 'Updated report view rights against role' (#302) from ranjith-dev into master
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled

Reviewed-on: #302
This commit was merged in pull request #302.
This commit is contained in:
2026-02-04 05:13:00 +00:00

View File

@@ -1125,11 +1125,11 @@ class InvoiceValidationResource extends Resource
// ])
->options(function () {
$userRights = Filament::auth()->user();
$hasBoth = ($userRights->hasRole(['Super Admin', 'Sales Employee', 'Sales Supervisor Hub', 'Sales Manager']) ?? null);
$hasBoth = ($userRights->hasRole(['Super Admin', 'Sales Employee', 'Sales Supervisor Hub', 'Sales Supervisor Hub Upload', 'Sales Manager']) ?? null);
$hasSerial = ($userRights->hasRole(['Sales Supervisor 1', 'Sales Supervisor Inventory', 'Sales Employee Inventory']) ?? null);
$hasSerial = ($userRights->hasRole(['Sales Supervisor 1', 'Sales Supervisor Upload 1']) ?? null); // , 'Sales Supervisor Inventory', 'Sales Supervisor Inventory Upload', 'Sales Employee Inventory'
$hasMaterial = $userRights->hasRole('Sales Supervisor 2') ?? null;
$hasMaterial = ($userRights->hasRole(['Sales Supervisor 2', 'Sales Supervisor Upload 2']) ?? null);
$retRes = [
'Serial' => 'Serial',
@@ -1149,11 +1149,11 @@ class InvoiceValidationResource extends Resource
// ->default('Serial')
->default(function () {
$userRights = Filament::auth()->user();
$hasBoth = ($userRights->hasRole(['Super Admin', 'Sales Employee', 'Sales Supervisor Hub', 'Sales Manager']) ?? null);
$hasBoth = ($userRights->hasRole(['Super Admin', 'Sales Employee', 'Sales Supervisor Hub', 'Sales Supervisor Hub Upload', 'Sales Manager']) ?? null);
$hasSerial = ($userRights->hasRole(['Sales Supervisor 1', 'Sales Supervisor Inventory', 'Sales Employee Inventory']) ?? null);
$hasSerial = ($userRights->hasRole(['Sales Supervisor 1', 'Sales Supervisor Upload 1']) ?? null); // , 'Sales Supervisor Inventory', 'Sales Supervisor Inventory Upload', 'Sales Employee Inventory'
$hasMaterial = $userRights->hasRole('Sales Supervisor 2') ?? null;
$hasMaterial = ($userRights->hasRole(['Sales Supervisor 2', 'Sales Supervisor Upload 2']) ?? null);
if ($hasBoth || $hasSerial) {
return 'Serial';