From eb1d5be47c80644ba821f02ffd7c773b7363ae2a Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 21 May 2016 09:17:53 +1000 Subject: [PATCH 1/2] bugs in dashboardapicontroller --- app/Http/Controllers/DashboardApiController.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/DashboardApiController.php b/app/Http/Controllers/DashboardApiController.php index 06393e3ddc3c..dc837adb9a94 100644 --- a/app/Http/Controllers/DashboardApiController.php +++ b/app/Http/Controllers/DashboardApiController.php @@ -161,12 +161,12 @@ class DashboardApiController extends BaseAPIController $data = [ 'id' => 1, - 'paidToDate' => $paidToDate[0]->value, - 'paidToDateCurrency' => $paidToDate[0]->currency_id, - 'balances' => $balances[0]->value, - 'balancesCurrency' => $balances[0]->currency_id, - 'averageInvoice' => $averageInvoice[0]->invoice_avg, - 'averageInvoiceCurrency' => $averageInvoice[0]->currency_id, + 'paidToDate' => $paidToDate[0]->value ? $paidToDate[0]->value : 0, + 'paidToDateCurrency' => $paidToDate[0]->currency_id ? $paidToDate[0]->currency_id : 0, + 'balances' => $balances[0]->value ? $balances[0]->value : 0, + 'balancesCurrency' => $balances[0]->currency_id ? $balances[0]->currency_id : 0, + 'averageInvoice' => $averageInvoice[0]->invoice_avg ? $averageInvoice[0]->invoice_avg : 0, + 'averageInvoiceCurrency' => $averageInvoice[0]->currency_id ? $averageInvoice[0]->currency_id : 0, 'invoicesSent' => $metrics ? $metrics->invoices_sent : 0, 'activeClients' => $metrics ? $metrics->active_clients : 0, ]; From 1e370d2cce3d6848e63b76e0232362adee061953 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 21 May 2016 18:44:53 +1000 Subject: [PATCH 2/2] Implement DocumentAPIController --- .../Controllers/DocumentAPIController.php | 40 +++++++++++++++++++ app/Http/routes.php | 1 + 2 files changed, 41 insertions(+) create mode 100644 app/Http/Controllers/DocumentAPIController.php diff --git a/app/Http/Controllers/DocumentAPIController.php b/app/Http/Controllers/DocumentAPIController.php new file mode 100644 index 000000000000..561a5c174a01 --- /dev/null +++ b/app/Http/Controllers/DocumentAPIController.php @@ -0,0 +1,40 @@ +firstOrFail(); + + return DocumentController::getDownloadResponse($document); + } + + public function store() + { + //stub + } + + public function update() + { + //stub + } + + public function destroy($publicId) + { + //stub + } +} diff --git a/app/Http/routes.php b/app/Http/routes.php index 18d6e8640cfe..e4e06f76617e 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -284,6 +284,7 @@ Route::group(['middleware' => 'api', 'prefix' => 'api/v1'], function() Route::post('add_token', 'AccountApiController@addDeviceToken'); Route::post('update_notifications', 'AccountApiController@updatePushNotifications'); Route::get('dashboard', 'DashboardApiController@index'); + Route::resource('documents', 'DocumentAPIController'); // Vendor Route::resource('vendors', 'VendorApiController');