diff --git a/app/Http/Controllers/ExpenseController.php b/app/Http/Controllers/ExpenseController.php
index 024e3b4..61c8188 100644
--- a/app/Http/Controllers/ExpenseController.php
+++ b/app/Http/Controllers/ExpenseController.php
@@ -15,7 +15,7 @@ class ExpenseController extends Controller
 {
     public function index(Request $request)
     {
-        $isAdmin = Auth::user()->role === User::ROLE_CASIER;
+        $isAdmin = Auth::user()->role == User::ROLE_CASIER;
         $today = Carbon::now();
         $query = Expense::query();
         
@@ -27,6 +27,10 @@ class ExpenseController extends Controller
             $query->where('isIncome', 0)->orderBy('created_at', 'DESC');
         }
 
+        if (Auth::user()->role == User::ROLE_MANAJEMEN) {
+            $query->where('is_paid', Expense::IS_PAID_DRAFT);
+        }
+
         if ($request->q != null) {
             $query->where('name', 'like', '%'.$request->q.'%')
             ->orWhere('description', 'like', '%'.$request->q.'%')
diff --git a/resources/js/Pages/Expense/DetailModal.jsx b/resources/js/Pages/Expense/DetailModal.jsx
index 9c5e4ae..8f64d6a 100644
--- a/resources/js/Pages/Expense/DetailModal.jsx
+++ b/resources/js/Pages/Expense/DetailModal.jsx
@@ -33,7 +33,7 @@ export default function FormModal(props) {
                 job_number: expense?.job_number,
                 date_expense: expense?.date_expense,
                 amount: expense?.amount,
-                isIncome: expense?.isIncome,
+                isIncome: +expense?.isIncome,
                 is_paid: expense?.is_paid,
                 status: expense?.status,
             })