From 8f1a9a2e5d1807ef720186862bb9ef31cc373fde Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 28 Oct 2016 19:37:28 +1100 Subject: [PATCH 1/2] Expense Categories route (#1125) * Expense categories * add dependencies * expense categories * expense categories * expense categories * 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 bd624710a8fb37f09af97b2871b88c0e112f2483 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Fri, 28 Oct 2016 12:01:35 +0300 Subject: [PATCH 2/2] Minor fixes --- app/Console/Commands/CheckData.php | 2 +- app/Http/Controllers/ExpenseCategoryApiController.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php index 779aee817465..d7d9b4ec7a89 100644 --- a/app/Console/Commands/CheckData.php +++ b/app/Console/Commands/CheckData.php @@ -92,7 +92,7 @@ class CheckData extends Command { $count = DB::table('activities') ->where('activity_type_id', '=', 5) ->where('json_backup', '=', '') - ->whereNotIn('id', [634386, 756352, 756353, 756356]) + ->whereNotIn('id', [634386, 756352, 756353, 756356, 820872]) ->count(); if ($count > 0) { diff --git a/app/Http/Controllers/ExpenseCategoryApiController.php b/app/Http/Controllers/ExpenseCategoryApiController.php index f752347355f5..5a18735dee62 100644 --- a/app/Http/Controllers/ExpenseCategoryApiController.php +++ b/app/Http/Controllers/ExpenseCategoryApiController.php @@ -18,6 +18,8 @@ class ExpenseCategoryApiController extends BaseAPIController public function __construct(ExpenseCategoryRepository $categoryRepo, ExpenseCategoryService $categoryService) { + parent::__construct(); + $this->categoryRepo = $categoryRepo; $this->categoryService = $categoryService; }