From e619d1d54126098df856f2b2a7b6a80ff4dd96fa Mon Sep 17 00:00:00 2001
From: Joshua Dwire <jdwire@boldcompass.com>
Date: Sun, 26 Sep 2021 21:34:11 -0400
Subject: [PATCH] Bug fix for associating task with an invoice

---
 app/Http/Controllers/TaskController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php
index 171cd4947493..abd3ce69a6c0 100644
--- a/app/Http/Controllers/TaskController.php
+++ b/app/Http/Controllers/TaskController.php
@@ -276,7 +276,7 @@ class TaskController extends BaseController
             Session::flash('message', trans('texts.updated_task_status'));
             return $this->returnBulk($this->entityType, $action, $ids);
         } elseif ($action == 'invoice' || $action == 'add_to_invoice') {
-            $tasks = Task::scope($ids)->with('account', 'client', 'project')->orderBy('project_id', 'id')->get();
+            $tasks = Task::scope($ids)->with('account', 'client', 'project')->orderBy('project_id')->orderBy('id')->get();
             $clientPublicId = false;
             $data = [];