Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed sorting expenses by status

Browse Source
This commit is contained in:
Hillel Coren 2016-02-17 15:55:31 +02:00
parent a489c2cab8
commit 611d908112
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Ninja/Repositories/ExpenseRepository.php
View File

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

2
app/Services/ExpenseService.php
View File

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