Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 07:27:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:invoiceninja/invoiceninja

Browse Source
This commit is contained in:
Hillel Coren 2020-11-01 16:03:18 +02:00
commit d8a0462e1b
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Traits/GenerateMigrationResources.php
View File

@ -1168,6 +1168,11 @@ trait GenerateMigrationResources
foreach ($tasks as $task) foreach ($tasks as $task)
{ {
if(!($task->deleted_at instanceof Carbon))
$task->deleted_at = Carbon::parse($task->deleted_at);
$transformed[] = [ $transformed[] = [
'id' => $task->id, 'id' => $task->id,
'company_id' => $this->account->id, 'company_id' => $this->account->id,
@ -1204,6 +1209,10 @@ trait GenerateMigrationResources
foreach ($projects as $project) foreach ($projects as $project)
{ {
if(!($project->deleted_at instanceof Carbon))
$project->deleted_at = Carbon::parse($project->deleted_at);
$transformed[] = [ $transformed[] = [
'id' => $project->id, 'id' => $project->id,
'company_id' => $this->account->id, 'company_id' => $this->account->id,