Fixed sorting expenses by status

app/Ninja/Repositories/ExpenseRepository.php

@@ -64,6 +64,7 @@ class ExpenseRepository extends BaseRepository
                               ->orWhere('contacts.is_primary', '=', null);
                     })
                     ->select(
+                        DB::raw('COALESCE(expenses.invoice_id, expenses.should_be_invoiced) expense_status_id'),
                         'expenses.account_id',
                         'expenses.amount',
                         'expenses.deleted_at',

app/Services/ExpenseService.php

@@ -106,7 +106,7 @@ class ExpenseService extends BaseService
                 }
             ],
             [
-                'invoice_id',
+                'expense_status_id',
                 function ($model) {
                     return self::getStatusLabel($model->invoice_id, $model->should_be_invoiced);
                 }