From 881e8ac91a05408e4ac477b274f6f04197aae39d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sat, 5 Dec 2020 13:08:36 +0800
Subject: [PATCH] x1 and x2 reports

---
 app/Exceptions/Handler.php | 8 --------
 routes/web.php             | 9 ++++++++-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 909c4a89..ae2f68fb 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -3,8 +3,6 @@
 namespace App\Exceptions;
 
 use Exception;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 class Handler extends ExceptionHandler
@@ -58,12 +56,6 @@ class Handler extends ExceptionHandler
             ], 404);
         }
 
-        if ($exception instanceof AuthorizationException) {
-            return response()->json([
-                'error' => 'Resource not found'
-            ], 404);
-        }
-
         return parent::render($request, $exception);
     }
 }
diff --git a/routes/web.php b/routes/web.php
index 107643c2..30451c03 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -21,7 +21,12 @@ Route::get('/', 'WelcomeController@index');
 Route::get('password/reset/{token}', 'Auth\ResetPasswordController@showResetForm')->name('password.request');
 Route::post('password/reset', 'Auth\ResetPasswordController@postReset')->name('password.reset');
 
-Route::group(['middleware' => ['role:admin']], function() {
+Route::group(function() {
+
+    if(Auth()::user()->role !== 'admin'){
+        return redirect('/');
+    }
+
     Route::get('/report/x1', function(){
         $bookings = Booking::where('admin_status', '>=', 3)->where('term', 'like', 'x1_%')->where('is_cancel', false)->where('user_id', '!=', 1)->get();
         $months = $bookings->groupBy(function($item) {
@@ -41,6 +46,7 @@ Route::group(['middleware' => ['role:admin']], function() {
         }
 
     });
+
     Route::get('/report/x2', function(){
         $bookings = Booking::where('admin_status', '>=', 3)->where('term', 'like', 'x2_%')->where('is_cancel', false)->where('user_id', '!=', 1)->get();
         $months = $bookings->groupBy(function($item) {
@@ -60,6 +66,7 @@ Route::group(['middleware' => ['role:admin']], function() {
         }
 
     });
+
     Route::get('/po-approval', function(){
         $approvedInvoices = InvoiceStatuses::where('status', 'approve')->distinct()->get(['invoice_id'])->pluck('invoice_id');
         $pendingChangeInvoices = InvoiceStatuses::where('status', 'request_change')->distinct()->get(['invoice_id'])->pluck('invoice_id');