diff --git a/app/Http/Controllers/TaskKanbanController.php b/app/Http/Controllers/TaskKanbanController.php index 09ea0661c9da..bafbe6322933 100644 --- a/app/Http/Controllers/TaskKanbanController.php +++ b/app/Http/Controllers/TaskKanbanController.php @@ -18,9 +18,14 @@ class TaskKanbanController extends BaseController ->with(['project', 'client', 'task_status']) ->whereNull('invoice_id') ->orderBy('task_status_sort_order') + ->orderBy('id') + ->get(); + + $statuses = TaskStatus::scope() + ->orderBy('sort_order') + ->orderBy('id') ->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 10465a0a3326..ae905fb8824e 100644 --- a/resources/views/tasks/kanban.blade.php +++ b/resources/views/tasks/kanban.blade.php @@ -259,8 +259,7 @@ callback(response); }, error: function(error) { - console.log('error'); - console.log(error); + swal("{{ trans('texts.error_refresh_page') }}"); }, }).always(function() { setTimeout(function() { @@ -270,7 +269,6 @@ } self.onStatusDragged = function(dragged) { - console.log('onStatusDragged..'); var status = dragged.item; status.sort_order(dragged.targetIndex);