added admin booking list controller

app/Http/Controllers/BookingController.php

@@ -19,16 +19,9 @@ class BookingController extends Controller
 
     public function index(){
 		$user = Auth::user(); 
-
-		if ($user->roles->first()->name == 'admin'){
-			$bookings = Booking::select('id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status')
-			->get();
-		}
-		else{
         $bookings = Booking::select('id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status')
                             ->where('user_id', $user->id)
 							->get();
-		}
         
         // reformat to fit frontend structure 
         foreach ($bookings as $booking) {
@@ -67,18 +60,73 @@ class BookingController extends Controller
                     $status_desc = "Processing invoice"; 
                     break;
                 default:
-                    $biastatus_desc = "";
+                    $status_desc = "";
             }
             $booking->status_desc = $status_desc; 
         }
 
         return $bookings;
-    }
+	}
+	
+	public function adminIndex(){
+		$user = Auth::user(); 
+		$bookings = Booking::select('id', 'created_at', 'admin_status', 'rate', 'term', 'amount', 'bia', 'verification_status')
+		->get();
+
+			// reformat to fit frontend structure 
+			foreach ($bookings as $booking) {
+				// set timeout 
+				$date1 = new DateTime($booking->created_at);
+				$date2 = new DateTime();
+				$difference_in_seconds = ($date1->format('U') + 600) - ($date2->format('U'));
+				$booking->timeout = $difference_in_seconds;  
+
+				// 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->admin_status ."/6)";
+				switch ($booking->admin_status) {
+					case 0:
+						$status_desc = "Waiting user to upload bankin slip";
+						break;
+					case 1:
+						$status_desc = "Waiting for verification"; 
+						break;
+					case 2:
+						$status_desc = "Bookg with supplier";  
+						break;    
+					case 3:
+						$status_desc = "Supplier booking report. Please confirm with your booking.";    
+						break;  
+					case 4:
+						$status_desc = "Please update supplier booking status."; 
+						break;
+					case 5:
+						$status_desc = "Customer has uploaded the invoice, please upload purchase order"; 
+						break;
+					case 6:
+						$status_desc = "Booking completed"; 
+						break;
+					default:
+						$status_desc = "";
+				}
+				$booking->status_desc = $status_desc; 
+			}
+
+			return $bookings;
+
+	}
 
     public function show($id)
     {   
         $booking = Booking::where('user_id',Auth::user()->id)->where('id', $id)->first();
 
+		if($booking){
         $date1 = new DateTime($booking->created_at);
         $date2 = new DateTime();
         $difference_in_seconds = ($date1->format('U') + 600) - ($date2->format('U'));
@@ -88,7 +136,8 @@ class BookingController extends Controller
         if (!$booking){
             return response()->json(['success'=>false, 'message'=>'not found'], 404);
         }
-        return $booking;
+		return $booking;
+		}
     }
 
     public function store(Request $request)

app/Http/Kernel.php

@@ -61,5 +61,6 @@ class Kernel extends HttpKernel
         'ability' => 'App\Http\Middleware\TokenEntrustAbility',
         'role' => \Zizaco\Entrust\Middleware\EntrustRole::class,
         'permission' => \Zizaco\Entrust\Middleware\EntrustPermission::class,
+        'ability' => 'App\Http\Middleware\TokenEntrustAbility'
     ];
 }

resources/assets/js/pages/admin/booking/verification.vue

@@ -3,32 +3,38 @@
     <progress-track v-model="status"/>
 
     <div align="center">
-      <h4 style="margin-top:5%;">Waiting For Payment</h4>
+      <h4 style="margin-top:5%;"></h4>
+      <br>
+      <h5> Verify User Bankslip </h5>
+      <br>
+      <!-- <el-button type="primary" @click="$router.go(-1)">Go Back</el-button> -->
     </div>
-
+    <br>
     <el-row justify="center" align="center">
-      <table class="table-responsive el-table" style="display:table; width:50%; margin: 0 auto;">
-        <tbody>
-          <tr>
-            <td class="el-table_2_column_9 is-right ">Amount : </td>
-            <td class="el-table_2_column_9 is-left ">&nbsp;&nbsp;
-              <b> RMB {{ booking.amount }} </b>
-            </td>
-          </tr>
-          <tr>
-            <td width="200" class="el-table_2_column_9 is-right ">Bankin Amount : </td>
-            <td width="200" class="el-table_2_column_9 is-left ">&nbsp;&nbsp;
-              <b> MYR {{ booking.bankin_amount }} </b>
-            </td>
-          </tr>
-        </tbody>
-      </table>
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span>Order Details</span>
+          <!-- <el-button style="float: right; padding: 3px 0" type="text">Operation button</el-button> -->
+        </div>
+        <el-row :gutter="12">
+          <el-col :span="12">
+            <el-table :data="bookingConfirmTable" :show-header="false" align="center">
+              <el-table-column prop="data1" align="right" width="200" />
+              <el-table-column prop="data2" align="left" width="200" />
+            </el-table>
+          </el-col>
+          <el-col :span="12">
+            <el-table :data="bookingConfirmTable2" :show-header="false" align="center">
+              <el-table-column prop="data1" align="right" width="200" />
+              <el-table-column prop="data2" align="left" width="200" />
+            </el-table>
+          </el-col>
+        </el-row>
+      </el-card>
     </el-row>
     <br>
 
-    <br>
-    <!-- user bankslip -->
-        <el-row justify="center" align="center">
+    <el-row justify="center" align="center">
       <el-card class="box-card">
         <div slot="header" class="clearfix">
           <span>BankinSlip</span>
@@ -41,32 +47,6 @@
         </el-row>
       </el-card>
     </el-row>
-    <!-- <el-form label-width="300px">
-        <el-form-item label="Amount (RM) :"> -->
-    <div align="center">
-      Bankin Amount (RM) :
-      <el-form ref="user_slip_form" :model="user_slip_form" :rules="rules">
-        <div align="center">
-          <el-form-item prop="transfer_amount">
-            <el-input v-model="user_slip_form.transfer_amount" type="text" placeholder="Transfer Amount" style="width: 20%"
-            />
-          </el-form-item>
-          <el-form-item>
-            <div align="center">
-              <el-button :loading="loading" type="primary" @click="submitUserSlip('user_slip_form')">Submit</el-button>
-              <router-link :to="{ name: 'home' }" class="small ml-auto my-auto">
-                Upload Later
-              </router-link>
-            </div>
-          </el-form-item>
-        </div>
-      </el-form>
-      <br>
-      <br>
-    </div>
-    <!-- </el-form-item>
-    </el-form> -->
-
   </el-main>
 </template>
 <style>
@@ -75,141 +55,19 @@
   }
 </style>
 <script>
-import ProgressTrack from '~/components/ProgressTrack'
-import axios from 'axios'
+import VueCountdown from '@dmaksimovic/vue-countdown'
+import ProgressTrack from '~/components/AdminProgressTrack'
 
 export default {
-  middleware: ['auth'],
-  name: 'MyComponent',
   components: {
     'progress-track': ProgressTrack
   },
   data () {
     return {
-      status: 2,
-      start: false,
-      loading: false,
-      dialogImageUrl: '',
-      dialogVisible: false,
-      booking_id: this.$route.params.id,
-      user_slip_form: {
-        transfer_amount: ''
-      },
-      booking: {
-        amount: '',
-        bankin_amount: '',
-        timeout: 1
-      },
-      rules: {
-        transfer_amount: [{
-          required: true,
-          message: 'Please input amount',
-          trigger: 'change'
-        } ]}
+      status: 1
     }
   },
-  beforeCreate () {
-    const loading = this.$loading({
-      lock: true,
-      text: 'Please wait..',
-      spinner: 'el-icon-loading',
-      background: 'rgba(0, 0, 0, 0.7)'
-    })
-
-    axios
-      .get('/api/booking/' + this.$route.params.id)
-      .then((response) => {
-        console.log(response)
-        this.booking.amount = response.data.amount
-        this.booking.bankin_amount = response.data.bia
-        this.booking.timeout = response.data.timeout * 1000
-        this.start = true
-        loading.close()
-
-        if (this.booking.timeout < 0) {
-          this.$message({
-            showClose: true,
-            message: 'Booking timeout, please make another booking.',
-            type: 'error',
-            duration: 30000
-          })
-          this.$router.push({
-            name: 'home'
-          })
-        }
-      }).catch((error) => {
-        console.log(error)
-        loading.close()
-        this.$router.push({
-          name: 'notfound'
-        })
-      })
-  },
   methods: {
-    handleCoutdownend () {
-      this.$message({
-        showClose: true,
-        message: 'Booking timeout, please make another booking.',
-        type: 'error',
-        duration: 30000
-      })
-      this.$router.push({
-        name: 'home'
-      })
-    },
-    handleRemove (file, fileList) {
-      console.log(file, fileList)
-    },
-    handlePictureCardPreview (file) {
-      this.dialogImageUrl = file.url
-      this.dialogVisible = true
-    },
-    submitUserSlip (formName) {
-      this.loading = true
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          let newConfirmation = {
-            amount: this.booking.amount,
-            term: this.term
-          }
-        } else {
-          this.loading = false
-        }
-      })
-      let newUserSlip = {
-        transfer_amount: this.user_slip_form.transfer_amount
-      }
-      axios.patch('/api/booking/' + this.booking_id + '/bankslip-amount', newUserSlip)
-        .then((response) => {
-          this.$message({
-            showClose: true,
-            message: 'Your bankinslip has been submitted, please wait admin to approve.',
-            type: 'success',
-            duration: 5000
-          })
-
-          console.log(response)
-          this.$router.push({
-            name: 'home'
-          })
-        })
-        .catch((error) => {
-          this.loading = false
-          this.$message({
-            showClose: true,
-            message: 'Please upload your bankin slip first.',
-            type: 'warning',
-            duration: 10000
-          })
-          console.log(error)
-        })
-    },
-    handleTimeExpire () {
-      alert('Booking expired')
-    },
-    startTimer () {
-      this.start = true
-    }
 
   }
 }

resources/assets/js/pages/admin/home.vue

@@ -5,7 +5,7 @@
       <el-table :data="bookingTable">
         <el-table-column label="No." width="100">
           <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">Update</el-button>
-          <el-button slot-scope="scope" type="text" @click="(event) => { BookingStatus(scope.row.status, scope.row.id) }"> {{ scope.row.id }}</el-button>
+          <el-button slot-scope="scope" type="text" @click="(event) => { BookingStatus(scope.row.admin_status, scope.row.id) }"> {{ scope.row.id }}</el-button>
         </el-table-column>
         <el-table-column label="DateTime" prop="created_at" width="180" sortable/>
         <el-table-column :filters="[{text: 'X1', value: 'X1'}, {text: 'X2', value: 'X2'}]" :filter-method="filterHandler" label="Term" prop="term" width="100"/> -->
@@ -31,7 +31,7 @@
         <!-- <el-table-column prop="timeout" label="Bankin Timeout" /> -->
         <el-table-column :filters="[{ text: 'Success', value: 'Success' }, { text: 'Pending', value: 'Pending' }]" :filter-method="filterTag"
                          label="" width="180" filter-placement="bottom-end">
-          <el-button slot-scope="scope" type="text" @click="(event) => { BookingStatus(scope.row.status, scope.row.id) }"> View Status </el-button>
+          <el-button slot-scope="scope" type="text" @click="(event) => { BookingStatus(scope.row.admin_status, scope.row.id) }"> View Status </el-button>
           <!-- <template slot-scope="scope">
               <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">View Status</el-button>
               <el-button size="mini" type="danger" @click="BookingStatus(scope.$index, scope.row)">Cancel</el-button>
@@ -50,15 +50,16 @@ export default {
   middleware: 'admin',
   data () {
     return {
+      status: null,
       bookingTable: [
       ]
     }
   },
   mounted () {
     axios
-      .get('/api/booking/')
+      .get('/api/admin/booking')
       .then((response) => {
-        console.log(response)
+        console.log(response.data)
         this.bookingTable = response.data
 
       // loading.close()
@@ -79,16 +80,22 @@ export default {
       return row[property] === value
     },
     BookingStatus (status, booking_id) {
-      console.log(status)
       // TODO : Get booking status from server
       this.status = status
-
+      console.log(this.status)
       switch (this.status) {
+        case 0:
+          this.$router.push({
+            name: 'booking.admin.verification',
+            params: {id: booking_id }
+          })
+          break
         case 1:
           this.$router.push({
             name: 'booking.admin.verification',
             params: {id: booking_id }
           })
+          break
 
         case 2:
           this.$router.push({

routes/api.php

@@ -60,8 +60,8 @@ Route::group(['middleware' => 'guest:api'], function () {
 	Route::get('oauth/{driver}/callback', 'Auth\OAuthController@handleProviderCallback')->name('oauth.callback');
 });
 
-Route::group(['middleware' => 'role:admin'], function() {
-
+Route::group(['middleware' => ['role:admin']], function() {
+	Route::get('admin/booking/', 'BookingController@adminIndex');
 	Route::post('booking/{id}/upload-invoice', 'BookingController@uploadInvoice');		
 
 	Route::post('update-rate', 'RateController@store');