From 71d7b3217af346d40799eeceb613395b4c0c40bf Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 1 Nov 2020 21:01:51 +1100 Subject: [PATCH 1/2] Fix for task deleted_at --- app/Traits/GenerateMigrationResources.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php index 343ec871530a..d6419a2cd4c0 100644 --- a/app/Traits/GenerateMigrationResources.php +++ b/app/Traits/GenerateMigrationResources.php @@ -1204,6 +1204,10 @@ trait GenerateMigrationResources foreach ($projects as $project) { + + if(!($project->deleted_at instanceof Carbon)) + $project->deleted_at = Carbon::parse($project->deleted_at); + $transformed[] = [ 'id' => $project->id, 'company_id' => $this->account->id, From 5561b9dc05f300f273ce5d2e93f63ef4494ed695 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 1 Nov 2020 21:05:59 +1100 Subject: [PATCH 2/2] Fix for tasks deleted_at --- app/Traits/GenerateMigrationResources.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php index d6419a2cd4c0..6431a9976a3b 100644 --- a/app/Traits/GenerateMigrationResources.php +++ b/app/Traits/GenerateMigrationResources.php @@ -1168,6 +1168,11 @@ trait GenerateMigrationResources foreach ($tasks as $task) { + + + if(!($task->deleted_at instanceof Carbon)) + $task->deleted_at = Carbon::parse($task->deleted_at); + $transformed[] = [ 'id' => $task->id, 'company_id' => $this->account->id,