From 041590d52006f7ab84aba7741568bfe5b7964868 Mon Sep 17 00:00:00 2001
From: Romain Tripault <romain@melting-media.com>
Date: Thu, 12 Apr 2018 13:31:49 +0200
Subject: [PATCH 1/2] Added tasks custom values in transformer

---
 app/Ninja/Transformers/TaskTransformer.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Ninja/Transformers/TaskTransformer.php b/app/Ninja/Transformers/TaskTransformer.php
index 234295dea73f..ee566398c635 100644
--- a/app/Ninja/Transformers/TaskTransformer.php
+++ b/app/Ninja/Transformers/TaskTransformer.php
@@ -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,
         ]);
     }
 }

From 796e4d82587244c9f425af3ac0bffa25f4c708b0 Mon Sep 17 00:00:00 2001
From: Romain Tripault <romain@melting-media.com>
Date: Thu, 12 Apr 2018 14:29:40 +0200
Subject: [PATCH 2/2] Added a bunch of missing custom values in transformers

---
 app/Ninja/Transformers/ExpenseTransformer.php | 2 ++
 app/Ninja/Transformers/ProjectTransformer.php | 2 ++
 app/Ninja/Transformers/VendorTransformer.php  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/app/Ninja/Transformers/ExpenseTransformer.php b/app/Ninja/Transformers/ExpenseTransformer.php
index 4bc82660670f..e6c85fda82ca 100644
--- a/app/Ninja/Transformers/ExpenseTransformer.php
+++ b/app/Ninja/Transformers/ExpenseTransformer.php
@@ -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,
         ]);
     }
 }
diff --git a/app/Ninja/Transformers/ProjectTransformer.php b/app/Ninja/Transformers/ProjectTransformer.php
index ad049b183727..87040ba8f5fe 100644
--- a/app/Ninja/Transformers/ProjectTransformer.php
+++ b/app/Ninja/Transformers/ProjectTransformer.php
@@ -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,
         ]);
     }
 }
diff --git a/app/Ninja/Transformers/VendorTransformer.php b/app/Ninja/Transformers/VendorTransformer.php
index 8c4a4d38be6a..cef8e97861ac 100644
--- a/app/Ninja/Transformers/VendorTransformer.php
+++ b/app/Ninja/Transformers/VendorTransformer.php
@@ -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,
         ]);
     }
 }