admin/GSB-Construction
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: complete GSB construction ERP implementation with dual-mode MR, capitalization cap engine, single PM rule, and system sign-off documentation

Browse Source
This commit is contained in:
GSB Construction Engineering
2026-08-25 17:08:03 +08:00
parent 778f27e0a5
commit d4e2b468ff
114 changed files with 3923 additions and 10031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Modules/ApprovalWorkflow/app/Http/Controllers/ApprovalController.php
View File

@@ -27,23 +27,23 @@ class ApprovalController extends Controller
$isAdmin = $user->user_type === 'admin' || $user->hasRole(['Super Admin', 'admin', 'Main Contractor Admin']);
$isApprovingRole = $isAdmin || $user->hasRole(['Project Manager', 'Main Contractor Admin']);
$isContractorSide = $user->user_type === 'contractor' || $user->hasRole(['Contractor Admin', 'Contractor', 'Subcontractor Staff', 'Site Technical', 'Construction Supervisor']);
$isContractorSide = $user->user_type === 'contractor' || $user->hasRole(['Contractor Admin', 'Contractor', 'Contractor Project Manager', 'Subcontractor Staff', 'Site Technical', 'Construction Supervisor']);
$query = ApprovalChain::query();
// Project Managers are not authorized to review/approve project estimation requests.
if ($user->hasRole('Project Manager') && !$isAdmin) {
$query->where(function ($q) {
$q->whereNull('chain_type')
->orWhere('chain_type', '!=', 'project_estimation');
$q->whereNull('type')
->orWhere('type', '!=', 'project_estimation');
})->where('approvable_type', '!=', Project::class);
}
// Contractor side users are not authorized to review/approve Material Requisitions.
if ($isContractorSide && !$isAdmin) {
$query->where(function ($q) {
$q->whereNull('chain_type')
->orWhere('chain_type', '!=', 'material_requisition');
$q->whereNull('type')
->orWhere('type', '!=', 'material_requisition');
})->where('approvable_type', '!=', \Modules\MaterialLogistics\Models\MaterialRequisition::class);
}
@@ -106,13 +106,13 @@ class ApprovalController extends Controller
{
$user = request()->user();
$isAdmin = $user->user_type === 'admin' || $user->hasRole(['Super Admin', 'admin', 'Main Contractor Admin']);
$isContractorSide = $user->user_type === 'contractor' || $user->hasRole(['Contractor Admin', 'Contractor', 'Subcontractor Staff', 'Site Technical', 'Construction Supervisor']);
$isContractorSide = $user->user_type === 'contractor' || $user->hasRole(['Contractor Admin', 'Contractor', 'Contractor Project Manager', 'Subcontractor Staff', 'Site Technical', 'Construction Supervisor']);
if (($approvalChain->chain_type === 'project_estimation' || $approvalChain->approvable_type === Project::class) && $user->hasRole('Project Manager') && !$isAdmin) {
if (($approvalChain->type === 'project_estimation' || $approvalChain->approvable_type === Project::class) && $user->hasRole('Project Manager') && !$isAdmin) {
return redirect()->route('approvals.index')->with('error', 'Project Managers are not authorized to view or approve project estimation reviews.');
}
if (($approvalChain->chain_type === 'material_requisition' || $approvalChain->approvable_type === \Modules\MaterialLogistics\Models\MaterialRequisition::class) && $isContractorSide && !$isAdmin) {
if (($approvalChain->type === 'material_requisition' || $approvalChain->approvable_type === \Modules\MaterialLogistics\Models\MaterialRequisition::class) && $isContractorSide && !$isAdmin) {
return redirect()->route('approvals.index')->with('error', 'Contractor side roles are not authorized to view or approve Material Requisitions.');
}