commit melhorias compras1
tests / ci (push) Waiting to run

This commit is contained in:
2026-11-21 21:04:40 +02:00
parent 976271f948
commit 12dd6df28a
108 changed files with 4391 additions and 408 deletions
@@ -22,7 +22,7 @@ class PurchaseControlController extends Controller
{
public function index(Request $request): Response
{
$user = $request->user();
$user = $this->staffIdentity($request);
$operational = $user->hasFunctions([PurchasingRole::Admin, PurchasingRole::Procurement, PurchasingRole::Finance]);
$sources = Requisition::query()->where('requester_id', $user->id)->select('id');
$ownAwards = PurchaseAward::query()->whereIn('requisition_id', $sources)->select('id');
@@ -45,9 +45,9 @@ class PurchaseControlController extends Controller
public function propose(Request $request, PurchaseControlPolicyWorkflow $workflow): RedirectResponse
{
abort_unless($request->user()->hasFunctions([PurchasingRole::Admin]), 403);
abort_unless($this->staffIdentity($request)->hasFunctions([PurchasingRole::Admin]), 403);
$data = $request->validate(['previous_id' => 'required|integer|min:0', 'mode' => 'required|in:unissued_award', 'enabled' => 'required|boolean', 'valid_from' => 'required|date_format:Y-m-d', 'valid_until' => 'required|date_format:Y-m-d|after_or_equal:valid_from', 'reason' => 'required|string|min:10|max:4000']);
$workflow->propose($request->user(), $data);
$workflow->propose($this->staffIdentity($request), $data);
return back();
}
@@ -55,7 +55,7 @@ class PurchaseControlController extends Controller
public function policyReview(Request $request, PurchaseControlPolicy $policy, PurchaseControlPolicyWorkflow $workflow): RedirectResponse
{
$data = $request->validate(['decision' => 'required|in:approved,rejected', 'reason' => 'required|string|min:10|max:4000']);
$workflow->review($request->user(), $policy, $data['decision'], $data['reason']);
$workflow->review($this->staffIdentity($request), $policy, $data['decision'], $data['reason']);
return back();
}
@@ -63,7 +63,7 @@ class PurchaseControlController extends Controller
public function cancel(Request $request, PurchaseAward $award, PurchaseRevisionWorkflow $workflow): RedirectResponse
{
$data = $request->validate(['reason' => 'required|string|min:10|max:4000']);
$workflow->request($request->user(), $award, $data['reason']);
$workflow->request($this->staffIdentity($request), $award, $data['reason']);
return back();
}
@@ -71,7 +71,7 @@ class PurchaseControlController extends Controller
public function review(Request $request, AwardCancellation $cancellation, PurchaseRevisionWorkflow $workflow): RedirectResponse
{
$data = $request->validate(['decision' => 'required|in:approved,rejected', 'reason' => 'required|string|min:10|max:4000']);
$workflow->review($request->user(), $cancellation, $data['decision'], $data['reason']);
$workflow->review($this->staffIdentity($request), $cancellation, $data['decision'], $data['reason']);
return back();
}
@@ -79,7 +79,7 @@ class PurchaseControlController extends Controller
public function revise(Request $request, AwardCancellation $cancellation, PurchaseRevisionWorkflow $workflow): RedirectResponse
{
$data = $request->validate(['needed_by' => 'required|date_format:Y-m-d|after_or_equal:today', 'justification' => 'required|string|min:10|max:4000']);
$revision = $workflow->revise($request->user(), $cancellation, $data['needed_by'], $data['justification']);
$revision = $workflow->revise($this->staffIdentity($request), $cancellation, $data['needed_by'], $data['justification']);
return to_route('requisitions.edit', $revision);
}