diff --git a/app/routes.php b/app/routes.php index 985b0a7ab9..0c437b224f 100755 --- a/app/routes.php +++ b/app/routes.php @@ -6,42 +6,48 @@ */ Route::group(array('prefix' => 'api', 'namespace' => 'Controllers\Admin', 'before' => 'admin-auth'), function () { /*---Hardware API---*/ - Route::group(array('prefix' => 'hardware'), function() { + Route::group(['prefix' => 'hardware'], function() { Route::resource('/', 'AssetsController'); - Route::get('list/{status?}', array('as'=>'api.hardware.list', 'uses'=>'AssetsController@getDatatable')); + Route::get('list/{status?}', ['as'=>'api.hardware.list', 'uses'=>'AssetsController@getDatatable']); }); /*---Accessories API---*/ - Route::group(array('prefix'=>'accessories'), function () { + Route::group(['prefix'=>'accessories'], function () { Route::resource('/', 'AccessoriesController'); - Route::get('list', array('as'=>'api.accessories.list', 'uses'=>'AccessoriesController@getDatatable')); - Route::get('{accessoryID}/view', array('as'=>'api.accessories.view', 'uses'=>'AccessoriesController@getDataView')); + Route::get('list', ['as'=>'api.accessories.list', 'uses'=>'AccessoriesController@getDatatable']); + Route::get('{accessoryID}/view', ['as'=>'api.accessories.view', 'uses'=>'AccessoriesController@getDataView']); }); /*---Users API---*/ - Route::group(array('prefix'=>'users'), function() { + Route::group(['prefix'=>'users'], function() { Route::resource('/', 'UsersController'); - Route::get('list/{status?}', array('as'=>'api.users.list', 'uses'=>'UsersController@getDatatable')); + Route::get('list/{status?}', ['as'=>'api.users.list', 'uses'=>'UsersController@getDatatable']); }); /*---Licenses API---*/ - Route::group(array('prefix'=>'licenses'), function() { + Route::group(['prefix'=>'licenses'], function() { Route::resource('/', 'LicensesController'); - Route::get('list', array('as'=>'api.licenses.list', 'uses'=>'LicensesController@getDatatable')); + Route::get('list', ['as'=>'api.licenses.list', 'uses'=>'LicensesController@getDatatable']); }); + /*---Improvements API---*/ + Route::group( [ 'prefix' => 'improvements' ], function () { + + Route::resource( '/', 'ImprovementsController' ); + Route::get( 'list', [ 'as' => 'api.improvements.list', 'uses' => 'ImprovementsController@getDatatable' ] ); + } ); /*---Models API---*/ - Route::group(array('prefix'=>'models'), function() { + Route::group( [ 'prefix' => 'models'], function() { Route::resource('/', 'ModelsController'); - Route::get('list/{status?}', array('as'=>'api.models.list', 'uses'=>'ModelsController@getDatatable')); + Route::get('list/{status?}', ['as'=>'api.models.list', 'uses'=>'ModelsController@getDatatable']); Route::get('{modelId}/check', function ($modelId) { $model = Model::find($modelId); return $model->show_mac_address; }); - Route::get('{modelID}/view', array('as'=>'api.models.view', 'uses'=>'ModelsController@getDataView')); + Route::get('{modelID}/view', ['as'=>'api.models.view', 'uses'=>'ModelsController@getDataView']); }); /*--- Categories API---*/ - Route::group(array('prefix'=>'categories'), function() { + Route::group(['prefix'=>'categories'], function() { Route::resource('/', 'CategoriesController'); - Route::get('list', array('as'=>'api.categories.list', 'uses'=>'CategoriesController@getDatatable')); - Route::get('{categoryID}/view', array('as'=>'api.categories.view', 'uses'=>'CategoriesController@getDataView')); + Route::get('list', ['as'=>'api.categories.list', 'uses'=>'CategoriesController@getDatatable']); + Route::get('{categoryID}/view', ['as'=>'api.categories.view', 'uses'=>'CategoriesController@getDataView']); }); }); @@ -135,117 +141,130 @@ Route::group(array('prefix' => 'admin', 'before' => 'admin-auth', 'namespace' => # Licenses - Route::group(array('prefix' => 'licenses'), function () { + Route::group(['prefix' => 'licenses'], function () { - Route::get('create', array('as' => 'create/licenses', 'uses' => 'LicensesController@getCreate')); + Route::get('create', ['as' => 'create/licenses', 'uses' => 'LicensesController@getCreate']); Route::post('create', 'LicensesController@postCreate'); - Route::get('{licenseId}/edit', array('as' => 'update/license', 'uses' => 'LicensesController@getEdit')); + Route::get('{licenseId}/edit', ['as' => 'update/license', 'uses' => 'LicensesController@getEdit']); Route::post('{licenseId}/edit', 'LicensesController@postEdit'); - Route::get('{licenseId}/clone', array('as' => 'clone/license', 'uses' => 'LicensesController@getClone')); + Route::get('{licenseId}/clone', ['as' => 'clone/license', 'uses' => 'LicensesController@getClone']); Route::post('{licenseId}/clone', 'LicensesController@postCreate'); - Route::get('{licenseId}/delete', array('as' => 'delete/license', 'uses' => 'LicensesController@getDelete')); - Route::get('{licenseId}/checkout', array('as' => 'checkout/license', 'uses' => 'LicensesController@getCheckout')); + Route::get('{licenseId}/delete', ['as' => 'delete/license', 'uses' => 'LicensesController@getDelete']); + Route::get('{licenseId}/checkout', ['as' => 'checkout/license', 'uses' => 'LicensesController@getCheckout']); Route::post('{licenseId}/checkout', 'LicensesController@postCheckout'); - Route::get('{licenseId}/checkin/{backto?}', array('as' => 'checkin/license', 'uses' => 'LicensesController@getCheckin')); + Route::get('{licenseId}/checkin/{backto?}', ['as' => 'checkin/license', 'uses' => 'LicensesController@getCheckin']); Route::post('{licenseId}/checkin/{backto?}', 'LicensesController@postCheckin'); - Route::get('{licenseId}/view', array('as' => 'view/license', 'uses' => 'LicensesController@getView')); - Route::post('{licenseId}/upload', array('as' => 'upload/license', 'uses' => 'LicensesController@postUpload')); - Route::get('{licenseId}/deletefile/{fileId}', array('as' => 'delete/licensefile', 'uses' => 'LicensesController@getDeleteFile')); - Route::get('{licenseId}/showfile/{fileId}', array('as' => 'show/licensefile', 'uses' => 'LicensesController@displayFile')); - Route::get('/', array('as' => 'licenses', 'uses' => 'LicensesController@getIndex')); + Route::get('{licenseId}/view', ['as' => 'view/license', 'uses' => 'LicensesController@getView']); + Route::post('{licenseId}/upload', ['as' => 'upload/license', 'uses' => 'LicensesController@postUpload']); + Route::get('{licenseId}/deletefile/{fileId}', ['as' => 'delete/licensefile', 'uses' => 'LicensesController@getDeleteFile']); + Route::get('{licenseId}/showfile/{fileId}', ['as' => 'show/licensefile', 'uses' => 'LicensesController@displayFile']); + Route::get('/', ['as' => 'licenses', 'uses' => 'LicensesController@getIndex']); }); - # Accessories - Route::group(array('prefix' => 'accessories'), function () { + # Improvements + Route::group( [ 'prefix' => 'improvements' ], function () { - Route::get('create', array('as' => 'create/accessory', 'uses' => 'AccessoriesController@getCreate')); + Route::get( 'create/{assetId?}', [ 'as' => 'create/improvements', 'uses' => 'ImprovementsController@getCreate' ] ); + Route::post( 'create/{assetId?}', 'ImprovementsController@postCreate' ); + Route::get( '/', [ 'as' => 'improvements', 'uses' => 'ImprovementsController@getIndex' ] ); + Route::get( '{improvementId}/edit', + [ 'as' => 'update/improvement', 'uses' => 'ImprovementsController@getEdit' ] ); + Route::post( '{improvementId}/edit', 'ImprovementsController@postEdit' ); + Route::get('{improvementId}/delete', array('as' => 'delete/improvement', 'uses' => 'ImprovementsController@getDelete')); + Route::get('{improvementId}/view', array('as' => 'view/improvement', 'uses' => 'ImprovementsController@getView')); + } ); + + # Accessories + Route::group( [ 'prefix' => 'accessories' ], function () { + + Route::get('create', ['as' => 'create/accessory', 'uses' => 'AccessoriesController@getCreate']); Route::post('create', 'AccessoriesController@postCreate'); - Route::get('{accessoryID}/edit', array('as' => 'update/accessory', 'uses' => 'AccessoriesController@getEdit')); + Route::get('{accessoryID}/edit', ['as' => 'update/accessory', 'uses' => 'AccessoriesController@getEdit']); Route::post('{accessoryID}/edit', 'AccessoriesController@postEdit'); - Route::get('{accessoryID}/delete', array('as' => 'delete/accessory', 'uses' => 'AccessoriesController@getDelete')); - Route::get('{accessoryID}/view', array('as' => 'view/accessory', 'uses' => 'AccessoriesController@getView')); - Route::get('{accessoryID}/checkout', array('as' => 'checkout/accessory', 'uses' => 'AccessoriesController@getCheckout')); + Route::get('{accessoryID}/delete', ['as' => 'delete/accessory', 'uses' => 'AccessoriesController@getDelete']); + Route::get('{accessoryID}/view', ['as' => 'view/accessory', 'uses' => 'AccessoriesController@getView']); + Route::get('{accessoryID}/checkout', ['as' => 'checkout/accessory', 'uses' => 'AccessoriesController@getCheckout']); Route::post('{accessoryID}/checkout', 'AccessoriesController@postCheckout'); - Route::get('{accessoryID}/checkin/{backto?}', array('as' => 'checkin/accessory', 'uses' => 'AccessoriesController@getCheckin')); + Route::get('{accessoryID}/checkin/{backto?}', ['as' => 'checkin/accessory', 'uses' => 'AccessoriesController@getCheckin']); Route::post('{accessoryID}/checkin/{backto?}', 'AccessoriesController@postCheckin'); - Route::get('/', array('as' => 'accessories', 'uses' => 'AccessoriesController@getIndex')); + Route::get('/', ['as' => 'accessories', 'uses' => 'AccessoriesController@getIndex']); }); # Admin Settings Routes (for categories, maufactureres, etc) - Route::group(array('prefix' => 'settings'), function () { + Route::group(['prefix' => 'settings'], function () { # Settings - Route::group(array('prefix' => 'app'), function () { - Route::get('/', array('as' => 'app', 'uses' => 'SettingsController@getIndex')); - Route::get('edit', array('as' => 'edit/settings', 'uses' => 'SettingsController@getEdit')); + Route::group(['prefix' => 'app'], function () { + Route::get('/', ['as' => 'app', 'uses' => 'SettingsController@getIndex']); + Route::get('edit', ['as' => 'edit/settings', 'uses' => 'SettingsController@getEdit']); Route::post('edit', 'SettingsController@postEdit'); }); # Manufacturers - Route::group(array('prefix' => 'manufacturers'), function () { - Route::get('/', array('as' => 'manufacturers', 'uses' => 'ManufacturersController@getIndex')); - Route::get('create', array('as' => 'create/manufacturer', 'uses' => 'ManufacturersController@getCreate')); + Route::group(['prefix' => 'manufacturers'], function () { + Route::get('/', ['as' => 'manufacturers', 'uses' => 'ManufacturersController@getIndex']); + Route::get('create', ['as' => 'create/manufacturer', 'uses' => 'ManufacturersController@getCreate']); Route::post('create', 'ManufacturersController@postCreate'); - Route::get('{manufacturerId}/edit', array('as' => 'update/manufacturer', 'uses' => 'ManufacturersController@getEdit')); + Route::get('{manufacturerId}/edit', ['as' => 'update/manufacturer', 'uses' => 'ManufacturersController@getEdit']); Route::post('{manufacturerId}/edit', 'ManufacturersController@postEdit'); - Route::get('{manufacturerId}/delete', array('as' => 'delete/manufacturer', 'uses' => 'ManufacturersController@getDelete')); - Route::get('{manufacturerId}/view', array('as' => 'view/manufacturer', 'uses' => 'ManufacturersController@getView')); + Route::get('{manufacturerId}/delete', ['as' => 'delete/manufacturer', 'uses' => 'ManufacturersController@getDelete']); + Route::get('{manufacturerId}/view', ['as' => 'view/manufacturer', 'uses' => 'ManufacturersController@getView']); }); # Suppliers - Route::group(array('prefix' => 'suppliers'), function () { - Route::get('/', array('as' => 'suppliers', 'uses' => 'SuppliersController@getIndex')); - Route::get('create', array('as' => 'create/supplier', 'uses' => 'SuppliersController@getCreate')); + Route::group(['prefix' => 'suppliers'], function () { + Route::get('/', ['as' => 'suppliers', 'uses' => 'SuppliersController@getIndex']); + Route::get('create', ['as' => 'create/supplier', 'uses' => 'SuppliersController@getCreate']); Route::post('create', 'SuppliersController@postCreate'); - Route::get('{supplierId}/edit', array('as' => 'update/supplier', 'uses' => 'SuppliersController@getEdit')); + Route::get('{supplierId}/edit', ['as' => 'update/supplier', 'uses' => 'SuppliersController@getEdit']); Route::post('{supplierId}/edit', 'SuppliersController@postEdit'); - Route::get('{supplierId}/delete', array('as' => 'delete/supplier', 'uses' => 'SuppliersController@getDelete')); - Route::get('{supplierId}/view', array('as' => 'view/supplier', 'uses' => 'SuppliersController@getView')); + Route::get('{supplierId}/delete', ['as' => 'delete/supplier', 'uses' => 'SuppliersController@getDelete']); + Route::get('{supplierId}/view', ['as' => 'view/supplier', 'uses' => 'SuppliersController@getView']); }); # Categories - Route::group(array('prefix' => 'categories'), function () { - Route::get('create', array('as' => 'create/category', 'uses' => 'CategoriesController@getCreate')); + Route::group(['prefix' => 'categories'], function () { + Route::get('create', ['as' => 'create/category', 'uses' => 'CategoriesController@getCreate']); Route::post('create', 'CategoriesController@postCreate'); - Route::get('{categoryId}/edit', array('as' => 'update/category', 'uses' => 'CategoriesController@getEdit')); + Route::get('{categoryId}/edit', ['as' => 'update/category', 'uses' => 'CategoriesController@getEdit']); Route::post('{categoryId}/edit', 'CategoriesController@postEdit'); - Route::get('{categoryId}/delete', array('as' => 'delete/category', 'uses' => 'CategoriesController@getDelete')); - Route::get('{categoryId}/view', array('as' => 'view/category', 'uses' => 'CategoriesController@getView')); - Route::get('/', array('as' => 'categories', 'uses' => 'CategoriesController@getIndex')); + Route::get('{categoryId}/delete', ['as' => 'delete/category', 'uses' => 'CategoriesController@getDelete']); + Route::get('{categoryId}/view', ['as' => 'view/category', 'uses' => 'CategoriesController@getView']); + Route::get('/', ['as' => 'categories', 'uses' => 'CategoriesController@getIndex']); }); # Depreciations - Route::group(array('prefix' => 'depreciations'), function () { - Route::get('/', array('as' => 'depreciations', 'uses' => 'DepreciationsController@getIndex')); - Route::get('create', array('as' => 'create/depreciations', 'uses' => 'DepreciationsController@getCreate')); + Route::group(['prefix' => 'depreciations'], function () { + Route::get('/', ['as' => 'depreciations', 'uses' => 'DepreciationsController@getIndex']); + Route::get('create', ['as' => 'create/depreciations', 'uses' => 'DepreciationsController@getCreate']); Route::post('create', 'DepreciationsController@postCreate'); - Route::get('{depreciationId}/edit', array('as' => 'update/depreciations', 'uses' => 'DepreciationsController@getEdit')); + Route::get('{depreciationId}/edit', ['as' => 'update/depreciations', 'uses' => 'DepreciationsController@getEdit']); Route::post('{depreciationId}/edit', 'DepreciationsController@postEdit'); - Route::get('{depreciationId}/delete', array('as' => 'delete/depreciations', 'uses' => 'DepreciationsController@getDelete')); + Route::get('{depreciationId}/delete', ['as' => 'delete/depreciations', 'uses' => 'DepreciationsController@getDelete']); }); # Locations - Route::group(array('prefix' => 'locations'), function () { - Route::get('/', array('as' => 'locations', 'uses' => 'LocationsController@getIndex')); - Route::get('create', array('as' => 'create/location', 'uses' => 'LocationsController@getCreate')); + Route::group(['prefix' => 'locations'], function () { + Route::get('/', ['as' => 'locations', 'uses' => 'LocationsController@getIndex']); + Route::get('create', ['as' => 'create/location', 'uses' => 'LocationsController@getCreate']); Route::post('create', 'LocationsController@postCreate'); - Route::get('{locationId}/edit', array('as' => 'update/location', 'uses' => 'LocationsController@getEdit')); + Route::get('{locationId}/edit', ['as' => 'update/location', 'uses' => 'LocationsController@getEdit']); Route::post('{locationId}/edit', 'LocationsController@postEdit'); - Route::get('{locationId}/delete', array('as' => 'delete/location', 'uses' => 'LocationsController@getDelete')); + Route::get('{locationId}/delete', ['as' => 'delete/location', 'uses' => 'LocationsController@getDelete']); }); # Status Labels - Route::group(array('prefix' => 'statuslabels'), function () { - Route::get('/', array('as' => 'statuslabels', 'uses' => 'StatuslabelsController@getIndex')); - Route::get('create', array('as' => 'create/statuslabel', 'uses' => 'StatuslabelsController@getCreate')); + Route::group(['prefix' => 'statuslabels'], function () { + Route::get('/', ['as' => 'statuslabels', 'uses' => 'StatuslabelsController@getIndex']); + Route::get('create', ['as' => 'create/statuslabel', 'uses' => 'StatuslabelsController@getCreate']); Route::post('create', 'StatuslabelsController@postCreate'); - Route::get('{statuslabelId}/edit', array('as' => 'update/statuslabel', 'uses' => 'StatuslabelsController@getEdit')); + Route::get('{statuslabelId}/edit', ['as' => 'update/statuslabel', 'uses' => 'StatuslabelsController@getEdit']); Route::post('{statuslabelId}/edit', 'StatuslabelsController@postEdit'); - Route::get('{statuslabelId}/delete', array('as' => 'delete/statuslabel', 'uses' => 'StatuslabelsController@getDelete')); + Route::get('{statuslabelId}/delete', ['as' => 'delete/statuslabel', 'uses' => 'StatuslabelsController@getDelete']); }); @@ -254,38 +273,38 @@ Route::group(array('prefix' => 'admin', 'before' => 'admin-auth', 'namespace' => # User Management - Route::group(array('prefix' => 'users'), function () { - - Route::get('create', array('as' => 'create/user', 'uses' => 'UsersController@getCreate')); + Route::group(['prefix' => 'users'], function () { + + Route::get('create', ['as' => 'create/user', 'uses' => 'UsersController@getCreate']); Route::post('create', 'UsersController@postCreate'); - Route::get('import', array('as' => 'import/user', 'uses' => 'UsersController@getImport')); + Route::get('import', ['as' => 'import/user', 'uses' => 'UsersController@getImport']); Route::post('import', 'UsersController@postImport'); - Route::get('{userId}/edit', array('as' => 'update/user', 'uses' => 'UsersController@getEdit')); + Route::get('{userId}/edit', ['as' => 'update/user', 'uses' => 'UsersController@getEdit']); Route::post('{userId}/edit', 'UsersController@postEdit'); - Route::get('{userId}/clone', array('as' => 'clone/user', 'uses' => 'UsersController@getClone')); + Route::get('{userId}/clone', ['as' => 'clone/user', 'uses' => 'UsersController@getClone']); Route::post('{userId}/clone', 'UsersController@postCreate'); - Route::get('{userId}/delete', array('as' => 'delete/user', 'uses' => 'UsersController@getDelete')); - Route::get('{userId}/restore', array('as' => 'restore/user', 'uses' => 'UsersController@getRestore')); - Route::get('{userId}/view', array('as' => 'view/user', 'uses' => 'UsersController@getView')); - Route::get('{userId}/unsuspend', array('as' => 'unsuspend/user', 'uses' => 'UsersController@getUnsuspend')); - Route::get('/', array('as' => 'users', 'uses' => 'UsersController@getIndex')); - + Route::get('{userId}/delete', ['as' => 'delete/user', 'uses' => 'UsersController@getDelete']); + Route::get('{userId}/restore', ['as' => 'restore/user', 'uses' => 'UsersController@getRestore']); + Route::get('{userId}/view', ['as' => 'view/user', 'uses' => 'UsersController@getView']); + Route::get('{userId}/unsuspend', ['as' => 'unsuspend/user', 'uses' => 'UsersController@getUnsuspend']); + Route::get('/', ['as' => 'users', 'uses' => 'UsersController@getIndex']); + }); # Group Management - Route::group(array('prefix' => 'groups'), function () { - Route::get('/', array('as' => 'groups', 'uses' => 'GroupsController@getIndex')); - Route::get('create', array('as' => 'create/group', 'uses' => 'GroupsController@getCreate')); + Route::group(['prefix' => 'groups'], function () { + Route::get('/', ['as' => 'groups', 'uses' => 'GroupsController@getIndex']); + Route::get('create', ['as' => 'create/group', 'uses' => 'GroupsController@getCreate']); Route::post('create', 'GroupsController@postCreate'); - Route::get('{groupId}/edit', array('as' => 'update/group', 'uses' => 'GroupsController@getEdit')); + Route::get('{groupId}/edit', ['as' => 'update/group', 'uses' => 'GroupsController@getEdit']); Route::post('{groupId}/edit', 'GroupsController@postEdit'); - Route::get('{groupId}/delete', array('as' => 'delete/group', 'uses' => 'GroupsController@getDelete')); - Route::get('{groupId}/restore', array('as' => 'restore/group', 'uses' => 'GroupsController@getRestore')); - Route::get('{groupId}/view', array('as' => 'view/group', 'uses' => 'GroupsController@getView')); + Route::get('{groupId}/delete', ['as' => 'delete/group', 'uses' => 'GroupsController@getDelete']); + Route::get('{groupId}/restore', ['as' => 'restore/group', 'uses' => 'GroupsController@getRestore']); + Route::get('{groupId}/view', ['as' => 'view/group', 'uses' => 'GroupsController@getView']); }); # Dashboard - Route::get('/', array('as' => 'admin', 'uses' => 'DashboardController@getIndex')); + Route::get('/', ['as' => 'admin', 'uses' => 'DashboardController@getIndex']); }); @@ -387,7 +406,7 @@ Route::group(array('before' => 'reporting-auth', 'namespace' => 'Controllers\Adm Route::get('reports/custom', array('as' => 'reports/custom', 'uses' => 'ReportsController@getCustomReport')); Route::post('reports/custom', 'ReportsController@postCustom'); - + Route::get('reports/activity', array('as' => 'reports/activity', 'uses' => 'ReportsController@getActivityReport')); });