diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 7a44da9a..ec1c7ccb 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -22,21 +22,30 @@ class BookingController extends Controller { public function index(){ + \DB::connection()->enableQueryLog(); $user = Auth::user(); $bookings = Booking::select('user_id', 'id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status') ->where('user_id', Auth::user()->id) ->where(function ($query) { - $query->where('status', '=', '6') - ->orwhere('status', '=', '4') - ->orwhere('status', '=', '3') - ->orwhere('status', '=', '2') - ->orwhere('status', '=', '1'); - }) + $query->where('status', '<', '5') + ->where(function ($query) { + $query->where('term', '=', 'x2_cheque') + ->orwhere('term', '=', 'x2_ba') + ->orwhere('term', '=', 'x2_cash'); + }); + }) + ->orwhere(function ($query) { + $query->where('status', '<', '7') + ->where(function ($query) { + $query->where('term', '=', 'x1_cheque') + ->orwhere('term', '=', 'x1_ba') + ->orwhere('term', '=', 'x1_cash'); + }); + }) ->orderby('updated_at','desc') ->paginate(10); - - - + $queries = \DB::getQueryLog(); + //return print_r($queries); // reformat to fit frontend structure foreach ($bookings as $booking) { // set timeout @@ -175,12 +184,11 @@ class BookingController extends Controller $bookings = Booking::select('user_id', 'id', 'created_at', 'admin_status', 'rate', 'term', 'amount', 'bia', 'verification_status') ->where('admin_status', '<', '6') ->orwhere(function ($query) { - $query->where('admin_status', '!=', '7'); - }, function ($query) { - $query->where('term', '=', 'x1_cheque') - ->orwhere('term', '=', 'x1_ba') - ->orwhere('term', '=', 'x1_cash'); - }) + $query->where('admin_status', '=', '6') + ->where('term', '!=', 'x2_cheque') + ->where('term', '!=', 'x2_ba') + ->where('term', '!=', 'x2_cash'); + }) ->orderby('updated_at','desc') ->paginate(10);