From 30a281110f9503a47ceffeede472305daa24c48e Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 31 May 2016 15:01:43 +1000 Subject: [PATCH 01/12] Logging Document uploads --- app/Http/Controllers/DocumentAPIController.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Http/Controllers/DocumentAPIController.php b/app/Http/Controllers/DocumentAPIController.php index e4ca7c7fb5de..a709bd7a4689 100644 --- a/app/Http/Controllers/DocumentAPIController.php +++ b/app/Http/Controllers/DocumentAPIController.php @@ -5,6 +5,7 @@ use App\Models\Document; use App\Ninja\Repositories\DocumentRepository; use App\Http\Requests\DocumentRequest; use App\Http\Requests\CreateDocumentRequest; +use Illuminate\Support\Facades\Log; class DocumentAPIController extends BaseAPIController { @@ -33,6 +34,8 @@ class DocumentAPIController extends BaseAPIController public function store(CreateDocumentRequest $request) { + Log::info($request); + $document = $this->documentRepo->upload($request->file); return $this->itemResponse($document); From b7c99335fdbff95961ac215a33a377eedcd47b48 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 31 May 2016 19:54:57 +1000 Subject: [PATCH 02/12] testing --- app/Http/Controllers/DashboardApiController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/DashboardApiController.php b/app/Http/Controllers/DashboardApiController.php index e7e96a5ad91c..36d2ea904566 100644 --- a/app/Http/Controllers/DashboardApiController.php +++ b/app/Http/Controllers/DashboardApiController.php @@ -2,6 +2,7 @@ use Auth; use DB; +use Illuminate\Support\Facades\Log; use View; use App\Models\Activity; @@ -163,7 +164,8 @@ class DashboardApiController extends BaseAPIController } } - + Log::info($paidToDate); + $data = [ 'id' => 1, 'paidToDate' => $paidToDate[0]->value ? $paidToDate[0]->value : 0, From 0659ce55ac5ea0d003e6c13ccf3e3d7ce6f4340f Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 31 May 2016 19:58:01 +1000 Subject: [PATCH 03/12] testing --- app/Http/Controllers/DashboardApiController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/DashboardApiController.php b/app/Http/Controllers/DashboardApiController.php index 36d2ea904566..d4535b2b018b 100644 --- a/app/Http/Controllers/DashboardApiController.php +++ b/app/Http/Controllers/DashboardApiController.php @@ -165,7 +165,8 @@ class DashboardApiController extends BaseAPIController } Log::info($paidToDate); - + + /* $data = [ 'id' => 1, 'paidToDate' => $paidToDate[0]->value ? $paidToDate[0]->value : 0, @@ -177,7 +178,7 @@ class DashboardApiController extends BaseAPIController 'invoicesSent' => $metrics ? $metrics->invoices_sent : 0, 'activeClients' => $metrics ? $metrics->active_clients : 0, ]; - + */ return $this->response($data); From 33a3ce2f39e645c4d86512385176235d7ddd8a9e Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 31 May 2016 19:59:04 +1000 Subject: [PATCH 04/12] testing --- app/Http/Controllers/DashboardApiController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/DashboardApiController.php b/app/Http/Controllers/DashboardApiController.php index d4535b2b018b..64b107671894 100644 --- a/app/Http/Controllers/DashboardApiController.php +++ b/app/Http/Controllers/DashboardApiController.php @@ -165,7 +165,9 @@ class DashboardApiController extends BaseAPIController } Log::info($paidToDate); - + Log::info($balances); + Log::info($averageInvoice); + Log::info($metrics); /* $data = [ 'id' => 1, From 5422f182c2c5c7d55328a2b734d7d1beb98be29f Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 31 May 2016 20:00:23 +1000 Subject: [PATCH 05/12] testing --- app/Http/Controllers/DashboardApiController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/DashboardApiController.php b/app/Http/Controllers/DashboardApiController.php index 64b107671894..0761bb4cbffc 100644 --- a/app/Http/Controllers/DashboardApiController.php +++ b/app/Http/Controllers/DashboardApiController.php @@ -10,7 +10,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 From 47d31b24fda2cbfd27aba2b6dec05a4058bce4a5 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 31 May 2016 20:02:41 +1000 Subject: [PATCH 06/12] testing --- app/Http/Controllers/DashboardApiController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/DashboardApiController.php b/app/Http/Controllers/DashboardApiController.php index 0761bb4cbffc..e0158808a908 100644 --- a/app/Http/Controllers/DashboardApiController.php +++ b/app/Http/Controllers/DashboardApiController.php @@ -168,7 +168,7 @@ class DashboardApiController extends BaseAPIController Log::info($balances); Log::info($averageInvoice); Log::info($metrics); - /* + $data = [ 'id' => 1, 'paidToDate' => $paidToDate[0]->value ? $paidToDate[0]->value : 0, @@ -180,7 +180,7 @@ class DashboardApiController extends BaseAPIController 'invoicesSent' => $metrics ? $metrics->invoices_sent : 0, 'activeClients' => $metrics ? $metrics->active_clients : 0, ]; - */ + return $this->response($data); From 3a98f6ffdc2bb03f1acdd964cbb69ebaefd940a3 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 31 May 2016 20:03:52 +1000 Subject: [PATCH 07/12] bug fixes on API Dashboard --- app/Http/Controllers/DashboardApiController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/DashboardApiController.php b/app/Http/Controllers/DashboardApiController.php index e0158808a908..6bcc2e9c51ea 100644 --- a/app/Http/Controllers/DashboardApiController.php +++ b/app/Http/Controllers/DashboardApiController.php @@ -158,7 +158,7 @@ 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; } } @@ -180,7 +180,7 @@ class DashboardApiController extends BaseAPIController 'invoicesSent' => $metrics ? $metrics->invoices_sent : 0, 'activeClients' => $metrics ? $metrics->active_clients : 0, ]; - + return $this->response($data); From fc0d9f13a8d29caa8e334697427d56f6b10d547a Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 31 May 2016 20:04:30 +1000 Subject: [PATCH 08/12] bug fixes --- app/Http/Controllers/DashboardApiController.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/Http/Controllers/DashboardApiController.php b/app/Http/Controllers/DashboardApiController.php index 6bcc2e9c51ea..85d24ad7b329 100644 --- a/app/Http/Controllers/DashboardApiController.php +++ b/app/Http/Controllers/DashboardApiController.php @@ -163,12 +163,7 @@ class DashboardApiController extends BaseAPIController } } } - - Log::info($paidToDate); - Log::info($balances); - Log::info($averageInvoice); - Log::info($metrics); - + $data = [ 'id' => 1, 'paidToDate' => $paidToDate[0]->value ? $paidToDate[0]->value : 0, From 671b3ba02a2d2cbd4aefe19d3826751684939dc0 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 1 Jun 2016 20:15:31 +1000 Subject: [PATCH 09/12] test --- app/Http/Controllers/DocumentAPIController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Http/Controllers/DocumentAPIController.php b/app/Http/Controllers/DocumentAPIController.php index 1845615cad0f..91ec1a87a165 100644 --- a/app/Http/Controllers/DocumentAPIController.php +++ b/app/Http/Controllers/DocumentAPIController.php @@ -34,6 +34,8 @@ class DocumentAPIController extends BaseAPIController public function store(CreateDocumentRequest $request) { + Log::info($request); + $document = $this->documentRepo->upload($request->all()); return $this->itemResponse($document); From 707334375659c4fcb0a4b5d8963a56008e359291 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 1 Jun 2016 21:35:53 +1000 Subject: [PATCH 10/12] Update DocumentTransformer.php --- app/Ninja/Transformers/DocumentTransformer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Ninja/Transformers/DocumentTransformer.php b/app/Ninja/Transformers/DocumentTransformer.php index 4cbfa0619193..95e4b281bec4 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($account->updated_at), ]); } -} \ No newline at end of file +} From 8b781746fea58b550a1c6f3c41f68ce2605f007d Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 1 Jun 2016 21:36:27 +1000 Subject: [PATCH 11/12] Update DocumentTransformer.php --- app/Ninja/Transformers/DocumentTransformer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Ninja/Transformers/DocumentTransformer.php b/app/Ninja/Transformers/DocumentTransformer.php index 95e4b281bec4..4130bbd6c459 100644 --- a/app/Ninja/Transformers/DocumentTransformer.php +++ b/app/Ninja/Transformers/DocumentTransformer.php @@ -14,7 +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($account->updated_at), + 'updated_at' => $this->getTimestamp($document->updated_at), ]); } } From 86a2dec504262d69ffa89d6b1e8add58432b7ebf Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 1 Jun 2016 21:38:35 +1000 Subject: [PATCH 12/12] Bug Fixes --- app/Http/Controllers/DashboardApiController.php | 1 - app/Http/Controllers/DocumentAPIController.php | 2 -- 2 files changed, 3 deletions(-) diff --git a/app/Http/Controllers/DashboardApiController.php b/app/Http/Controllers/DashboardApiController.php index 85d24ad7b329..6d69c53f2a01 100644 --- a/app/Http/Controllers/DashboardApiController.php +++ b/app/Http/Controllers/DashboardApiController.php @@ -2,7 +2,6 @@ use Auth; use DB; -use Illuminate\Support\Facades\Log; use View; use App\Models\Activity; diff --git a/app/Http/Controllers/DocumentAPIController.php b/app/Http/Controllers/DocumentAPIController.php index 91ec1a87a165..a1eef82c703d 100644 --- a/app/Http/Controllers/DocumentAPIController.php +++ b/app/Http/Controllers/DocumentAPIController.php @@ -5,7 +5,6 @@ use App\Models\Document; use App\Ninja\Repositories\DocumentRepository; use App\Http\Requests\DocumentRequest; use App\Http\Requests\CreateDocumentRequest; -use Illuminate\Support\Facades\Log; class DocumentAPIController extends BaseAPIController { @@ -34,7 +33,6 @@ class DocumentAPIController extends BaseAPIController public function store(CreateDocumentRequest $request) { - Log::info($request); $document = $this->documentRepo->upload($request->all());