diff --git a/app/Http/Controllers/DashboardApiController.php b/app/Http/Controllers/DashboardApiController.php index e7e96a5ad91c..6d69c53f2a01 100644 --- a/app/Http/Controllers/DashboardApiController.php +++ b/app/Http/Controllers/DashboardApiController.php @@ -9,7 +9,7 @@ class DashboardApiController extends BaseAPIController { public function index() { - $view_all = !Auth::user()->hasPermission('view_all'); + $view_all = Auth::user()->hasPermission('view_all'); $user_id = Auth::user()->id; // total_income, billed_clients, invoice_sent and active_clients @@ -157,13 +157,12 @@ class DashboardApiController extends BaseAPIController $hasQuotes = false; foreach ([$upcoming, $pastDue] as $data) { foreach ($data as $invoice) { - if ($invoice->isType(INVOICE_TYPE_QUOTE)) { + if ($invoice->invoice_type_id == INVOICE_TYPE_QUOTE) { $hasQuotes = true; } } } - - + $data = [ 'id' => 1, 'paidToDate' => $paidToDate[0]->value ? $paidToDate[0]->value : 0, diff --git a/app/Http/Controllers/DocumentAPIController.php b/app/Http/Controllers/DocumentAPIController.php index 194c32e07d81..a1eef82c703d 100644 --- a/app/Http/Controllers/DocumentAPIController.php +++ b/app/Http/Controllers/DocumentAPIController.php @@ -33,6 +33,7 @@ class DocumentAPIController extends BaseAPIController public function store(CreateDocumentRequest $request) { + $document = $this->documentRepo->upload($request->all()); return $this->itemResponse($document); diff --git a/app/Ninja/Transformers/DocumentTransformer.php b/app/Ninja/Transformers/DocumentTransformer.php index 4cbfa0619193..4130bbd6c459 100644 --- a/app/Ninja/Transformers/DocumentTransformer.php +++ b/app/Ninja/Transformers/DocumentTransformer.php @@ -14,6 +14,7 @@ class DocumentTransformer extends EntityTransformer 'type' => $document->type, 'invoice_id' => isset($document->invoice->public_id) ? (int) $document->invoice->public_id : null, 'expense_id' => isset($document->expense->public_id) ? (int) $document->expense->public_id : null, + 'updated_at' => $this->getTimestamp($document->updated_at), ]); } -} \ No newline at end of file +}