Merge branch 'Lingges/feature/addCancelBooking' into 'master'

Lingges/feature/add cancel booking

See merge request CIEFWorldwideSdnBhd/exchange!149

app/Http/Controllers/BookingController.php

@@ -102,8 +102,8 @@ class BookingController extends Controller
         }
        
         return $bookings;
-	}
-    
+    }
+
     public function userComplete(){
 		$user = Auth::user();
         $bookings = Booking::select('user_id', 'id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status')
@@ -729,18 +729,30 @@ class BookingController extends Controller
         return response()->json($book_id, 204);
     }
 
-    public function cancel(Request $request, $book_id)
-    {
-        if (!$booking = Booking::where('user_id',Auth::user()->id)->where('id',$book_id)->first())
-        {
-            return response()->json(['message'=>'Access denied'],403);
-        }
-        
-        $booking->is_cancel = true;
-        $booking->save();
-       
-        return response()->json(['message'=>'Success'],200);
-    }
+    // public function userCanceledBooking(Request $request)
+    // {   
+    //     $user = Auth::user();
+    //     $bookings = Booking::select('user_id', 'id', 'created_at', 'is_cancel', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status')
+    //                                 ->where('user_id', Auth::user()->id)
+    //                                 ->where('is_cancel', 1)
+    //                                 ->get();
+    //     return $bookings;
+
+    // }
+
+    // public function cancelBooking(Request $request, $book_id)
+    // {   
+    //     $user = Auth::user();
+    //     $bookings = DB::table('booking')
+    //         ->where('user_id', Auth::user()->id);
+
+    //     $bookings->is_cancel = 1;
+
+    //     if($booking->save()){
+    //         return response()->json(['message'=> 'booking cancelled'], 200); 
+    //     }
+
+    // }
 
     public function calculation(Request $request)
     {

app/Notifications/ResetPassword.php

@@ -17,7 +17,7 @@ class ResetPassword extends Notification
     {
         return (new MailMessage)
             ->line('You are receiving this email because we received a password reset request for your account.')
-            ->action('Reset Password', url(config('app.url').'/password/reset/'.$this->token).'?email='.urlencode($notifiable->email))
+            ->action('Reset Password', route('password.request', ['token' => $this->token]).'?email='.urlencode($notifiable->email))
             ->line('If you did not request a password reset, no further action is required.');
     }
 }

package.json

@@ -31,6 +31,7 @@
     "popper.js": "^1.14.1",
     "pusher-js": "^4.3.0",
     "sweetalert2": "^7.15.1",
+    "vee-validate": "^2.1.0-beta.11",
     "vform": "^1.0.0",
     "vue": "^2.5.16",
     "vue-axios": "^2.1.1",

resources/assets/js/pages/booking/uploadUserBankSlip.vue

@@ -70,7 +70,7 @@
 			<el-dialog :visible.sync="dialogVisible">
 				<img :src="dialogImageUrl" width="100%" alt="">
 			</el-dialog> -->
-			<el-upload 
+			<!-- <el-upload 
 				class="avatar-uploader"
 				ref="upload"
 				action="'/api/booking/' + booking_id + '/upload-user-bankslip'"
@@ -81,7 +81,21 @@
 				algin="center">
 				<img v-if="imageUrl" :src="imageUrl" class="avatar">
 				<i v-else class="el-icon-plus avatar-uploader-icon"></i>
+			</el-upload> -->
+			<el-upload
+				action="'/api/booking/' + booking_id + '/upload-user-bankslip'"				
+				list-type="picture-card"
+				:on-preview="handlePictureCardPreview"
+				:on-remove="handleRemove"
+				:algin="center"
+				:on-success="handleUploadSuccess" 
+				:on-change="beforeFileUpload">
+				<img v-if="imageUrl" :src="imageUrl" class="avatar">
+				<i v-else class="el-icon-plus avatar-uploader-icon"></i>
 			</el-upload>
+			<el-dialog :visible.sync="dialogVisible">
+			<img width="100%" :src="dialogImageUrl" alt="">
+			</el-dialog>
 			<!-- <el-upload
 				class="upload-demo"
 				ref="upload"

resources/assets/js/pages/home.vue

@@ -514,6 +514,7 @@ export default {
       dialogFormVisible1: false,
       formLabelWidth: '0px',
       bookingTable: [],
+      cancelledBooking: [],
       bookingTableComplete: [],
       url: 'api/booking',
       completeBookingurl : "api/user-complete-booking",
@@ -536,6 +537,7 @@ export default {
   },
   mounted () {
     this.getBooking()
+    this.getCancelledBookings()
     this.initBooking()
     this.getRate()
     this.getBookingTableComplete()
@@ -579,6 +581,13 @@ export default {
         $this.makePagination(response.data)
       })
     },
+    getCancelledBookings(){
+      let $this = this
+      axios.get("booking/cancelled/list").then(response => {
+        this.cancelledBooking= response.data.data
+        $this.makePagination(response.data)
+      })
+    },
     cancelBooking(id){
       console.log(id)
       let $this = this

routes/api.php

@@ -34,7 +34,8 @@ Route::group(['middleware' => 'auth:api'], function () {
 	Route::delete('booking/{book_id}', 'BookingController@delete');
 	Route::post('booking/', 'BookingController@store');
 	Route::post('booking/calculation', 'BookingController@calculation');
-	Route::post('booking/{id}/cancel', 'BookingController@cancel');
+	Route::get('booking/cancelled/list', 'BookingController@userCanceledBooking');
+	Route::post('booking/{id}/cancel', 'BookingController@cancelBooking');
 	Route::post('booking/{id}/upload-user-bankslip', 'BookingController@uploadbankslip');
     Route::post('booking/{id}/upload-po', 'BookingController@uploadPurchaseOrder');
     Route::post('booking/{id}/confirm-po', 'BookingController@confirmPurchaseOrder');