@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | * |
57 | 57 | * @param Guitar $guitar |
58 | 58 | * |
59 | - * @return \League\Fractal\Resource\Collection |
|
59 | + * @return \League\Fractal\Resource\Item |
|
60 | 60 | */ |
61 | 61 | public function includePurchase(Guitar $guitar) |
62 | 62 | { |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | * |
69 | 69 | * @param Guitar $guitar |
70 | 70 | * |
71 | - * @return \League\Fractal\Resource\Collection |
|
71 | + * @return \League\Fractal\Resource\Item |
|
72 | 72 | */ |
73 | 73 | public function includeSale(Guitar $guitar) |
74 | 74 | { |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | * |
13 | 13 | * @var array |
14 | 14 | */ |
15 | - protected $availableIncludes = ['purchase', 'sale']; |
|
15 | + protected $availableIncludes = [ 'purchase', 'sale' ]; |
|
16 | 16 | |
17 | 17 | /** |
18 | 18 | * Turn this item object into a generic array. |
@@ -44,10 +44,10 @@ discard block |
||
44 | 44 | 'capacity' => $guitar->rack->capacity, |
45 | 45 | ], |
46 | 46 | 'colour' => $guitar->colour, |
47 | - 'price' => (float)$guitar->price, |
|
48 | - 'damaged' => (bool)$guitar->damaged, |
|
47 | + 'price' => (float) $guitar->price, |
|
48 | + 'damaged' => (bool) $guitar->damaged, |
|
49 | 49 | 'condition' => $guitar->condition, |
50 | - 'sold' => (bool)$guitar->isSold(), |
|
50 | + 'sold' => (bool) $guitar->isSold(), |
|
51 | 51 | ]; |
52 | 52 | } |
53 | 53 |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | * |
13 | 13 | * @var array |
14 | 14 | */ |
15 | - protected $availableIncludes = ['supplier', 'guitars']; |
|
15 | + protected $availableIncludes = [ 'supplier', 'guitars' ]; |
|
16 | 16 | |
17 | 17 | /** |
18 | 18 | * Turn this item object into a generic array. |
@@ -24,27 +24,27 @@ discard block |
||
24 | 24 | public function transform(Purchase $purchase) |
25 | 25 | { |
26 | 26 | return [ |
27 | - 'id' => (int)$purchase->id, |
|
28 | - 'supplier_id' => (int)$purchase->supplier_id, |
|
29 | - 'quantity' => (int)$purchase->quantity, |
|
30 | - 'price' => (float)$purchase->price, |
|
31 | - 'stored' => (int)$purchase->stored, |
|
32 | - 'sold' => (int)$purchase->sold, |
|
27 | + 'id' => (int) $purchase->id, |
|
28 | + 'supplier_id' => (int) $purchase->supplier_id, |
|
29 | + 'quantity' => (int) $purchase->quantity, |
|
30 | + 'price' => (float) $purchase->price, |
|
31 | + 'stored' => (int) $purchase->stored, |
|
32 | + 'sold' => (int) $purchase->sold, |
|
33 | 33 | 'make' => [ |
34 | - 'id' => (int)$purchase->make->id, |
|
35 | - 'name' => (string)$purchase->make->name, |
|
34 | + 'id' => (int) $purchase->make->id, |
|
35 | + 'name' => (string) $purchase->make->name, |
|
36 | 36 | ], |
37 | 37 | 'purchased' => [ |
38 | 38 | 'timestamp' => $purchase->date_purchased->getTimestamp(), |
39 | - 'date' => (string)$purchase->date_purchased->toFormattedDateString(), |
|
40 | - 'readable' => (string)$purchase->date_purchased->diffForHumans(), |
|
39 | + 'date' => (string) $purchase->date_purchased->toFormattedDateString(), |
|
40 | + 'readable' => (string) $purchase->date_purchased->diffForHumans(), |
|
41 | 41 | ], |
42 | 42 | 'delivery' => [ |
43 | 43 | 'timestamp' => $purchase->delivery_date->getTimestamp(), |
44 | - 'date' => (string)$purchase->delivery_date->toFormattedDateString(), |
|
45 | - 'readable' => (string)$purchase->delivery_date->diffForHumans(), |
|
44 | + 'date' => (string) $purchase->delivery_date->toFormattedDateString(), |
|
45 | + 'readable' => (string) $purchase->delivery_date->diffForHumans(), |
|
46 | 46 | ], |
47 | - 'status' => (string)$purchase->status, |
|
47 | + 'status' => (string) $purchase->status, |
|
48 | 48 | ]; |
49 | 49 | } |
50 | 50 |
@@ -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 | |
@@ -34,10 +34,10 @@ discard block |
||
34 | 34 | $router->put('api/notifications/{id}/dismiss', 'API\NotificationController@dismiss'); |
35 | 35 | $router->get('api/users/me', 'API\UserController@getCurrentUser'); |
36 | 36 | |
37 | - $router->resource('makes', 'MakeController', ['except' => ['create', 'show', 'edit', 'update']]); |
|
38 | - $router->resource('models', 'ModelController', ['except' => ['create', 'show', 'edit', 'update']]); |
|
39 | - $router->resource('purchases', 'PurchaseController', ['except' => ['create', 'edit', 'update']]); |
|
37 | + $router->resource('makes', 'MakeController', [ 'except' => [ 'create', 'show', 'edit', 'update' ] ]); |
|
38 | + $router->resource('models', 'ModelController', [ 'except' => [ 'create', 'show', 'edit', 'update' ] ]); |
|
39 | + $router->resource('purchases', 'PurchaseController', [ 'except' => [ 'create', 'edit', 'update' ] ]); |
|
40 | 40 | $router->post('purchases/{id}/guitars', 'GuitarController@store'); |
41 | - $router->resource('suppliers', 'SupplierController', ['except' => ['create', 'show', 'edit', 'update']]); |
|
42 | - $router->resource('warehouses', 'WarehouseController', ['except' => ['create', 'show', 'edit']]); |
|
41 | + $router->resource('suppliers', 'SupplierController', [ 'except' => [ 'create', 'show', 'edit', 'update' ] ]); |
|
42 | + $router->resource('warehouses', 'WarehouseController', [ 'except' => [ 'create', 'show', 'edit' ] ]); |
|
43 | 43 | }); |
@@ -40,7 +40,7 @@ |
||
40 | 40 | $purchase = Purchase::findOrFail($id); |
41 | 41 | |
42 | 42 | return fractal()->item($purchase, new PurchaseTransformer) |
43 | - ->parseIncludes(['guitars', 'supplier']) |
|
43 | + ->parseIncludes([ 'guitars', 'supplier' ]) |
|
44 | 44 | ->toArray(); |
45 | 45 | } |
46 | 46 | } |
@@ -19,14 +19,14 @@ discard block |
||
19 | 19 | public function store($id, Request $request) |
20 | 20 | { |
21 | 21 | $purchase = Purchase::findOrFail($id); |
22 | - if ( ! $purchase->hasArrived() || ! $purchase->isPendingStorage()) { |
|
23 | - return response(['purchase' => ['The purchase has not yet arrived or doesn\'t require addition of guitars.']], |
|
22 | + if (!$purchase->hasArrived() || !$purchase->isPendingStorage()) { |
|
23 | + return response([ 'purchase' => [ 'The purchase has not yet arrived or doesn\'t require addition of guitars.' ] ], |
|
24 | 24 | 422); |
25 | 25 | } |
26 | 26 | |
27 | 27 | $this->validate($request, [ |
28 | - 'rack_id' => 'required|exists:racks,id,make_id,' . $purchase->make_id, |
|
29 | - 'model_id' => 'required|exists:models,id,make_id,' . $purchase->make_id, |
|
28 | + 'rack_id' => 'required|exists:racks,id,make_id,'.$purchase->make_id, |
|
29 | + 'model_id' => 'required|exists:models,id,make_id,'.$purchase->make_id, |
|
30 | 30 | 'colour' => 'required|string|max:255', |
31 | 31 | 'damaged' => 'boolean', |
32 | 32 | 'condition' => 'required_if:damaged,true', |
@@ -35,10 +35,10 @@ discard block |
||
35 | 35 | |
36 | 36 | $rack = Rack::find($request->input('rack_id')); |
37 | 37 | if ($rack->used >= $rack->capacity) { |
38 | - return response(['rack_id' => ['The selected rack is full.']], 422); |
|
38 | + return response([ 'rack_id' => [ 'The selected rack is full.' ] ], 422); |
|
39 | 39 | } |
40 | 40 | |
41 | - $guitar = Guitar::create($request->only(['rack_id', 'model_id', 'colour', 'price']) + [ |
|
41 | + $guitar = Guitar::create($request->only([ 'rack_id', 'model_id', 'colour', 'price' ]) + [ |
|
42 | 42 | 'make_id' => $purchase->make_id, |
43 | 43 | 'purchase_id' => $purchase->id, |
44 | 44 | 'damaged' => $request->input('damaged'), |