| @@ -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 | /** | 
| @@ -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 | 
| @@ -2,9 +2,7 @@ | ||
| 2 | 2 | |
| 3 | 3 | namespace App\Http\Controllers; | 
| 4 | 4 | |
| 5 | -use Illuminate\Http\Request; | |
| 6 | 5 | use Intervention\Image\Facades\Image as Image; | 
| 7 | -use Illuminate\Support\Facades\Cache; | |
| 8 | 6 | use Illuminate\Support\Facades\Storage; | 
| 9 | 7 | |
| 10 | 8 | class ImageController extends Controller | 
| @@ -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 DeviceRegister extends Notification | 
| @@ -3,10 +3,8 @@ | ||
| 3 | 3 | namespace App\Http\Controllers; | 
| 4 | 4 | |
| 5 | 5 | use App\Http\Requests\EditDevice; | 
| 6 | -use Validator; | |
| 7 | 6 | use Illuminate\Http\Request; | 
| 8 | 7 | use App\DataTables\DevicesDataTable; | 
| 9 | -use Illuminate\Support\Facades\Route; | |
| 10 | 8 | use App\Device; | 
| 11 | 9 | use App\Site; | 
| 12 | 10 | use App\Location; | 
| @@ -100,9 +100,9 @@ discard block | ||
| 100 | 100 | //Create a new site | 
| 101 | 101 |              $site = Site::create(['name' => $request->input('new_site_name')]); | 
| 102 | 102 | $site_id = $site->id; | 
| 103 | +        } else { | |
| 104 | +                    $site_id = $request->input('site_id'); | |
| 103 | 105 | } | 
| 104 | - else | |
| 105 | -            $site_id = $request->input('site_id'); | |
| 106 | 106 | |
| 107 | 107 | //Get the location id of the old or newly created location | 
| 108 | 108 |          if (!empty($request->input('new_location_name'))) | 
| @@ -110,9 +110,9 @@ discard block | ||
| 110 | 110 | //Create a new location | 
| 111 | 111 |              $location = Location::create(['name' => $request->input('new_location_name'), 'site_id' => $site_id]); | 
| 112 | 112 | $location_id = $location->id; | 
| 113 | +        } else { | |
| 114 | +                    $location_id = $request->input('location_id'); | |
| 113 | 115 | } | 
| 114 | - else | |
| 115 | -            $location_id = $request->input('location_id'); | |
| 116 | 116 | |
| 117 | 117 | //Update the device | 
| 118 | 118 | $device->location_id = $location_id; | 
| @@ -126,29 +126,32 @@ discard block | ||
| 126 | 126 |          if ($request->input('command') != null) | 
| 127 | 127 |          { | 
| 128 | 128 | //If device is currently opening, closing or in an error state don't update command | 
| 129 | - if (!$device->isReadyForCommand()) | |
| 130 | -                return response()->json("Device is currently in use.", 403); | |
| 129 | +            if (!$device->isReadyForCommand()) { | |
| 130 | +                            return response()->json("Device is currently in use.", 403); | |
| 131 | + } | |
| 131 | 132 | |
| 132 | 133 |              $command = $request->input('command'); | 
| 133 | 134 | |
| 134 | 135 | //If command is to unlock the device then check if the device should be open or closed based on the schedule | 
| 135 | 136 | if ($request->command === 'unlock') | 
| 136 | 137 |              { | 
| 137 | - if ($device->isDuringScheduleOpen()) | |
| 138 | - $command = 'open'; | |
| 139 | - else | |
| 140 | - $command = 'close'; | |
| 138 | +                if ($device->isDuringScheduleOpen()) { | |
| 139 | + $command = 'open'; | |
| 140 | +                } else { | |
| 141 | + $command = 'close'; | |
| 142 | + } | |
| 141 | 143 | } | 
| 142 | 144 | $device->cover_command = $command; | 
| 143 | 145 | } | 
| 144 | 146 | |
| 145 | 147 | $device->save(); | 
| 146 | 148 | |
| 147 | - if (\Request::ajax()) | |
| 148 | - return response()->json(['success' => 'Device updated successfully']); | |
| 149 | - else | |
| 150 | -            return redirect()->route('device.show', $id) | |
| 149 | +        if (\Request::ajax()) { | |
| 150 | + return response()->json(['success' => 'Device updated successfully']); | |
| 151 | +        } else { | |
| 152 | +                    return redirect()->route('device.show', $id) | |
| 151 | 153 |                  ->with('success', 'Device updated successfully'); | 
| 154 | + } | |
| 152 | 155 | } | 
| 153 | 156 | |
| 154 | 157 | /** | 
| @@ -165,8 +168,7 @@ discard block | ||
| 165 | 168 |          { | 
| 166 | 169 | //If the device was already deleted then permanently delete it | 
| 167 | 170 | $device->forceDelete($device->id); | 
| 168 | - } | |
| 169 | - else | |
| 171 | + } else | |
| 170 | 172 |          { | 
| 171 | 173 | //Remove the location from the device | 
| 172 | 174 | $device->location_id = null; | 
| @@ -2,11 +2,8 @@ | ||
| 2 | 2 | |
| 3 | 3 | namespace App\Http\Controllers; | 
| 4 | 4 | |
| 5 | -use Validator; | |
| 6 | -use Illuminate\Http\Request; | |
| 7 | 5 | use App\Http\Controllers\Controller; | 
| 8 | 6 | use App\DataTables\ActivityLogDataTable; | 
| 9 | -use App\User; | |
| 10 | 7 | |
| 11 | 8 | class ActivityLogController extends Controller | 
| 12 | 9 |  { | 
| @@ -9,8 +9,6 @@ | ||
| 9 | 9 | use App\User; | 
| 10 | 10 | use App\Sensor; | 
| 11 | 11 | use App\SensorData; | 
| 12 | -use Illuminate\Support\Facades\Cache; | |
| 13 | -use Illuminate\Support\Facades\Storage; | |
| 14 | 12 | |
| 15 | 13 | class ApiController extends Controller | 
| 16 | 14 |  { | 
| @@ -3,7 +3,6 @@ | ||
| 3 | 3 | namespace App\DataTables; | 
| 4 | 4 | |
| 5 | 5 | use App\Device; | 
| 6 | -use App\Site; | |
| 7 | 6 | use Yajra\DataTables\Services\DataTable; | 
| 8 | 7 | |
| 9 | 8 | class DevicesDataTable extends DataTable | 
| @@ -5,7 +5,6 @@ | ||
| 5 | 5 | use App\Sensor; | 
| 6 | 6 | use App\DataTables\SensorDataTable; | 
| 7 | 7 | use Illuminate\Http\Request; | 
| 8 | -use Validator; | |
| 9 | 8 | |
| 10 | 9 | class SensorController extends Controller | 
| 11 | 10 |  { |