@@ -4,9 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use App\Guitar; |
| 6 | 6 | use App\Transformers\GuitarTransformer; |
| 7 | -use Illuminate\Http\Request; |
|
| 8 | - |
|
| 9 | -use App\Http\Requests; |
|
| 10 | 7 | use App\Http\Controllers\Controller; |
| 11 | 8 | |
| 12 | 9 | class GuitarController extends Controller |
@@ -41,14 +41,14 @@ discard block |
||
| 41 | 41 | public function store($id, Request $request) |
| 42 | 42 | { |
| 43 | 43 | $purchase = Purchase::findOrFail($id); |
| 44 | - if ( ! $purchase->hasArrived() || ! $purchase->isPendingStorage()) { |
|
| 45 | - return response(['purchase' => ['The purchase has not yet arrived or doesn\'t require addition of guitars.']], |
|
| 44 | + if (!$purchase->hasArrived() || !$purchase->isPendingStorage()) { |
|
| 45 | + return response([ 'purchase' => [ 'The purchase has not yet arrived or doesn\'t require addition of guitars.' ] ], |
|
| 46 | 46 | 422); |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | $this->validate($request, [ |
| 50 | - 'rack_id' => 'required|exists:racks,id,make_id,' . $purchase->make_id, |
|
| 51 | - 'model_id' => 'required|exists:models,id,make_id,' . $purchase->make_id, |
|
| 50 | + 'rack_id' => 'required|exists:racks,id,make_id,'.$purchase->make_id, |
|
| 51 | + 'model_id' => 'required|exists:models,id,make_id,'.$purchase->make_id, |
|
| 52 | 52 | 'colour' => 'required|string|max:255', |
| 53 | 53 | 'damaged' => 'boolean', |
| 54 | 54 | 'condition' => 'required_if:damaged,true', |
@@ -57,10 +57,10 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | $rack = Rack::find($request->input('rack_id')); |
| 59 | 59 | if ($rack->used >= $rack->capacity) { |
| 60 | - return response(['rack_id' => ['The selected rack is full.']], 422); |
|
| 60 | + return response([ 'rack_id' => [ 'The selected rack is full.' ] ], 422); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | - $guitar = Guitar::create($request->only(['rack_id', 'model_id', 'colour', 'price']) + [ |
|
| 63 | + $guitar = Guitar::create($request->only([ 'rack_id', 'model_id', 'colour', 'price' ]) + [ |
|
| 64 | 64 | 'make_id' => $purchase->make_id, |
| 65 | 65 | 'purchase_id' => $purchase->id, |
| 66 | 66 | 'damaged' => $request->input('damaged'), |
@@ -82,8 +82,8 @@ discard block |
||
| 82 | 82 | { |
| 83 | 83 | $guitar = Guitar::findOrFail($id); |
| 84 | 84 | $this->validate($request, [ |
| 85 | - 'rack_id' => 'required|exists:racks,id,make_id,' . $guitar->make_id, |
|
| 86 | - 'model_id' => 'required|exists:models,id,make_id,' . $guitar->make_id, |
|
| 85 | + 'rack_id' => 'required|exists:racks,id,make_id,'.$guitar->make_id, |
|
| 86 | + 'model_id' => 'required|exists:models,id,make_id,'.$guitar->make_id, |
|
| 87 | 87 | 'colour' => 'required|string|max:255', |
| 88 | 88 | 'damaged' => 'boolean', |
| 89 | 89 | 'condition' => 'required_if:damaged,true', |
@@ -92,10 +92,10 @@ discard block |
||
| 92 | 92 | |
| 93 | 93 | $rack = Rack::find($request->input('rack_id')); |
| 94 | 94 | if ($rack->used >= $rack->capacity) { |
| 95 | - return response(['rack_id' => ['The selected rack is full.']], 422); |
|
| 95 | + return response([ 'rack_id' => [ 'The selected rack is full.' ] ], 422); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - $guitar = $guitar->update($request->only(['rack_id', 'model_id', 'colour', 'price']) + [ |
|
| 98 | + $guitar = $guitar->update($request->only([ 'rack_id', 'model_id', 'colour', 'price' ]) + [ |
|
| 99 | 99 | 'damaged' => $request->input('damaged'), |
| 100 | 100 | 'condition' => $request->input('damaged') ? $request->input('condition') : null |
| 101 | 101 | ]); |
@@ -1,7 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -Route::group(['middleware' => 'web'], function ($router) { |
|
| 4 | - $router->get('/', function () { |
|
| 3 | +Route::group([ 'middleware' => 'web' ], function($router) { |
|
| 4 | + $router->get('/', function() { |
|
| 5 | 5 | return redirect('/dashboard'); |
| 6 | 6 | }); |
| 7 | 7 | |
@@ -35,11 +35,11 @@ discard block |
||
| 35 | 35 | $router->put('api/notifications/{id}/dismiss', 'API\NotificationController@dismiss'); |
| 36 | 36 | $router->get('api/users/me', 'API\UserController@getCurrentUser'); |
| 37 | 37 | |
| 38 | - $router->resource('makes', 'MakeController', ['except' => ['create', 'show', 'edit', 'update']]); |
|
| 39 | - $router->resource('models', 'ModelController', ['except' => ['create', 'show', 'edit', 'update']]); |
|
| 40 | - $router->resource('purchases', 'PurchaseController', ['except' => ['create', 'edit', 'update']]); |
|
| 38 | + $router->resource('makes', 'MakeController', [ 'except' => [ 'create', 'show', 'edit', 'update' ] ]); |
|
| 39 | + $router->resource('models', 'ModelController', [ 'except' => [ 'create', 'show', 'edit', 'update' ] ]); |
|
| 40 | + $router->resource('purchases', 'PurchaseController', [ 'except' => [ 'create', 'edit', 'update' ] ]); |
|
| 41 | 41 | $router->post('purchases/{id}/guitars', 'GuitarController@store'); |
| 42 | - $router->resource('suppliers', 'SupplierController', ['except' => ['create', 'show', 'edit', 'update']]); |
|
| 43 | - $router->resource('warehouses', 'WarehouseController', ['except' => ['create', 'show', 'edit']]); |
|
| 44 | - $router->resource('guitars', 'GuitarController', ['only' => ['index', 'update', 'delete']]); |
|
| 42 | + $router->resource('suppliers', 'SupplierController', [ 'except' => [ 'create', 'show', 'edit', 'update' ] ]); |
|
| 43 | + $router->resource('warehouses', 'WarehouseController', [ 'except' => [ 'create', 'show', 'edit' ] ]); |
|
| 44 | + $router->resource('guitars', 'GuitarController', [ 'only' => [ 'index', 'update', 'delete' ] ]); |
|
| 45 | 45 | }); |