@@ -3,8 +3,6 @@ |
||
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | 5 | use App\Customer; |
| 6 | -use Illuminate\Http\Request; |
|
| 7 | - |
|
| 8 | 6 | use App\Http\Requests; |
| 9 | 7 | |
| 10 | 8 | class CustomersController extends Controller |
@@ -2,9 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | -use Illuminate\Http\Request; |
|
| 6 | - |
|
| 7 | -use App\Http\Requests; |
|
| 8 | 5 | use App\Customer as Customer; |
| 9 | 6 | |
| 10 | 7 | class CustomersController extends Controller |
@@ -2,10 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | -use App\User; |
|
| 6 | 5 | use Illuminate\Http\Request; |
| 7 | 6 | use Chrisbjr\ApiGuard\Models\ApiKey; |
| 8 | -use App\Http\Requests; |
|
| 9 | 7 | |
| 10 | 8 | class ApiKeyController extends Controller |
| 11 | 9 | { |
@@ -3,8 +3,6 @@ |
||
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | 5 | use App\Customer; |
| 6 | -use Illuminate\Http\Request; |
|
| 7 | - |
|
| 8 | 6 | use App\Http\Requests; |
| 9 | 7 | |
| 10 | 8 | class CustomersController extends Controller |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use App\Departments; |
| 6 | 6 | use Illuminate\Http\Request; |
| 7 | - |
|
| 8 | 7 | use App\Http\Requests; |
| 9 | 8 | |
| 10 | 9 | /** |
@@ -5,10 +5,7 @@ |
||
| 5 | 5 | use App\Departments; |
| 6 | 6 | use App\User; |
| 7 | 7 | use App\Roles; |
| 8 | - |
|
| 9 | 8 | use Chrisbjr\ApiGuard\Models\ApiKey; |
| 10 | -use Illuminate\Http\Request; |
|
| 11 | - |
|
| 12 | 9 | use App\Http\Requests; |
| 13 | 10 | use Bouncer; |
| 14 | 11 | |
@@ -4,8 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Illuminate\Http\Request; |
| 6 | 6 | |
| 7 | -use App\Http\Requests; |
|
| 8 | - |
|
| 9 | 7 | class DepartmentController extends Controller |
| 10 | 8 | { |
| 11 | 9 | /** |
@@ -67,14 +67,3 @@ |
||
| 67 | 67 | // Roles routes |
| 68 | 68 | Route::get('/roles', 'RolesController@index')->name('roles'); |
| 69 | 69 | <<<<<<< HEAD |
| 70 | -Route::post('/roles/create', 'RolesController@store')->name('roles.store'); |
|
| 71 | -======= |
|
| 72 | -<<<<<<< HEAD |
|
| 73 | -Route::post('/roles/create', 'RolesController@store')->name('roles.store'); |
|
| 74 | -======= |
|
| 75 | -Route::post('/roles', 'RolesController@store')->name('roles.store'); |
|
| 76 | ->>>>>>> master |
|
| 77 | ->>>>>>> development |
|
| 78 | - |
|
| 79 | -Route::get('/roles/edit/{id}', 'RolesController@edit')->name('roles.edit'); |
|
| 80 | -Route::post('/roles/edit/{id}', 'RolesController@update')->name('roles.update'); |
|
@@ -67,14 +67,3 @@ |
||
| 67 | 67 | // Roles routes |
| 68 | 68 | Route::get('/roles', 'RolesController@index')->name('roles'); |
| 69 | 69 | <<<<<<< HEAD |
| 70 | -Route::post('/roles/create', 'RolesController@store')->name('roles.store'); |
|
| 71 | -======= |
|
| 72 | -<<<<<<< HEAD |
|
| 73 | -Route::post('/roles/create', 'RolesController@store')->name('roles.store'); |
|
| 74 | -======= |
|
| 75 | -Route::post('/roles', 'RolesController@store')->name('roles.store'); |
|
| 76 | ->>>>>>> master |
|
| 77 | ->>>>>>> development |
|
| 78 | - |
|
| 79 | -Route::get('/roles/edit/{id}', 'RolesController@edit')->name('roles.edit'); |
|
| 80 | -Route::post('/roles/edit/{id}', 'RolesController@update')->name('roles.update'); |
|