From 3a39f7407cb25dcb1a4b2b70f9874f8dad2bf937 Mon Sep 17 00:00:00 2001
From: lonetrinity <psychixkilax@com>
Date: Wed, 15 Aug 2018 14:35:26 +0800
Subject: [PATCH] lingges fix_Status

---
 app/Http/Controllers/BookingController.php | 132 ++++++++++++---------
 1 file changed, 78 insertions(+), 54 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 175b9b20..4ffb1434 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -25,7 +25,11 @@ class BookingController extends Controller
 		$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('status', '<', '7') 
+                                    ->where('status', '=', '6')
+                                    ->orwhere('status', '=', '4')
+                                    ->orwhere('status', '=', '3')
+                                    ->orwhere('status', '=', '2')
+                                    ->orwhere('status', '=', '1') 
                                     ->orderby('updated_at','desc')
                                     ->paginate(10);
 
@@ -88,7 +92,8 @@ class BookingController extends Controller
 		$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('status', '=', '7')
+                                    ->where  ( "status" ,'=','6') 
+                                    ->orWhere( "status" ,'=','5')
                                     ->orderby('updated_at','desc')
                                     ->paginate(10);
 
@@ -154,7 +159,12 @@ class BookingController extends Controller
 	public function adminIndex(){
 		$user = Auth::user(); 
 		$bookings = Booking::select('user_id', 'id', 'created_at', 'admin_status', 'rate', 'term', 'amount', 'bia', 'verification_status')
-        ->where('status', '<', '7') 
+         
+        ->where('admin_status', '=', '5')
+        ->orwhere('admin_status', '=', '4') 
+        ->orwhere('admin_status', '=', '3') 
+        ->orwhere('admin_status', '=', '2')
+        ->orwhere('admin_status', '=', '1')   
         ->orderby('updated_at','desc')
         ->paginate(10);
 
@@ -221,60 +231,74 @@ class BookingController extends Controller
 	}
 
     public function adminBookComplete(){
-		$user = Auth::user();
-        $bookings = Booking::select('user_id', 'id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status')
-                                    ->where('admin_status', '=', '7')
-                                    ->orderby('updated_at','desc')
-                                    ->paginate(10);
+		$user = Auth::user(); 
+		$bookings = Booking::select('user_id', 'id', 'created_at', 'admin_status', 'rate', 'term', 'amount', 'bia', 'verification_status')
+         
+        ->where('admin_status', '=', '6')
+        ->orwhere('admin_status', '=', '7')   
+        ->orderby('updated_at','desc')
+        ->paginate(10);
 
-        // reformat to fit frontend structure 
-        foreach ($bookings as $booking) {
-            // set timeout 
-            $date1 = new DateTime($booking->created_at);
-            $date2 = new DateTime();
-            $time_in_seconds = SettingCredit::orderby('updated_at','desc')->first()->time_limit;
-            $difference_in_seconds = ($date1->format('U') + $time_in_seconds) - ($date2->format('U'));
-            $booking->timeout = $difference_in_seconds; 
+			// reformat to fit frontend structure 
+			foreach ($bookings as $booking) {
+				// set timeout 
+				$date1 = new DateTime($booking->created_at);
+				$date2 = new DateTime();
+				$time_in_seconds = SettingCredit::orderby('updated_at','desc')->first()->time_limit;
+				$difference_in_seconds = ($date1->format('U') + $time_in_seconds) - ($date2->format('U'));
+				$booking->timeout = $difference_in_seconds;  
 
-            // TODO : you can make it better
-            if($difference_in_seconds < 0 ){
-                $booking->timeout = 0;
-            }
+				// TODO : you can make it better
+				if($difference_in_seconds < 0 ){
+					$booking->timeout = 0;
+				}
 
-            // TODO : transfer_amount change name to bia 
-            $booking->transfer_amount = $booking->bia; 
-            
-            $booking->track_status = "(". $booking->status ."/7)";
-            switch ($booking->status) {
-                case 1:
-                    $status_desc = "Order in progress"; 
-                    break;
-                case 2:
-                    $status_desc = "Waiting for payment";  
-                    break;    
-                case 3:
-                    $status_desc = "Waiting verification";    
-                    break;  
-                case 4:
-                    $status_desc = "Processing transfer"; 
-                    break;
-                case 5:
-                    $status_desc = "Transfer Complete, please upload your PO"; 
-                    break;
-                case 6:
-                    $status_desc = "Processing invoice"; 
-                    break;
-                case 7:
-                    $status_desc = "Order Completed"; 
-                    break;
-                default:
-                    $status_desc = "";
-            }
-            $booking->status_desc = $status_desc;
-            $booking->marking = $booking->user->marking;
-        }
-       
-        return $bookings;
+				// TODO : transfer_amount change name to bia 
+				$booking->transfer_amount = $booking->bia; 
+		
+                $term = $booking->term;
+                if ($booking->term == "x2_cash" || $booking->term == "x2_cheque" || $booking->term == "x2_ba"){
+                    $booking->track_status = "(". $booking->admin_status ."/6)";
+                }
+                else{
+				    $booking->track_status = "(". $booking->admin_status ."/7)";
+                }
+
+				switch ($booking->admin_status) {
+					case 1:
+						$status_desc = "Waiting customer upload bank slip"; 
+						break;
+					case 2:
+						$status_desc = "Verify user bank slip";  
+						break;    
+					case 3:
+                        $status_desc = "Generate supplier booking report";    
+                        break;  
+					case 4:
+                        $status_desc = "Supplier booking report. Please confirm with your booking."; 
+                        break;
+					case 5:
+						$status_desc = "Please, upload China Bankslip"; 
+						break;
+                    case 6:
+                        $status_desc = "Waiting customer to upload purchase order"; 
+                        if ($booking->term == "x2_cash" || $booking->term == "x2_cheque" || $booking->term == "x2_ba"){
+                            $status_desc = "Order Completed";
+                        }
+                        break;
+                    case 7:
+						$status_desc = "Customer has uploaded purchase order, please upload invoice"; 
+                        break;
+                    case 8:
+						$status_desc = "Booking Completed"; 
+						break;
+					default:
+						$status_desc = "";
+                }
+                $booking->marking = $booking->user->marking;
+				$booking->status_desc = $status_desc; 
+			}
+			return $bookings;
 	}
     public function show($id)
     {