From 301032c905f1c226f3be2a542a2e2441e4a30bff Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 28 Oct 2016 07:48:34 +1100 Subject: [PATCH 01/10] Expense categories --- app/Http/Controllers/ExpenseApiController.php | 25 ++++++++++++++++--- app/Http/routes.php | 3 ++- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/ExpenseApiController.php b/app/Http/Controllers/ExpenseApiController.php index 5734d577feb7..5c7ee79cd3da 100644 --- a/app/Http/Controllers/ExpenseApiController.php +++ b/app/Http/Controllers/ExpenseApiController.php @@ -1,6 +1,8 @@ expenseRepo = $expenseRepo; $this->expenseService = $expenseService; + $this->categoryRepo = $categoryRepo; } /** @@ -75,8 +79,8 @@ class ExpenseApiController extends BaseAPIController $expense = $this->expenseRepo->save($request->input()); $expense = Expense::scope($expense->public_id) - ->with('client', 'invoice', 'vendor') - ->first(); + ->with('client', 'invoice', 'vendor') + ->first(); return $this->itemResponse($expense); } @@ -146,4 +150,19 @@ class ExpenseApiController extends BaseAPIController } + public function updateCategory(UpdateExpenseCategoryRequest $request) + { + $category = $this->categoryRepo->save($request->input(), $request->entity()); + + return $this->itemResponse($category); + } + + public function addCategory(CreateExpenseCategoryRequest $request) + { + $category = $this->categoryRepo->save($request->input()); + + return $this->itemResponse($category); + + } + } diff --git a/app/Http/routes.php b/app/Http/routes.php index dbb061e0ae29..07a29b090345 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -309,7 +309,8 @@ Route::group(['middleware' => 'api', 'prefix' => 'api/v1'], function() Route::get('dashboard', 'DashboardApiController@index'); Route::resource('documents', 'DocumentAPIController'); Route::resource('vendors', 'VendorApiController'); - Route::resource('expenses', 'ExpenseApiController'); + Route::post('createExpenseCategory', 'ExpenseApiController@addCategory'); + Route::put('updateExpenseCategory/{expense_category_id}', 'ExpenseApiController@updateCategory'); }); // Redirects for legacy links From 06533b2430f83f9e4675ed552e00fd83450f7e19 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 28 Oct 2016 07:50:16 +1100 Subject: [PATCH 02/10] add dependencies --- app/Http/Controllers/ExpenseApiController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Http/Controllers/ExpenseApiController.php b/app/Http/Controllers/ExpenseApiController.php index 5c7ee79cd3da..8ce45cefd439 100644 --- a/app/Http/Controllers/ExpenseApiController.php +++ b/app/Http/Controllers/ExpenseApiController.php @@ -1,6 +1,8 @@ Date: Fri, 28 Oct 2016 08:47:20 +1100 Subject: [PATCH 03/10] expense categories --- app/Http/Controllers/ExpenseApiController.php | 22 +--------- .../ExpenseCategoryApiController.php | 41 +++++++++++++++++++ app/Http/routes.php | 4 +- 3 files changed, 45 insertions(+), 22 deletions(-) create mode 100644 app/Http/Controllers/ExpenseCategoryApiController.php diff --git a/app/Http/Controllers/ExpenseApiController.php b/app/Http/Controllers/ExpenseApiController.php index 8ce45cefd439..465edcc852de 100644 --- a/app/Http/Controllers/ExpenseApiController.php +++ b/app/Http/Controllers/ExpenseApiController.php @@ -1,10 +1,7 @@ expenseRepo = $expenseRepo; $this->expenseService = $expenseService; - $this->categoryRepo = $categoryRepo; } /** @@ -152,19 +147,6 @@ class ExpenseApiController extends BaseAPIController } - public function updateCategory(UpdateExpenseCategoryRequest $request) - { - $category = $this->categoryRepo->save($request->input(), $request->entity()); - return $this->itemResponse($category); - } - - public function addCategory(CreateExpenseCategoryRequest $request) - { - $category = $this->categoryRepo->save($request->input()); - - return $this->itemResponse($category); - - } } diff --git a/app/Http/Controllers/ExpenseCategoryApiController.php b/app/Http/Controllers/ExpenseCategoryApiController.php new file mode 100644 index 000000000000..36b21e5625bf --- /dev/null +++ b/app/Http/Controllers/ExpenseCategoryApiController.php @@ -0,0 +1,41 @@ +categoryRepo = $categoryRepo; + $this->categoryService = $categoryService; + } + + public function updateCategory(UpdateExpenseCategoryRequest $request) + { + $category = $this->categoryRepo->save($request->input(), $request->entity()); + + return $this->itemResponse($category); + } + + public function addCategory(CreateExpenseCategoryRequest $request) + { + $category = $this->categoryRepo->save($request->input()); + + return $this->itemResponse($category); + + } +} diff --git a/app/Http/routes.php b/app/Http/routes.php index 07a29b090345..378b679a0198 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -309,8 +309,8 @@ Route::group(['middleware' => 'api', 'prefix' => 'api/v1'], function() Route::get('dashboard', 'DashboardApiController@index'); Route::resource('documents', 'DocumentAPIController'); Route::resource('vendors', 'VendorApiController'); - Route::post('createExpenseCategory', 'ExpenseApiController@addCategory'); - Route::put('updateExpenseCategory/{expense_category_id}', 'ExpenseApiController@updateCategory'); + Route::post('createExpenseCategory', 'ExpenseCategoryApiController@store'); + Route::put('updateExpenseCategory/{expense_category_id}', 'ExpenseCategoryApiController@update'); }); // Redirects for legacy links From cd98ad43e05e0c3b9b9cbd37e2bacbd82254bfbb Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 28 Oct 2016 08:48:57 +1100 Subject: [PATCH 04/10] expense categories --- app/Http/Controllers/ExpenseCategoryApiController.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Http/Controllers/ExpenseCategoryApiController.php b/app/Http/Controllers/ExpenseCategoryApiController.php index 36b21e5625bf..359fc71a3003 100644 --- a/app/Http/Controllers/ExpenseCategoryApiController.php +++ b/app/Http/Controllers/ExpenseCategoryApiController.php @@ -5,10 +5,8 @@ use Utils; use Input; use Session; use App\Services\ExpenseCategoryService; -use App\Ninja\Repositories\ExpenseCategoryRepository; use App\Http\Requests\CreateExpenseCategoryRequest; use App\Http\Requests\UpdateExpenseCategoryRequest; -use App\Http\Requests\UpdateExpenseCategoryRequest; use App\Ninja\Repositories\ExpenseCategoryRepository; From f647c6c48c9e83e1c002c206e571fe6f9883a842 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 28 Oct 2016 08:49:40 +1100 Subject: [PATCH 05/10] expense categories --- app/Http/Controllers/ExpenseCategoryApiController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/ExpenseCategoryApiController.php b/app/Http/Controllers/ExpenseCategoryApiController.php index 359fc71a3003..f752347355f5 100644 --- a/app/Http/Controllers/ExpenseCategoryApiController.php +++ b/app/Http/Controllers/ExpenseCategoryApiController.php @@ -22,14 +22,14 @@ class ExpenseCategoryApiController extends BaseAPIController $this->categoryService = $categoryService; } - public function updateCategory(UpdateExpenseCategoryRequest $request) + public function update(UpdateExpenseCategoryRequest $request) { $category = $this->categoryRepo->save($request->input(), $request->entity()); return $this->itemResponse($category); } - public function addCategory(CreateExpenseCategoryRequest $request) + public function store(CreateExpenseCategoryRequest $request) { $category = $this->categoryRepo->save($request->input()); From b507254087f1a32c41e0e3e727022d88c7425d47 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 28 Oct 2016 19:36:26 +1100 Subject: [PATCH 06/10] Change expense categories into a resource route --- app/Http/routes.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Http/routes.php b/app/Http/routes.php index 378b679a0198..ced1d376d049 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -309,8 +309,7 @@ Route::group(['middleware' => 'api', 'prefix' => 'api/v1'], function() Route::get('dashboard', 'DashboardApiController@index'); Route::resource('documents', 'DocumentAPIController'); Route::resource('vendors', 'VendorApiController'); - Route::post('createExpenseCategory', 'ExpenseCategoryApiController@store'); - Route::put('updateExpenseCategory/{expense_category_id}', 'ExpenseCategoryApiController@update'); + Route::resource('expense_categories', 'ExpenseCategoryApiController'); }); // Redirects for legacy links From 7a1072f8f2b8f9c464734beff973fdd5b09f1279 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 29 Oct 2016 16:01:25 +1100 Subject: [PATCH 07/10] add expenses, contacts, tasks and is_system to activity transformer --- app/Ninja/Transformers/ActivityTransformer.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Ninja/Transformers/ActivityTransformer.php b/app/Ninja/Transformers/ActivityTransformer.php index 5b25f315988e..892868bd0855 100644 --- a/app/Ninja/Transformers/ActivityTransformer.php +++ b/app/Ninja/Transformers/ActivityTransformer.php @@ -16,7 +16,7 @@ class ActivityTransformer extends EntityTransformer protected $availableIncludes = [ ]; /** - * @param Client $client + * @param Activity $activity * @return array */ public function transform(Activity $activity) @@ -29,7 +29,10 @@ class ActivityTransformer extends EntityTransformer 'invoice_id' => $activity->invoice ? $activity->invoice->public_id : null, 'payment_id' => $activity->payment ? $activity->payment->public_id : null, 'credit_id' => $activity->credit ? $activity->credit->public_id : null, - 'updated_at' => $this->getTimestamp($activity->updated_at) + 'updated_at' => $this->getTimestamp($activity->updated_at), + 'expense_id' => $activity->expense_id ? $activity->expense->public_id : null, + 'is_system' => (bool) $activity->is_system ? $activity->is_system : null, + 'contact_id' => $activity->contact_id ? $activity->contact->public_id : null ]; } } From 06150ce30ab7bc8498f2f8a4a186f9c010d1124c Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 3 Nov 2016 21:36:05 +1100 Subject: [PATCH 08/10] add show() Client --- app/Http/Controllers/ClientApiController.php | 26 ++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/Http/Controllers/ClientApiController.php b/app/Http/Controllers/ClientApiController.php index 918b9c701ef1..4f6ca6521c62 100644 --- a/app/Http/Controllers/ClientApiController.php +++ b/app/Http/Controllers/ClientApiController.php @@ -1,5 +1,6 @@ listResponse($clients); } + /** + * @SWG\Get( + * path="/clients/{client_id}", + * summary="Individual Client", + * tags={"client"}, + * @SWG\Response( + * response=200, + * description="A single client", + * @SWG\Schema(type="object", @SWG\Items(ref="#/definitions/Client")) + * ), + * @SWG\Response( + * response="default", + * description="an ""unexpected"" error" + * ) + * ) + */ + + public function show(ClientRequest $request) + { + return $this->itemResponse($request->entity()); + } + + + + /** * @SWG\Post( * path="/clients", From 88f9cea3bbe27e8b332f9a4ac317606a04c78115 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 3 Nov 2016 21:39:33 +1100 Subject: [PATCH 09/10] Add show() resource route for ClientApiController (#1138) * Expense categories * add dependencies * expense categories * expense categories * expense categories * Change expense categories into a resource route * add expenses, contacts, tasks and is_system to activity transformer * add show() Client --- app/Http/Controllers/ClientApiController.php | 26 ++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/Http/Controllers/ClientApiController.php b/app/Http/Controllers/ClientApiController.php index 918b9c701ef1..4f6ca6521c62 100644 --- a/app/Http/Controllers/ClientApiController.php +++ b/app/Http/Controllers/ClientApiController.php @@ -1,5 +1,6 @@ listResponse($clients); } + /** + * @SWG\Get( + * path="/clients/{client_id}", + * summary="Individual Client", + * tags={"client"}, + * @SWG\Response( + * response=200, + * description="A single client", + * @SWG\Schema(type="object", @SWG\Items(ref="#/definitions/Client")) + * ), + * @SWG\Response( + * response="default", + * description="an ""unexpected"" error" + * ) + * ) + */ + + public function show(ClientRequest $request) + { + return $this->itemResponse($request->entity()); + } + + + + /** * @SWG\Post( * path="/clients", From d466a1bf5a7f80c4acc0007cdc8f8f0dc45a3acc Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 3 Nov 2016 22:39:29 +1100 Subject: [PATCH 10/10] bug fixes --- 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 c6cf454666d8..0db08e555010 100644 --- a/app/Http/Controllers/DashboardApiController.php +++ b/app/Http/Controllers/DashboardApiController.php @@ -23,8 +23,8 @@ class DashboardApiController extends BaseAPIController $dashboardRepo = $this->dashboardRepo; $metrics = $dashboardRepo->totals($accountId, $userId, $viewAll); - $paidToDate = $dashboardRepo->paidToDate($account, $userId, $viewAll); - $averageInvoice = $dashboardRepo->averages($account, $userId, $viewAll); + $paidToDate = $dashboardRepo->paidToDate($user->account, $userId, $viewAll); + $averageInvoice = $dashboardRepo->averages($user->account, $userId, $viewAll); $balances = $dashboardRepo->balances($accountId, $userId, $viewAll); $activities = $dashboardRepo->activities($accountId, $userId, $viewAll); $pastDue = $dashboardRepo->pastDue($accountId, $userId, $viewAll);