diff --git a/app/Ninja/Repositories/ExpenseRepository.php b/app/Ninja/Repositories/ExpenseRepository.php index 442df6ef2979..cfd312622ad3 100644 --- a/app/Ninja/Repositories/ExpenseRepository.php +++ b/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', diff --git a/app/Services/ExpenseService.php b/app/Services/ExpenseService.php index 491c0e7957d8..e8f4d591d75d 100644 --- a/app/Services/ExpenseService.php +++ b/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); }