diff --git a/app/Http/Controllers/Licenses/LicensesController.php b/app/Http/Controllers/Licenses/LicensesController.php index a3607c181..7acceb378 100755 --- a/app/Http/Controllers/Licenses/LicensesController.php +++ b/app/Http/Controllers/Licenses/LicensesController.php @@ -234,6 +234,12 @@ class LicensesController extends Controller public function show($licenseId = null) { $license = License::with('assignedusers')->find($licenseId); + + if (!$license) { + return redirect()->route('licenses.index') + ->with('error', trans('admin/licenses/message.does_not_exist')); + } + $users_count = User::where('autoassign_licenses', '1')->count(); $total_seats_count = $license->totalSeatsByLicenseID(); $available_seats_count = $license->availCount()->count(); @@ -245,17 +251,13 @@ class LicensesController extends Controller \Log::debug('Checkedout: '.$checkedout_seats_count); - if ($license) { - $this->authorize('view', $license); - return view('licenses.view', compact('license')) - ->with('users_count', $users_count) - ->with('total_seats_count', $total_seats_count) - ->with('available_seats_count', $available_seats_count) - ->with('checkedout_seats_count', $checkedout_seats_count); - } + $this->authorize('view', $license); + return view('licenses.view', compact('license')) + ->with('users_count', $users_count) + ->with('total_seats_count', $total_seats_count) + ->with('available_seats_count', $available_seats_count) + ->with('checkedout_seats_count', $checkedout_seats_count); - return redirect()->route('licenses.view') - ->with('error', trans('admin/licenses/message.does_not_exist')); }