Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 20:22:42 +01:00
Code Issues Releases Activity

Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop

Browse Source
This commit is contained in:
Hillel Coren 2018-04-12 20:06:34 +03:00
commit 0c95b13693
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Ninja/Transformers/ExpenseTransformer.php
View File

@ -84,6 +84,8 @@ class ExpenseTransformer extends EntityTransformer
'client_id' => $this->client ? $this->client->public_id : (isset($expense->client->public_id) ? (int) $expense->client->public_id : null),
'invoice_id' => isset($expense->invoice->public_id) ? (int) $expense->invoice->public_id : null,
'vendor_id' => isset($expense->vendor->public_id) ? (int) $expense->vendor->public_id : null,
'custom_value1' => $expense->custom_value1,
'custom_value2' => $expense->custom_value2,
]);
}
}

2
app/Ninja/Transformers/ProjectTransformer.php
View File

@ -34,6 +34,8 @@ class ProjectTransformer extends EntityTransformer
'due_date' => $project->due_date,
'private_notes' => $project->private_notes,
'budgeted_hours' => (float) $project->budgeted_hours,
'custom_value1' => $project->custom_value1,
'custom_value2' => $project->custom_value2,
]);
}
}

2
app/Ninja/Transformers/TaskTransformer.php
View File

@ -62,6 +62,8 @@ class TaskTransformer extends EntityTransformer
'is_deleted' => (bool) $task->is_deleted,
'time_log' => $task->time_log,
'is_running' => (bool) $task->is_running,
'custom_value1' => $task->custom_value1,
'custom_value2' => $task->custom_value2,
]);
}
}

2
app/Ninja/Transformers/VendorTransformer.php
View File

@ -86,6 +86,8 @@ class VendorTransformer extends EntityTransformer
'vat_number' => $vendor->vat_number,
'id_number' => $vendor->id_number,
'currency_id' => (int) $vendor->currency_id,
'custom_value1' => $vendor->custom_value1,
'custom_value2' => $vendor->custom_value2,
]);
}
}