@@ -19,9 +19,9 @@ class ProposalOpeningController extends Controller
|
||||
{
|
||||
private function access(Request $request, int $requisitionId): Requisition
|
||||
{
|
||||
abort_unless($request->user()->hasFunctions([PurchasingRole::Admin, PurchasingRole::Procurement, PurchasingRole::Finance, PurchasingRole::DepartmentHead]), 403);
|
||||
abort_unless($this->staffIdentity($request)->hasFunctions([PurchasingRole::Admin, PurchasingRole::Procurement, PurchasingRole::Finance, PurchasingRole::DepartmentHead]), 403);
|
||||
|
||||
return Requisition::query()->visibleTo($request->user())->findOrFail($requisitionId);
|
||||
return Requisition::query()->visibleTo($this->staffIdentity($request))->findOrFail($requisitionId);
|
||||
}
|
||||
|
||||
public function show(Request $request, Requisition $requisition, ProposalOpeningWorkflow $workflow): Response
|
||||
@@ -36,7 +36,7 @@ class ProposalOpeningController extends Controller
|
||||
'requisition' => $requisition->only(['id', 'number', 'justification']), 'proposals' => $proposals, 'basisHash' => $workflow->basis($proposals), 'openings' => $openings,
|
||||
'sourceChanged' => $latest && $workflow->basis($proposals) !== $latest->basis_hash,
|
||||
'latestId' => $latest->id ?? 0,
|
||||
'canRecord' => $request->user()->hasFunctions([PurchasingRole::Procurement]) && $requisition->status === 'approved' && ! PurchaseAward::query()->where('requisition_id', $requisition->id)->exists() && ! app(ConflictGuard::class)->participationBlocked($request->user(), $requisition),
|
||||
'canRecord' => $this->staffIdentity($request)->hasFunctions([PurchasingRole::Procurement]) && $requisition->status === 'approved' && ! PurchaseAward::query()->where('requisition_id', $requisition->id)->exists() && ! app(ConflictGuard::class)->participationBlocked($this->staffIdentity($request), $requisition),
|
||||
])->toResponse($request);
|
||||
$response->headers->set('Cache-Control', 'private, no-store, max-age=0');
|
||||
|
||||
@@ -68,7 +68,7 @@ class ProposalOpeningController extends Controller
|
||||
$data['opened_at'] = $opened->utc()->format('Y-m-d H:i:s');
|
||||
$data['submission_deadline'] = empty($data['submission_deadline']) ? null : CarbonImmutable::createFromFormat('!Y-m-d\TH:i', $data['submission_deadline'], $data['timezone'])->utc()->format('Y-m-d H:i:s');
|
||||
$data['quotation_ids'] = array_map(intval(...), $data['quotation_ids']);
|
||||
$workflow->record($request->user(), $requisition, $data);
|
||||
$workflow->record($this->staffIdentity($request), $requisition, $data);
|
||||
|
||||
return back();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user