diff --git a/app/Http/Controllers/TaskKanbanController.php b/app/Http/Controllers/TaskKanbanController.php index f7a25f534e..09ea0661c9 100644 --- a/app/Http/Controllers/TaskKanbanController.php +++ b/app/Http/Controllers/TaskKanbanController.php @@ -14,7 +14,12 @@ class TaskKanbanController extends BaseController */ public function index() { - $tasks = Task::scope()->with(['project', 'client', 'task_status'])->orderBy('task_status_sort_order')->get(); + $tasks = Task::scope() + ->with(['project', 'client', 'task_status']) + ->whereNull('invoice_id') + ->orderBy('task_status_sort_order') + ->get(); + $statuses = TaskStatus::scope()->orderBy('sort_order')->get(); $projects = Project::scope()->get(); $clients = Client::scope()->get(); diff --git a/resources/views/tasks/kanban.blade.php b/resources/views/tasks/kanban.blade.php index 5ee8f33ded..c4874d5c03 100644 --- a/resources/views/tasks/kanban.blade.php +++ b/resources/views/tasks/kanban.blade.php @@ -18,6 +18,7 @@ .kanban-column { background-color: #E9E9E9; padding: 10px; + padding-bottom: 14px; height: 100%; width: 230px; margin-right: 12px; @@ -27,6 +28,10 @@ cursor: pointer; } + .kanban-column-last { + background-color: #F8F8F8; + } + .kanban-column-header { font-weight: bold; padding-bottom: 12px;