diff --git a/app/Controllers/Requisition.php b/app/Controllers/Requisition.php index 6f8a40e..7be1761 100644 --- a/app/Controllers/Requisition.php +++ b/app/Controllers/Requisition.php @@ -164,7 +164,7 @@ public function viewUserReportsIndex() if ($account->Username) { // populate results - $results = model(ModelsRequisition::class) + $results = $this->requisitions ->filterByUser($account->Username) ->getRequisitions() ->findAll(); @@ -188,6 +188,7 @@ public function authorizeRequisitionsIndex() { self::$VIEW_PARAMS['requisitions'] = $this->requisitions ->select('requisitions.ID AS ReqID, requisitions.UpdatedAt, requisitions.Amount, requisitions.Reason, CONCAT(Name, " ", Surname) AS Names') + ->where('Status', 'Submitted') ->getRequisitions() ->getOwners() ->paginate(6);