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

app/Http/Controllers/TaskApiController.php

@@ -1,5 +1,6 @@
 <?php namespace App\Http\Controllers;
 
+use App\Http\Requests\UpdateTaskRequest;
 use Auth;
 use Response;
 use Input;
@@ -84,4 +85,38 @@ class TaskApiController extends BaseAPIController
         return $this->response($data);
     }
 
+
+
+    /**
+     * @SWG\Put(
+     *   path="/task/{task_id}",
+     *   tags={"task"},
+     *   summary="Update a task",
+     *   @SWG\Parameter(
+     *     in="body",
+     *     name="body",
+     *     @SWG\Schema(ref="#/definitions/Task")
+     *   ),
+     *   @SWG\Response(
+     *     response=200,
+     *     description="Update task",
+     *      @SWG\Schema(type="object", @SWG\Items(ref="#/definitions/Task"))
+     *   ),
+     *   @SWG\Response(
+     *     response="default",
+     *     description="an ""unexpected"" error"
+     *   )
+     * )
+     */
+
+    public function update(UpdateTaskRequest $request)
+    {
+        $task = $request->entity();
+
+        $task = $this->taskRepo->save($task->public_id, \Illuminate\Support\Facades\Input::all());
+
+        return $this->itemResponse($task);
+
+    }
+
 }

app/Ninja/Transformers/TaskTransformer.php

@@ -38,10 +38,22 @@ class TaskTransformer extends EntityTransformer
 
     public function transform(Task $task)
     {
+        if($task->invoice)
+            $invoiceId = $task->invoice->public_id;
+        else
+            $invoiceId = null;
+        
         return array_merge($this->getDefaults($task), [
             'id' => (int) $task->public_id,
             'description' => $task->description,
-            'duration' => $task->getDuration()
+            'duration' => $task->getDuration(),
+            'updated_at' => (int) $this->getTimestamp($task->updated_at),
+            'archived_at' => (int) $this->getTimestamp($task->deleted_at),
+            'invoice_id' => $invoiceId,
+            'client_id' => (int) $task->client->public_id,
+            'is_deleted' => (bool) $task->is_deleted,
+            'time_log' => $task->time_log,
+            'is_running' => (bool) $task->is_running,
         ]);
     }
 }