From 6eb2717d13ab44711712fcd02a293db06c7e2833 Mon Sep 17 00:00:00 2001 From: Christopher Di Carlo Date: Fri, 17 May 2019 08:27:17 -0400 Subject: [PATCH] Fixed query bug related to inclusion of contact in activity message --- app/Ninja/Repositories/ActivityRepository.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Ninja/Repositories/ActivityRepository.php b/app/Ninja/Repositories/ActivityRepository.php index 3932d6742ac8..b7ad8383eab5 100644 --- a/app/Ninja/Repositories/ActivityRepository.php +++ b/app/Ninja/Repositories/ActivityRepository.php @@ -71,7 +71,7 @@ class ActivityRepository ->join('accounts', 'accounts.id', '=', 'activities.account_id') ->join('users', 'users.id', '=', 'activities.user_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('payments', 'payments.id', '=', 'activities.payment_id') ->leftJoin('credits', 'credits.id', '=', 'activities.credit_id') @@ -114,6 +114,7 @@ class ActivityRepository 'expenses.public_notes as expense_public_notes', 'expenses.public_id as expense_public_id', 'tickets.public_id as ticket_public_id' - ); + ) + ->orderBy('activities.created_at', 'desc'); } }