diff --git a/app/Http/Controllers/TaskStatusController.php b/app/Http/Controllers/TaskStatusController.php index 4751ee9d0d5a..f83851c9d8f8 100644 --- a/app/Http/Controllers/TaskStatusController.php +++ b/app/Http/Controllers/TaskStatusController.php @@ -399,10 +399,10 @@ class TaskStatusController extends BaseController */ public function destroy(DestroyTaskStatusRequest $request, TaskStatus $task_status) { - - $this->task_status_repo->delete($task_status); + + $task_status = $this->task_status_repo->delete($task_status); - return $this->itemResponse($task_status->fresh()); + return $this->itemResponse($task_status); } /** diff --git a/app/Repositories/TaskStatusRepository.php b/app/Repositories/TaskStatusRepository.php index 6d083fb70804..f1b9d826860e 100644 --- a/app/Repositories/TaskStatusRepository.php +++ b/app/Repositories/TaskStatusRepository.php @@ -22,10 +22,10 @@ class TaskStatusRepository extends BaseRepository public function delete($task_status) { - $task_status = TaskStatus::where('company_id', $task_status->company_id) + $ts = TaskStatus::where('company_id', $task_status->company_id) ->first(); - $new_status = $task_status ? $task_status->id : null; + $new_status = $ts ? $ts->id : null; Task::where('status_id', $task_status->id) ->where('company_id', $task_status->company_id) diff --git a/tests/Feature/TaskStatusApiTest.php b/tests/Feature/TaskStatusApiTest.php index c93b28d7e346..09f8e0a418c1 100644 --- a/tests/Feature/TaskStatusApiTest.php +++ b/tests/Feature/TaskStatusApiTest.php @@ -135,7 +135,7 @@ class TaskStatusApiTest extends TestCase ])->delete('/api/v1/task_statuses/'.$this->encodePrimaryKey($this->task_status->id)); $arr = $response->json(); - +nlog($arr); $this->assertTrue($arr['data']['is_deleted']); }