@@ -2,8 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace App\Http\Controllers; |
4 | 4 | |
5 | -use Illuminate\Http\Request; |
|
6 | - |
|
7 | 5 | class DashboardController extends Controller |
8 | 6 | { |
9 | 7 | /** |
@@ -2,8 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace App\Http\Controllers; |
4 | 4 | |
5 | -use Illuminate\Http\Request; |
|
6 | - |
|
7 | 5 | class HomeController extends Controller |
8 | 6 | { |
9 | 7 | /** |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use Illuminate\Bus\Queueable; |
6 | 6 | use Illuminate\Mail\Mailable; |
7 | 7 | use Illuminate\Queue\SerializesModels; |
8 | -use Illuminate\Contracts\Queue\ShouldQueue; |
|
9 | 8 | |
10 | 9 | class OrderShipped extends Mailable |
11 | 10 | { |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Illuminate\Bus\Queueable; |
6 | 6 | use Illuminate\Notifications\Notification; |
7 | -use Illuminate\Contracts\Queue\ShouldQueue; |
|
8 | 7 | use Illuminate\Notifications\Messages\NexmoMessage; |
9 | 8 | |
10 | 9 | class InvoicePaid extends Notification |
@@ -6,10 +6,7 @@ |
||
6 | 6 | use Illuminate\Http\Request; |
7 | 7 | use App\Http\Controllers\Controller; |
8 | 8 | use App\DataTables\UsersDataTable; |
9 | -use Illuminate\Support\Facades\Auth; |
|
10 | -use Illuminate\Validation\Rule; |
|
11 | 9 | use App\User; |
12 | -use Datatables; |
|
13 | 10 | |
14 | 11 | class UserController extends Controller |
15 | 12 | { |
@@ -68,10 +68,11 @@ discard block |
||
68 | 68 | { |
69 | 69 | $device = Device::findOrFail($id); |
70 | 70 | $location = Location::where('id', $device->location_id)->first(); |
71 | - if ($location) |
|
72 | - $site = Site::where('id', $location->site_id)->first(); |
|
73 | - else |
|
74 | - $site = null; |
|
71 | + if ($location) { |
|
72 | + $site = Site::where('id', $location->site_id)->first(); |
|
73 | + } else { |
|
74 | + $site = null; |
|
75 | + } |
|
75 | 76 | |
76 | 77 | return view('device.edit', ['device' => $device, 'location' => $location, 'site' => $site]); |
77 | 78 | } |
@@ -155,8 +156,7 @@ discard block |
||
155 | 156 | { |
156 | 157 | // if the user was already deleted then permananetly delete it |
157 | 158 | Device::destroy($id); |
158 | - } |
|
159 | - else |
|
159 | + } else |
|
160 | 160 | { |
161 | 161 | //Remove the location from the device |
162 | 162 | $oldLocation_id = $device->location_id; |