commit5

app/Http/Controllers/PurchaseControlController.php

@@ -10,6 +10,7 @@ use App\Models\PurchaseControlReview;
 use App\Models\PurchaseOrder;
 use App\Models\PurchaseRevision;
 use App\Models\Requisition;
+use App\Services\OrganizationAccess;
 use App\Services\PurchaseControlPolicyWorkflow;
 use App\Services\PurchaseRevisionWorkflow;
 use Illuminate\Http\RedirectResponse;
@@ -22,13 +23,13 @@ class PurchaseControlController extends Controller
     public function index(Request $request): Response
     {
         $user = $request->user();
-        $operational = in_array($user->purchasing_role, [PurchasingRole::Admin, PurchasingRole::Procurement, PurchasingRole::Finance]);
+        $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');
         $cancellations = AwardCancellation::query()->whereIn('purchase_award_id', $ownAwards)->where('status', 'approved')->get(['id', 'purchase_award_id']);
 
         return Inertia::render('purchase-controls/index', [
-            'role' => $user->purchasing_role->value, 'actorId' => $user->id,
+            'role' => $user->purchasing_role->value ?? '', 'permissions' => app(OrganizationAccess::class)->permissions($user), 'actorId' => $user->id,
             'policies' => $operational ? PurchaseControlPolicy::query()->latest('revision')->get() : [],
             'reviews' => $operational ? PurchaseControlReview::query()->get() : [],
             'awards' => $operational ? PurchaseAward::query()->whereNotIn('requisition_id', PurchaseOrder::query()->select('requisition_id'))->latest('id')->get(['id', 'requisition_id', 'status']) : [],
@@ -44,7 +45,7 @@ class PurchaseControlController extends Controller
 
     public function propose(Request $request, PurchaseControlPolicyWorkflow $workflow): RedirectResponse
     {
-        abort_unless($request->user()->purchasing_role === PurchasingRole::Admin, 403);
+        abort_unless($request->user()->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);