Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed query bug related to inclusion of contact in activity message

This commit is contained in:
Christopher Di Carlo 2019-05-17 08:27:17 -04:00
parent 97019f22e9
commit 6eb2717d13
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Ninja/Repositories/ActivityRepository.php
View File

@ -71,7 +71,7 @@ class ActivityRepository
->join('accounts', 'accounts.id', '=', 'activities.account_id') ->join('accounts', 'accounts.id', '=', 'activities.account_id')
->join('users', 'users.id', '=', 'activities.user_id') ->join('users', 'users.id', '=', 'activities.user_id')
->join('clients', 'clients.id', '=', 'activities.client_id') ->join('clients', 'clients.id', '=', 'activities.client_id')
->leftJoin('contacts', 'contacts.client_id', '=', 'clients.id') ->leftJoin('contacts', 'contacts.id', '=', 'activities.contact_id')
->leftJoin('invoices', 'invoices.id', '=', 'activities.invoice_id') ->leftJoin('invoices', 'invoices.id', '=', 'activities.invoice_id')
->leftJoin('payments', 'payments.id', '=', 'activities.payment_id') ->leftJoin('payments', 'payments.id', '=', 'activities.payment_id')
->leftJoin('credits', 'credits.id', '=', 'activities.credit_id') ->leftJoin('credits', 'credits.id', '=', 'activities.credit_id')
@ -114,6 +114,7 @@ class ActivityRepository
'expenses.public_notes as expense_public_notes', 'expenses.public_notes as expense_public_notes',
'expenses.public_id as expense_public_id', 'expenses.public_id as expense_public_id',
'tickets.public_id as ticket_public_id' 'tickets.public_id as ticket_public_id'
); )
->orderBy('activities.created_at', 'desc');
} }
} }