From 385623f6a2d3a2a157a6c548ebe4d82a770d97bf Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Thu, 28 Jun 2018 15:49:46 +0800
Subject: [PATCH] update status upon user upload purchase order fix admin
 complete page not found fixed admin completed page tracking

---
 app/Http/Controllers/BookingController.php    | 24 +++++++++++--------
 .../js/pages/admin/booking/completed.vue      |  4 ++--
 resources/assets/js/pages/admin/home.vue      |  2 +-
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 1bef639e..bc56e008 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -94,30 +94,30 @@ class BookingController extends Controller
 				// TODO : transfer_amount change name to bia 
 				$booking->transfer_amount = $booking->bia; 
 		
-				$booking->track_status = "(". $booking->admin_status ."/7)";
+				$booking->track_status = "(". $booking->admin_status ."/8)";
 				switch ($booking->admin_status) {
-					case 0:
-						$status_desc = "Waiting user to upload bankin slip";
-						break;
 					case 1:
-						$status_desc = "Waiting for verification"; 
+						$status_desc = "Waiting customer upload bank slip"; 
 						break;
 					case 2:
-						$status_desc = "Bookg with supplier";  
+						$status_desc = "Verify user bank slip";  
 						break;    
 					case 3:
-						$status_desc = "Supplier booking report. Please confirm with your booking.";    
+						$status_desc = "Generate supplier booking report";    
 						break;  
 					case 4:
-						$status_desc = "Please update supplier booking status."; 
+						$status_desc = "Supplier booking report. Please confirm with your booking."; 
 						break;
 					case 5:
-						$status_desc = "Upload China Bankslip"; 
+						$status_desc = "Please, upload China Bankslip"; 
 						break;
 					case 6:
-						$status_desc = "Customer has uploaded the invoice, please upload purchase order"; 
+						$status_desc = "Waiting customer to upload purchase order"; 
                         break;
                     case 7:
+						$status_desc = "Customer has uploaded purchase order, please upload invoice"; 
+                        break;
+                    case 8:
 						$status_desc = "Booking Completed"; 
 						break;
 					default:
@@ -420,6 +420,10 @@ class BookingController extends Controller
         $user_po->booking_id = $booking->id;
         $user_po->save();
 
+        $booking->status = 6;
+		$booking->admin_status = 7; 
+        $booking->save();
+
         return response()->json(['message'=>'Success'],200);
     }
     
diff --git a/resources/assets/js/pages/admin/booking/completed.vue b/resources/assets/js/pages/admin/booking/completed.vue
index 42585d3c..50684534 100644
--- a/resources/assets/js/pages/admin/booking/completed.vue
+++ b/resources/assets/js/pages/admin/booking/completed.vue
@@ -106,7 +106,7 @@
 </style>
 <script>
 import VueCountdown from '@dmaksimovic/vue-countdown'
-import ProgressTrack from '~/components/ProgressTrack'
+import ProgressTrack from '~/components/AdminProgressTrack'
 
 export default {
   components: {
@@ -114,7 +114,7 @@ export default {
   },
   data () {
     return {
-      status: 6,
+      status: 8,
       bookingConfirmTable: [{
         data1: 'Order Number :',
         data2: '001'
diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue
index 7fe842c0..677b97a1 100644
--- a/resources/assets/js/pages/admin/home.vue
+++ b/resources/assets/js/pages/admin/home.vue
@@ -124,7 +124,7 @@ export default {
 
         case 7:
           this.$router.push({
-            name: 'booking.complete',
+            name: 'booking.admin.complete',
             params: {id: booking_id }
           })
           break